Skip to content

Commit 6b66b31

Browse files
authored
Upgraded ExtJS to 1.1.1 (#2473)
1 parent 23999d6 commit 6b66b31

File tree

226 files changed

+18499
-17054
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+18499
-17054
lines changed

app/design/adminhtml/default/default/layout/main.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,9 @@ Default layout, loads most of the pages
8585
<action method="addItem"><type>js</type><name>calendar/calendar.js</name><!--<params/><if/><condition>can_load_calendar_js</condition>--></action>
8686
<action method="addItem"><type>js</type><name>calendar/calendar-setup.js</name><!--<params/><if/><condition>can_load_calendar_js</condition>--></action>
8787

88-
<action method="addItem"><type>js</type><name>extjs/ext-tree.js</name><params/><if/><condition>can_load_ext_js</condition></action>
88+
<action method="addItem"><type>js</type><name>extjs/ext-tree.min.js</name><params/><if/><condition>can_load_ext_js</condition></action>
8989
<action method="addItem"><type>js</type><name>extjs/fix-defer.js</name><params/><if/><condition>can_load_ext_js</condition></action>
9090
<action method="addItem"><type>js</type><name>extjs/ext-tree-checkbox.js</name><params/><if/><condition>can_load_ext_js</condition></action>
91-
<action method="addItem"><type>js_css</type><name>extjs/resources/css/ext-all.css</name><params/><if/><condition>can_load_ext_js</condition></action>
9291
<action method="addItem"><type>js_css</type><name>extjs/resources/css/ytheme-magento.css</name><params/><if/><condition>can_load_ext_js</condition></action>
9392

9493
<action method="addItem"><type>js</type><name>mage/adminhtml/rules.js</name><params/><if/><condition>can_load_rules_js</condition></action>

app/design/adminhtml/default/default/layout/oauth.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,12 @@
9393

9494
<action method="removeItem"><type>css</type><name>print.css</name></action>
9595
<action method="removeItem"><type>js_css</type><name>calendar/calendar-win2k-1.css</name></action>
96-
<action method="removeItem"><type>js_css</type><name>extjs/resources/css/ext-all.css</name></action>
9796
<action method="removeItem"><type>js_css</type><name>extjs/resources/css/ytheme-magento.css</name></action>
9897
<action method="removeItem"><type>skin_css</type><name>menu.css</name></action>
9998

10099
<action method="removeItem"><type>js</type><name>calendar/calendar.js</name></action>
101100
<action method="removeItem"><type>js</type><name>calendar/calendar-setup.js</name></action>
102-
<action method="removeItem"><type>js</type><name>extjs/ext-tree.js</name></action>
101+
<action method="removeItem"><type>js</type><name>extjs/ext-tree.min.js</name></action>
103102
<action method="removeItem"><type>js</type><name>extjs/fix-defer.js</name></action>
104103
<action method="removeItem"><type>js</type><name>extjs/ext-tree-checkbox.js</name></action>
105104
</reference>

js/extjs/css/README.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

js/extjs/css/basic-dialog.css

Lines changed: 0 additions & 286 deletions
This file was deleted.

0 commit comments

Comments
 (0)