ExtJs updated to 3.4.0

vovayatsyuk · vovayatsyuk · commit 69f692dd8777 · 2011-10-24T11:36:12.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 app/etc/config.php
 library/Zend
-js/ext-3.3.1
+js/ext-3.4.0
 js/ckeditor
 media/cache/*
 media/category/*
diff --git a/app/design/admin/default/layouts/layout.phtml b/app/design/admin/default/layouts/layout.phtml
@@ -25,7 +25,7 @@
         {{headScript}}
         <script type="text/javascript">
         Ext.namespace('Axis');
-        Ext.BLANK_IMAGE_URL = Axis.secureUrl + '/js/ext-3.3.1/resources/images/default/s.gif';
+        Ext.BLANK_IMAGE_URL = Axis.secureUrl + '/js/ext-3.4.0/resources/images/default/s.gif';
         </script>
 
         <?php
@@ -35,9 +35,9 @@
             ->offsetSetStylesheet(-98, 'navigation.css')
             ->offsetSetStylesheet(-96, 'elements.css')
             ->offsetSetStylesheet(-94, 'tabs.css')
-            ->offsetSetStylesheet(-92, 'js/ext-3.3.1/resources/css/ext-all.css')
-            ->offsetSetStylesheet(-90, 'js/ext-3.3.1/resources/css/xtheme-gray.css')
-            ->offsetSetStylesheet(-88, 'js/ext-3.3.1/examples/ux/css/ux-all.css')
+            ->offsetSetStylesheet(-92, 'js/ext-3.4.0/resources/css/ext-all.css')
+            ->offsetSetStylesheet(-90, 'js/ext-3.4.0/resources/css/xtheme-gray.css')
+            ->offsetSetStylesheet(-88, 'js/ext-3.4.0/examples/ux/css/ux-all.css')
             ->offsetSetStylesheet(-86, 'js/ext-ux/grid/RowActions.css')
             ->offsetSetStylesheet(-84, 'js/ext-ux/maximbg.treegrid/css/TreeGrid.css')
             ->offsetSetStylesheet(-82, 'js/ext-axis/resources/css/ext-axis-all.css')
@@ -46,9 +46,9 @@
         $this->headScript()
             ->setProxy('axis_core')
             ->offsetSetFile(-100, 'js/jquery/jquery-1.6.4.min.js')
-            ->offsetSetFile(-98, 'js/ext-3.3.1/adapter/jquery/ext-jquery-adapter.js')
-            ->offsetSetFile(-96, 'js/ext-3.3.1/ext-all-debug.js')
-            ->offsetSetFile(-94, 'js/ext-3.3.1/examples/ux/ux-all-debug.js')
+            ->offsetSetFile(-98, 'js/ext-3.4.0/adapter/jquery/ext-jquery-adapter.js')
+            ->offsetSetFile(-96, 'js/ext-3.4.0/ext-all-debug.js')
+            ->offsetSetFile(-94, 'js/ext-3.4.0/examples/ux/ux-all-debug.js')
             ->offsetSetFile(-92, 'js/axis/admin/core/script.js')
             ->offsetSetFile(-90, 'js/axis/admin/core/ajax.js')
             ->offsetSetFile(-78, 'js/axis/admin/core/translate.js');
@@ -95,14 +95,14 @@
         $this->headScript()->offsetSetFile(-75, 'js/axis/admin/translation/'. $locale .'/core.js');
 
         if ('uk_UA' === $locale) {
-            $this->headScript()->appendFile('js/ext-3.3.1/src/locale/ext-lang-ukr.js');
-        } elseif (file_exists('js/ext-3.3.1/src/locale/ext-lang-' . $locale . '.js')) {
+            $this->headScript()->appendFile('js/ext-3.4.0/src/locale/ext-lang-ukr.js');
+        } elseif (file_exists('js/ext-3.4.0/src/locale/ext-lang-' . $locale . '.js')) {
             $this->headScript()->appendFile(
-                'js/ext-3.3.1/src/locale/ext-lang-' . $locale . '.js'
+                'js/ext-3.4.0/src/locale/ext-lang-' . $locale . '.js'
             );
-        } elseif (file_exists('js/ext-3.3.1/src/locale/ext-lang-' . Axis_Locale::getLocale()->getLanguage() . '.js')) {
+        } elseif (file_exists('js/ext-3.4.0/src/locale/ext-lang-' . Axis_Locale::getLocale()->getLanguage() . '.js')) {
             $this->headScript()->appendFile(
-                'js/ext-3.3.1/src/locale/ext-lang-' . Axis_Locale::getLocale()->getLanguage() . '.js'
+                'js/ext-3.4.0/src/locale/ext-lang-' . Axis_Locale::getLocale()->getLanguage() . '.js'
             );
         }
         ?>
diff --git a/app/design/admin/default/templates/account/customer/index.phtml b/app/design/admin/default/templates/account/customer/index.phtml
@@ -1,6 +1,6 @@
 <?php
 // plugins
-$this->headScript()->appendFile('js/ext-3.3.1/examples/ux/MultiSelect.js');
+$this->headScript()->appendFile('js/ext-3.4.0/examples/ux/MultiSelect.js');
 
 // gui
 $this->headScript()->appendFile('js/axis/admin/customer/index/customer.js')
diff --git a/js/axis/admin/core/script.js b/js/axis/admin/core/script.js
@@ -24,7 +24,7 @@ if (typeof Ext != 'object') {
     alert(
         'ExtJs library not found at AXIS_ROOT/js folder'
         + "\n"
-        + 'Download and unpack it under the js folder (AXIS_ROOT/js/ext-3.3.1)'
+        + 'Download and unpack it under the js folder (AXIS_ROOT/js/ext-3.4.0)'
    );
 }
 
diff --git a/js/axis/admin/index/chart.js b/js/axis/admin/index/chart.js
@@ -158,7 +158,7 @@ var Chart = {
     }
 }
 
-Ext.chart.Chart.CHART_URL = Axis.secureUrl + '/js/ext-3.3.1/resources/charts.swf';
+Ext.chart.Chart.CHART_URL = Axis.secureUrl + '/js/ext-3.4.0/resources/charts.swf';
 
 Ext.onReady(function(){
 
@@ -271,7 +271,7 @@ Ext.onReady(function(){
             xtype: 'columnchart',
             store: store,
             id: 'chart',
-            url: Axis.secureUrl + '/js/ext-3.3.1/resources/charts.swf',
+            url: Axis.secureUrl + '/js/ext-3.4.0/resources/charts.swf',
             xField: 'time',
             yAxis: yAxis,
             xAxis: xAxis,
diff --git a/js/axis/admin/poll/windowResult.js b/js/axis/admin/poll/windowResult.js
@@ -19,7 +19,7 @@
  * @copyright   Copyright 2008-2011 Axis
  * @license     GNU Public License V3.0
  */
-Ext.chart.Chart.CHART_URL = Axis.secureUrl + '/js/ext-3.3.1/resources/charts.swf';
+Ext.chart.Chart.CHART_URL = Axis.secureUrl + '/js/ext-3.4.0/resources/charts.swf';
 
 Ext.onReady(function () {
 
diff --git a/scripts/make_release.php b/scripts/make_release.php
@@ -21,7 +21,7 @@ class ReleaseMaker
             'doc',
             'tests',
             'app/etc/config.php',
-            'js/ext-3.3.1/*',
+            'js/ext-3.4.0/*',
             'js/ckeditor/*',
             'media/*/*',      // skip all content inside every folder inside media
             'var/*/*',
@@ -34,14 +34,14 @@ class ReleaseMaker
         ),
         // path that will be copied despite of exclude rules
         'include' => array(
-            'js/ext-3.3.1/adapter/jquery/*',
-            'js/ext-3.3.1/examples/ux/ux-all.js',
-            'js/ext-3.3.1/examples/ux/css/ux-all.css',
-            'js/ext-3.3.1/examples/ux/images/*',
-            'js/ext-3.3.1/resources/*',
-            'js/ext-3.3.1/src/locale/*',
-            'js/ext-3.3.1/ext-all.js',
-            'js/ext-3.3.1/license.txt',
+            'js/ext-3.4.0/adapter/jquery/*',
+            'js/ext-3.4.0/examples/ux/ux-all.js',
+            'js/ext-3.4.0/examples/ux/css/ux-all.css',
+            'js/ext-3.4.0/examples/ux/images/*',
+            'js/ext-3.4.0/resources/*',
+            'js/ext-3.4.0/src/locale/*',
+            'js/ext-3.4.0/ext-all.js',
+            'js/ext-3.4.0/license.txt',
             'js/ckeditor/ckeditor.js',
             'js/ckeditor/contents.css',
             'js/ckeditor/config.js',

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ if (typeof Ext != 'object') {`
`24`	`24`	`alert(`
`25`	`25`	`'ExtJs library not found at AXIS_ROOT/js folder'`
`26`	`26`	`+ "\n"`
`27`		`- + 'Download and unpack it under the js folder (AXIS_ROOT/js/ext-3.3.1)'`
	`27`	`+ + 'Download and unpack it under the js folder (AXIS_ROOT/js/ext-3.4.0)'`
`28`	`28`	`);`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ var Chart = {`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
`161`		`-Ext.chart.Chart.CHART_URL = Axis.secureUrl + '/js/ext-3.3.1/resources/charts.swf';`
	`161`	`+Ext.chart.Chart.CHART_URL = Axis.secureUrl + '/js/ext-3.4.0/resources/charts.swf';`
`162`	`162`
`163`	`163`	`Ext.onReady(function(){`
`164`	`164`
`@@ -271,7 +271,7 @@ Ext.onReady(function(){`
`271`	`271`	`xtype: 'columnchart',`
`272`	`272`	`store: store,`
`273`	`273`	`id: 'chart',`
`274`		`- url: Axis.secureUrl + '/js/ext-3.3.1/resources/charts.swf',`
	`274`	`+ url: Axis.secureUrl + '/js/ext-3.4.0/resources/charts.swf',`
`275`	`275`	`xField: 'time',`
`276`	`276`	`yAxis: yAxis,`
`277`	`277`	`xAxis: xAxis,`