Skip to content
This repository was archived by the owner on Apr 13, 2023. It is now read-only.

Commit 69f692d

Browse files
vovayatsyukvovayatsyuk
committed
ExtJs updated to 3.4.0
1 parent bf06ac7 commit 69f692d

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
app/etc/config.php
22
library/Zend
3-
js/ext-3.3.1
3+
js/ext-3.4.0
44
js/ckeditor
55
media/cache/*
66
media/category/*

‎app/design/admin/default/layouts/layout.phtml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{{headScript}}
2626
<script type="text/javascript">
2727
Ext.namespace('Axis');
28-
Ext.BLANK_IMAGE_URL = Axis.secureUrl + '/js/ext-3.3.1/resources/images/default/s.gif';
28+
Ext.BLANK_IMAGE_URL = Axis.secureUrl + '/js/ext-3.4.0/resources/images/default/s.gif';
2929
</script>
3030

3131
<?php
@@ -35,9 +35,9 @@
3535
->offsetSetStylesheet(-98, 'navigation.css')
3636
->offsetSetStylesheet(-96, 'elements.css')
3737
->offsetSetStylesheet(-94, 'tabs.css')
38-
->offsetSetStylesheet(-92, 'js/ext-3.3.1/resources/css/ext-all.css')
39-
->offsetSetStylesheet(-90, 'js/ext-3.3.1/resources/css/xtheme-gray.css')
40-
->offsetSetStylesheet(-88, 'js/ext-3.3.1/examples/ux/css/ux-all.css')
38+
->offsetSetStylesheet(-92, 'js/ext-3.4.0/resources/css/ext-all.css')
39+
->offsetSetStylesheet(-90, 'js/ext-3.4.0/resources/css/xtheme-gray.css')
40+
->offsetSetStylesheet(-88, 'js/ext-3.4.0/examples/ux/css/ux-all.css')
4141
->offsetSetStylesheet(-86, 'js/ext-ux/grid/RowActions.css')
4242
->offsetSetStylesheet(-84, 'js/ext-ux/maximbg.treegrid/css/TreeGrid.css')
4343
->offsetSetStylesheet(-82, 'js/ext-axis/resources/css/ext-axis-all.css')
@@ -46,9 +46,9 @@
4646
$this->headScript()
4747
->setProxy('axis_core')
4848
->offsetSetFile(-100, 'js/jquery/jquery-1.6.4.min.js')
49-
->offsetSetFile(-98, 'js/ext-3.3.1/adapter/jquery/ext-jquery-adapter.js')
50-
->offsetSetFile(-96, 'js/ext-3.3.1/ext-all-debug.js')
51-
->offsetSetFile(-94, 'js/ext-3.3.1/examples/ux/ux-all-debug.js')
49+
->offsetSetFile(-98, 'js/ext-3.4.0/adapter/jquery/ext-jquery-adapter.js')
50+
->offsetSetFile(-96, 'js/ext-3.4.0/ext-all-debug.js')
51+
->offsetSetFile(-94, 'js/ext-3.4.0/examples/ux/ux-all-debug.js')
5252
->offsetSetFile(-92, 'js/axis/admin/core/script.js')
5353
->offsetSetFile(-90, 'js/axis/admin/core/ajax.js')
5454
->offsetSetFile(-78, 'js/axis/admin/core/translate.js');
@@ -95,14 +95,14 @@
9595
$this->headScript()->offsetSetFile(-75, 'js/axis/admin/translation/'. $locale .'/core.js');
9696

9797
if ('uk_UA' === $locale) {
98-
$this->headScript()->appendFile('js/ext-3.3.1/src/locale/ext-lang-ukr.js');
99-
} elseif (file_exists('js/ext-3.3.1/src/locale/ext-lang-' . $locale . '.js')) {
98+
$this->headScript()->appendFile('js/ext-3.4.0/src/locale/ext-lang-ukr.js');
99+
} elseif (file_exists('js/ext-3.4.0/src/locale/ext-lang-' . $locale . '.js')) {
100100
$this->headScript()->appendFile(
101-
'js/ext-3.3.1/src/locale/ext-lang-' . $locale . '.js'
101+
'js/ext-3.4.0/src/locale/ext-lang-' . $locale . '.js'
102102
);
103-
} elseif (file_exists('js/ext-3.3.1/src/locale/ext-lang-' . Axis_Locale::getLocale()->getLanguage() . '.js')) {
103+
} elseif (file_exists('js/ext-3.4.0/src/locale/ext-lang-' . Axis_Locale::getLocale()->getLanguage() . '.js')) {
104104
$this->headScript()->appendFile(
105-
'js/ext-3.3.1/src/locale/ext-lang-' . Axis_Locale::getLocale()->getLanguage() . '.js'
105+
'js/ext-3.4.0/src/locale/ext-lang-' . Axis_Locale::getLocale()->getLanguage() . '.js'
106106
);
107107
}
108108
?>

‎app/design/admin/default/templates/account/customer/index.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
// plugins
3-
$this->headScript()->appendFile('js/ext-3.3.1/examples/ux/MultiSelect.js');
3+
$this->headScript()->appendFile('js/ext-3.4.0/examples/ux/MultiSelect.js');
44

55
// gui
66
$this->headScript()->appendFile('js/axis/admin/customer/index/customer.js')

‎js/axis/admin/core/script.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if (typeof Ext != 'object') {
2424
alert(
2525
'ExtJs library not found at AXIS_ROOT/js folder'
2626
+ "\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)'
2828
);
2929
}
3030

‎js/axis/admin/index/chart.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ var Chart = {
158158
}
159159
}
160160

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';
162162

163163
Ext.onReady(function(){
164164

@@ -271,7 +271,7 @@ Ext.onReady(function(){
271271
xtype: 'columnchart',
272272
store: store,
273273
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',
275275
xField: 'time',
276276
yAxis: yAxis,
277277
xAxis: xAxis,

‎js/axis/admin/poll/windowResult.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* @copyright Copyright 2008-2011 Axis
2020
* @license GNU Public License V3.0
2121
*/
22-
Ext.chart.Chart.CHART_URL = Axis.secureUrl + '/js/ext-3.3.1/resources/charts.swf';
22+
Ext.chart.Chart.CHART_URL = Axis.secureUrl + '/js/ext-3.4.0/resources/charts.swf';
2323

2424
Ext.onReady(function () {
2525

‎scripts/make_release.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class ReleaseMaker
2121
'doc',
2222
'tests',
2323
'app/etc/config.php',
24-
'js/ext-3.3.1/*',
24+
'js/ext-3.4.0/*',
2525
'js/ckeditor/*',
2626
'media/*/*', // skip all content inside every folder inside media
2727
'var/*/*',
@@ -34,14 +34,14 @@ class ReleaseMaker
3434
),
3535
// path that will be copied despite of exclude rules
3636
'include' => array(
37-
'js/ext-3.3.1/adapter/jquery/*',
38-
'js/ext-3.3.1/examples/ux/ux-all.js',
39-
'js/ext-3.3.1/examples/ux/css/ux-all.css',
40-
'js/ext-3.3.1/examples/ux/images/*',
41-
'js/ext-3.3.1/resources/*',
42-
'js/ext-3.3.1/src/locale/*',
43-
'js/ext-3.3.1/ext-all.js',
44-
'js/ext-3.3.1/license.txt',
37+
'js/ext-3.4.0/adapter/jquery/*',
38+
'js/ext-3.4.0/examples/ux/ux-all.js',
39+
'js/ext-3.4.0/examples/ux/css/ux-all.css',
40+
'js/ext-3.4.0/examples/ux/images/*',
41+
'js/ext-3.4.0/resources/*',
42+
'js/ext-3.4.0/src/locale/*',
43+
'js/ext-3.4.0/ext-all.js',
44+
'js/ext-3.4.0/license.txt',
4545
'js/ckeditor/ckeditor.js',
4646
'js/ckeditor/contents.css',
4747
'js/ckeditor/config.js',

0 commit comments

Comments
 (0)