Fixed bug #10964: ExtJs prototype-adapter leads to several IE-errors
authorSteffen Kamper <info@sk-typo3.de>
Thu, 23 Apr 2009 07:50:14 +0000 (07:50 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Thu, 23 Apr 2009 07:50:14 +0000 (07:50 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5345 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/backend.php
typo3/template.php

index 858bf54..be5972a 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-23  Steffen Kamper  <info@sk-typo3.de>
+
+       * Fixed bug #10964: ExtJs prototype-adapter leads to several IE-errors
+
 2009-04-22  Steffen Kamper  <info@sk-typo3.de>
 
        * Fixed bug #10947: It's not possible to add buttons to docheader (added hook in template.php)
index 21af41e..47e94dc 100644 (file)
@@ -94,7 +94,7 @@ class TYPO3backend {
                $this->jsFiles = array(
                        'contrib/prototype/prototype.js',
                        'contrib/scriptaculous/scriptaculous.js?load=builder,effects,controls,dragdrop',
-                       'contrib/extjs/adapter/prototype/ext-prototype-adapter.js',
+                       'contrib/extjs/adapter/ext/ext-base.js',
                        'contrib/extjs/ext-all.js',
                        'md5.js',
                        'js/backend.js',
index c00502a..52b59d0 100644 (file)
@@ -2011,12 +2011,8 @@ $str.=$this->docBodyTagBegin().
 
                        // include extJS
                if ($this->addExtJS) {
-                               // if prototype is loaded, then use the prototype adapter, otherwise the default one
-                       if ($this->addPrototype) {
-                               $libs[] = 'contrib/extjs/adapter/prototype/ext-prototype-adapter.js';
-                       } else {
-                               $libs[] = 'contrib/extjs/adapter/ext/ext-base.js';
-                       }
+                               // use the base adapter all the time
+                       $libs[] = 'contrib/extjs/adapter/ext/ext-base.js';
                        $libs[] = 'contrib/extjs/ext-all' . ($this->addExtJSdebug ? '-debug' : '') . '.js';
 
                                // add extJS localization
@@ -2080,7 +2076,8 @@ $str.=$this->docBodyTagBegin().
 
        /**
         *  call this function if you need the extJS library
-        * @param string $css
+        * @param boolean $css flag, if set the ext-css will be loaded
+        * @param boolean $theme flag, if set the ext-theme "grey" will be loaded
         */
        public function loadExtJS($css = true, $theme = true) {
                if (!$this->addExtJS) {