Lib_Js_Mage - Version 1.8.0.0

Version Notes

1.8.0.0

Download this release

Release Info

Developer Magento Core Team
Extension Lib_Js_Mage
Version 1.8.0.0
Comparing to
See all releases


Code changes from version 1.7.0.1 to 1.8.0.0

Files changed (49) hide show
  1. js/lib/dropdown.js +1 -1
  2. js/lib/flex.js +1 -1
  3. js/mage/adminhtml/accordion.js +1 -1
  4. js/mage/adminhtml/backup.js +1 -1
  5. js/mage/adminhtml/browser.js +5 -5
  6. js/mage/adminhtml/events.js +1 -1
  7. js/mage/adminhtml/flexuploader.js +1 -1
  8. js/mage/adminhtml/form.js +1 -1
  9. js/mage/adminhtml/giftmessage.js +1 -1
  10. js/mage/adminhtml/giftoptions/tooltip.js +1 -1
  11. js/mage/adminhtml/grid.js +35 -35
  12. js/mage/adminhtml/hash.js +1 -1
  13. js/mage/adminhtml/image.js +1 -1
  14. js/mage/adminhtml/loader.js +1 -1
  15. js/mage/adminhtml/magento-all.js +1 -1
  16. js/mage/adminhtml/product.js +1 -1
  17. js/mage/adminhtml/product/composite/configure.js +1 -1
  18. js/mage/adminhtml/rules.js +1 -1
  19. js/mage/adminhtml/sales.js +24 -8
  20. js/mage/adminhtml/sales/packaging.js +1 -1
  21. js/mage/adminhtml/scrollbar.js +1 -1
  22. js/mage/adminhtml/tabs.js +1 -1
  23. js/mage/adminhtml/tools.js +8 -12
  24. js/mage/adminhtml/uploader.js +1 -1
  25. js/mage/adminhtml/variables.js +1 -1
  26. js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js +1 -1
  27. js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js +1 -1
  28. js/mage/adminhtml/wysiwyg/tiny_mce/setup.js +12 -7
  29. js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css +1 -1
  30. js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css +1 -1
  31. js/mage/adminhtml/wysiwyg/widget.js +1 -1
  32. js/mage/captcha.js +1 -1
  33. js/mage/centinel.js +1 -1
  34. js/mage/cookies.js +1 -1
  35. js/mage/directpost.js +1 -1
  36. js/mage/translate.js +1 -1
  37. js/mage/translate_inline.css +1 -1
  38. js/mage/translate_inline.js +1 -1
  39. js/varien/accordion.js +1 -1
  40. js/varien/configurable.js +9 -8
  41. js/varien/form.js +2 -1
  42. js/varien/iehover-fix.js +1 -1
  43. js/varien/js.js +12 -7
  44. js/varien/menu.js +1 -1
  45. js/varien/payment.js +1 -1
  46. js/varien/product.js +14 -10
  47. js/varien/telephone.js +1 -1
  48. js/varien/weee.js +1 -1
  49. package.xml +6 -6
js/lib/dropdown.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
dropdown = function() {
19
*
20
* @category Mage
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
dropdown = function() {
js/lib/flex.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/accordion.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var varienAccordion = new Class.create();
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var varienAccordion = new Class.create();
js/mage/adminhtml/backup.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var AdminBackup = new Class.create();
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var AdminBackup = new Class.create();
js/mage/adminhtml/browser.js CHANGED
@@ -19,16 +19,16 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
MediabrowserUtility = {
26
- openDialog: function(url, width, height, title) {
27
if ($('browser_window') && typeof(Windows) != 'undefined') {
28
Windows.focus('browser_window');
29
return;
30
}
31
- this.dialogWindow = Dialog.info(null, {
32
closable: true,
33
resizable: false,
34
draggable: true,
@@ -38,13 +38,13 @@ MediabrowserUtility = {
38
top: 50,
39
width: width || 950,
40
height: height || 600,
41
- zIndex: 1000,
42
recenterAuto: false,
43
hideEffect: Element.hide,
44
showEffect: Element.show,
45
id: 'browser_window',
46
onClose: this.closeDialog.bind(this)
47
- });
48
new Ajax.Updater('modal_dialog_message', url, {evalScripts: true});
49
},
50
closeDialog: function(window) {
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
MediabrowserUtility = {
26
+ openDialog: function(url, width, height, title, options) {
27
if ($('browser_window') && typeof(Windows) != 'undefined') {
28
Windows.focus('browser_window');
29
return;
30
}
31
+ this.dialogWindow = Dialog.info(null, Object.extend({
32
closable: true,
33
resizable: false,
34
draggable: true,
38
top: 50,
39
width: width || 950,
40
height: height || 600,
41
+ zIndex: options && options.zIndex || 1000,
42
recenterAuto: false,
43
hideEffect: Element.hide,
44
showEffect: Element.show,
45
id: 'browser_window',
46
onClose: this.closeDialog.bind(this)
47
+ }, options || {}));
48
new Ajax.Updater('modal_dialog_message', url, {evalScripts: true});
49
},
50
closeDialog: function(window) {
js/mage/adminhtml/events.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
// from http://www.someelement.com/2007/03/eventpublisher-custom-events-la-pubsub.html
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
// from http://www.someelement.com/2007/03/eventpublisher-custom-events-la-pubsub.html
js/mage/adminhtml/flexuploader.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/form.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var varienForm = new Class.create();
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var varienForm = new Class.create();
js/mage/adminhtml/giftmessage.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/giftoptions/tooltip.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/grid.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var varienGrid = new Class.create();
@@ -663,40 +663,23 @@ varienGridMassaction.prototype = {
663
};
664
},
665
massSelect: function(evt) {
666
- if(this.lastChecked.left !== false && this.lastChecked.top !== false) {
667
- // Left mouse button and "Shift" key was pressed together
668
- if(evt.button === 0 && evt.shiftKey === true) {
669
- var clickedOffset = Event.element(evt).viewportOffset();
670
-
671
- this.grid.rows.each(
672
- function(row) {
673
- var element = row.select('.massaction-checkbox')[0];
674
- var offset = element.viewportOffset();
675
-
676
- if(
677
- (
678
- // The checkbox is past the most recently clicked checkbox
679
- (offset.top < clickedOffset.top) &&
680
- // The checkbox is not past the "boundary" checkbox
681
- (offset.top > this.lastChecked.top || element == this.lastChecked.checkbox)
682
- )
683
- ||
684
- (
685
- // The checkbox is before the most recently clicked checkbox
686
- (offset.top > clickedOffset.top) &&
687
- // The checkbox is after the "boundary" checkbox
688
- (offset.top < this.lastChecked.top || element == this.lastChecked.checkbox)
689
- )
690
- ) {
691
- // Set the checkbox to the state of the most recently clicked checkbox
692
- element.checked = Event.element(evt).checked;
693
-
694
- this.setCheckbox(element);
695
- }
696
- }.bind(this)
697
- );
698
-
699
- this.updateCount();
700
}
701
}
702
@@ -705,6 +688,23 @@ varienGridMassaction.prototype = {
705
top: Event.element(evt).viewportOffset().top,
706
checkbox: Event.element(evt) // "boundary" checkbox
707
};
708
}
709
};
710
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var varienGrid = new Class.create();
663
};
664
},
665
massSelect: function(evt) {
666
+ if(this.lastChecked.left !== false
667
+ && this.lastChecked.top !== false
668
+ && evt.button === 0
669
+ && evt.shiftKey === true
670
+ ) {
671
+ var currentCheckbox = Event.element(evt);
672
+ var lastCheckbox = this.lastChecked.checkbox;
673
+ if (lastCheckbox != currentCheckbox) {
674
+ var start = this.getCheckboxOrder(lastCheckbox);
675
+ var finish = this.getCheckboxOrder(currentCheckbox);
676
+ if (start !== false && finish !== false) {
677
+ this.selectCheckboxRange(
678
+ Math.min(start, finish),
679
+ Math.max(start, finish),
680
+ currentCheckbox.checked
681
+ );
682
+ }
683
}
684
}
685
688
top: Event.element(evt).viewportOffset().top,
689
checkbox: Event.element(evt) // "boundary" checkbox
690
};
691
+ },
692
+ getCheckboxOrder: function(curCheckbox) {
693
+ var order = false;
694
+ this.getCheckboxes().each(function(checkbox, key){
695
+ if (curCheckbox == checkbox) {
696
+ order = key;
697
+ }
698
+ });
699
+ return order;
700
+ },
701
+ selectCheckboxRange: function(start, finish, isChecked){
702
+ this.getCheckboxes().each((function(checkbox, key){
703
+ if (key >= start && key <= finish) {
704
+ checkbox.checked = isChecked;
705
+ this.setCheckbox(checkbox);
706
+ }
707
+ }).bind(this));
708
}
709
};
710
js/mage/adminhtml/hash.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
/*
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
/*
js/mage/adminhtml/image.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/loader.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/magento-all.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/product.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/product/composite/configure.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/rules.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/sales.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var AdminOrder = new Class.create();
@@ -212,6 +212,7 @@ AdminOrder.prototype = {
212
data['order['+type+'_address][customer_address_id]'] = $('order-'+type+'_address_customer_address_id').value;
213
214
if (data['reset_shipping']) {
215
this.resetShippingMethod(data);
216
}
217
else {
@@ -277,6 +278,7 @@ AdminOrder.prototype = {
277
if ($('order-shipping_address_customer_address_id')) {
278
$('order-shipping_address_customer_address_id').disabled = flag;
279
}
280
if ($(this.shippingAddressContainer)) {
281
var dataFields = $(this.shippingAddressContainer).select('input', 'select', 'textarea');
282
for (var i = 0; i < dataFields.length; i++) {
@@ -295,6 +297,17 @@ AdminOrder.prototype = {
295
}
296
},
297
298
setShippingAsBilling : function(flag){
299
this.disableShippingAddress(flag);
300
if(flag){
@@ -364,7 +377,7 @@ AdminOrder.prototype = {
364
field.disabled = false;
365
if (!el.include('_before') && !el.include('_after') && !field.bindChange) {
366
field.bindChange = true;
367
- field.paymentContainer = form; //@deprecated after 1.4.0.0-rc1
368
field.method = method;
369
field.observe('change', this.changePaymentData.bind(this))
370
}
@@ -934,7 +947,7 @@ AdminOrder.prototype = {
934
else {
935
new Ajax.Request(url, {parameters:params,loaderArea: indicator});
936
}
937
- if (typeof productConfigure != 'undefined' && area instanceof Array && area.indexOf('items' != -1)) {
938
productConfigure.clean('quote_items');
939
}
940
},
@@ -952,14 +965,17 @@ AdminOrder.prototype = {
952
if(typeof this.loadingAreas == 'string'){
953
this.loadingAreas = [this.loadingAreas];
954
}
955
- if(this.loadingAreas.indexOf('message'==-1)) this.loadingAreas.push('message');
956
for(var i=0; i<this.loadingAreas.length; i++){
957
var id = this.loadingAreas[i];
958
if($(this.getAreaId(id))){
959
if ('message' != id || response[id]) {
960
var wrapper = new Element('div');
961
wrapper.update(response[id] ? response[id] : '');
962
- $(this.getAreaId(id)).update(wrapper);
963
}
964
if ($(this.getAreaId(id)).callback) {
965
this[$(this.getAreaId(id)).callback]();
@@ -1105,7 +1121,6 @@ AdminOrder.prototype = {
1105
}
1106
1107
var parentEl = el.up(1);
1108
- var parentPos = Element.cumulativeOffset(parentEl);
1109
if (show) {
1110
parentEl.removeClassName('ignore-validate');
1111
}
@@ -1125,6 +1140,7 @@ AdminOrder.prototype = {
1125
});
1126
}
1127
1128
el.setStyle({
1129
display: show ? 'none' : '',
1130
position: 'absolute',
@@ -1132,8 +1148,8 @@ AdminOrder.prototype = {
1132
opacity: 0.8,
1133
width: parentEl.getWidth() + 'px',
1134
height: parentEl.getHeight() + 'px',
1135
- top: parentPos[1] + 'px',
1136
- left: parentPos[0] + 'px'
1137
});
1138
},
1139
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var AdminOrder = new Class.create();
212
data['order['+type+'_address][customer_address_id]'] = $('order-'+type+'_address_customer_address_id').value;
213
214
if (data['reset_shipping']) {
215
+ this.turnOffShippingFields();
216
this.resetShippingMethod(data);
217
}
218
else {
278
if ($('order-shipping_address_customer_address_id')) {
279
$('order-shipping_address_customer_address_id').disabled = flag;
280
}
281
+
282
if ($(this.shippingAddressContainer)) {
283
var dataFields = $(this.shippingAddressContainer).select('input', 'select', 'textarea');
284
for (var i = 0; i < dataFields.length; i++) {
297
}
298
},
299
300
+ turnOffShippingFields : function() {
301
+ if ($(this.shippingAddressContainer)) {
302
+ var dataFields = $(this.shippingAddressContainer).select('input', 'select', 'textarea', 'button');
303
+ for (var i = 0; i < dataFields.length; i++) {
304
+ dataFields[i].removeAttribute('name');
305
+ dataFields[i].removeAttribute('id');
306
+ dataFields[i].readOnly = true;
307
+ }
308
+ }
309
+ },
310
+
311
setShippingAsBilling : function(flag){
312
this.disableShippingAddress(flag);
313
if(flag){
377
field.disabled = false;
378
if (!el.include('_before') && !el.include('_after') && !field.bindChange) {
379
field.bindChange = true;
380
+ field.paymentContainer = form; /** @deprecated after 1.4.0.0-rc1 */
381
field.method = method;
382
field.observe('change', this.changePaymentData.bind(this))
383
}
947
else {
948
new Ajax.Request(url, {parameters:params,loaderArea: indicator});
949
}
950
+ if (typeof productConfigure != 'undefined' && area instanceof Array && area.indexOf('items') != -1) {
951
productConfigure.clean('quote_items');
952
}
953
},
965
if(typeof this.loadingAreas == 'string'){
966
this.loadingAreas = [this.loadingAreas];
967
}
968
+ if(this.loadingAreas.indexOf('message') == -1) {
969
+ this.loadingAreas.push('message');
970
+ }
971
+
972
for(var i=0; i<this.loadingAreas.length; i++){
973
var id = this.loadingAreas[i];
974
if($(this.getAreaId(id))){
975
if ('message' != id || response[id]) {
976
var wrapper = new Element('div');
977
wrapper.update(response[id] ? response[id] : '');
978
+ $(this.getAreaId(id)).update(Prototype.Browser.IE ? wrapper.outerHTML : wrapper);
979
}
980
if ($(this.getAreaId(id)).callback) {
981
this[$(this.getAreaId(id)).callback]();
1121
}
1122
1123
var parentEl = el.up(1);
1124
if (show) {
1125
parentEl.removeClassName('ignore-validate');
1126
}
1140
});
1141
}
1142
1143
+ parentEl.setStyle({position: 'relative'});
1144
el.setStyle({
1145
display: show ? 'none' : '',
1146
position: 'absolute',
1148
opacity: 0.8,
1149
width: parentEl.getWidth() + 'px',
1150
height: parentEl.getHeight() + 'px',
1151
+ top: 0,
1152
+ left: 0
1153
});
1154
},
1155
js/mage/adminhtml/sales/packaging.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var Packaging = Class.create();
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var Packaging = Class.create();
js/mage/adminhtml/scrollbar.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
/**************************************************
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
/**************************************************
js/mage/adminhtml/tabs.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var varienTabs = new Class.create();
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var varienTabs = new Class.create();
js/mage/adminhtml/tools.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
function setLocation(url){
@@ -133,27 +133,23 @@ function toggleValueElements(checkbox, container, excludedElements, checked){
133
var isDisabled = (checked != undefined ? checked : checkbox.checked);
134
elems.each(function (elem) {
135
if (checkByProductPriceType(elem)) {
136
- var isIgnored = false;
137
- for (var i = 0; i < ignoredElements.length; i++) {
138
- if (elem == ignoredElements[i]) {
139
- isIgnored = true;
140
- break;
141
- }
142
- }
143
- if (isIgnored) {
144
return;
145
}
146
- elem.disabled=isDisabled;
147
if (isDisabled) {
148
elem.addClassName('disabled');
149
} else {
150
elem.removeClassName('disabled');
151
}
152
- if(elem.tagName == 'IMG') {
153
isDisabled ? elem.hide() : elem.show();
154
}
155
}
156
- })
157
}
158
}
159
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
function setLocation(url){
133
var isDisabled = (checked != undefined ? checked : checkbox.checked);
134
elems.each(function (elem) {
135
if (checkByProductPriceType(elem)) {
136
+ var i = ignoredElements.length;
137
+ while (i-- && elem != ignoredElements[i]);
138
+ if (i != -1) {
139
return;
140
}
141
+
142
+ elem.disabled = isDisabled;
143
if (isDisabled) {
144
elem.addClassName('disabled');
145
} else {
146
elem.removeClassName('disabled');
147
}
148
+ if (elem.nodeName.toLowerCase() == 'img') {
149
isDisabled ? elem.hide() : elem.show();
150
}
151
}
152
+ });
153
}
154
}
155
js/mage/adminhtml/uploader.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
/**
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
/**
js/mage/adminhtml/variables.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
tinyMCE.addI18n({en:{
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
tinyMCE.addI18n({en:{
js/mage/adminhtml/wysiwyg/tiny_mce/setup.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
@@ -75,7 +75,7 @@ tinyMceWysiwygSetup.prototype =
75
76
getSettings: function(mode)
77
{
78
- var plugins = 'safari,pagebreak,style,layer,table,advhr,advimage,emotions,iespell,media,searchreplace,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras';
79
80
if (this.config.widget_plugin_src) {
81
plugins = 'magentowidget,' + plugins;
@@ -176,7 +176,6 @@ tinyMceWysiwygSetup.prototype =
176
'store/' + storeId + '/';
177
178
this.mediaBrowserOpener = o.win;
179
- this.mediaBrowserOpener.blur();
180
this.mediaBrowserTargetElementId = o.field;
181
182
if (typeof(o.type) != 'undefined' && o.type != "") {
@@ -186,7 +185,11 @@ tinyMceWysiwygSetup.prototype =
186
typeTitle = this.translate('Insert File...');
187
}
188
189
- MediabrowserUtility.openDialog(wUrl, false, false, typeTitle);
190
},
191
192
translate: function(string) {
@@ -225,9 +228,11 @@ tinyMceWysiwygSetup.prototype =
225
e.show();
226
});
227
if (Prototype.Browser.IE) {
228
- // workaround for ie textarea redraw bug
229
- window.setTimeout(function(){
230
- $(this.id).value = $(this.id).value;
231
}.bind(this), 0);
232
}
233
},
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
75
76
getSettings: function(mode)
77
{
78
+ var plugins = 'inlinepopups,safari,pagebreak,style,layer,table,advhr,advimage,emotions,iespell,media,searchreplace,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras';
79
80
if (this.config.widget_plugin_src) {
81
plugins = 'magentowidget,' + plugins;
176
'store/' + storeId + '/';
177
178
this.mediaBrowserOpener = o.win;
179
this.mediaBrowserTargetElementId = o.field;
180
181
if (typeof(o.type) != 'undefined' && o.type != "") {
185
typeTitle = this.translate('Insert File...');
186
}
187
188
+ MediabrowserUtility.openDialog(wUrl, false, false, typeTitle, {
189
+ onBeforeShow: function(win) {
190
+ win.element.setStyle({zIndex: 300200});
191
+ }
192
+ });
193
},
194
195
translate: function(string) {
228
e.show();
229
});
230
if (Prototype.Browser.IE) {
231
+ // workaround for IE textarea redraw bug
232
+ window.setTimeout(function() {
233
+ if ($(this.id)) {
234
+ $(this.id).value = $(this.id).value;
235
+ }
236
}.bind(this), 0);
237
}
238
},
js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/adminhtml/wysiwyg/widget.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package Mage_Adminhtml
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/captcha.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var Captcha = Class.create();
19
*
20
* @category Mage
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var Captcha = Class.create();
js/mage/centinel.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var CentinelAuthenticate = Class.create();
19
*
20
* @category Mage
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var CentinelAuthenticate = Class.create();
js/mage/cookies.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
// old school cookie functions grabbed off the web
19
*
20
* @category Mage
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
// old school cookie functions grabbed off the web
js/mage/directpost.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var directPost = Class.create();
19
*
20
* @category Mage
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var directPost = Class.create();
js/mage/translate.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/translate_inline.css CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/mage/translate_inline.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Mage
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Mage
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/varien/accordion.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Varien
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
Accordion = Class.create();
19
*
20
* @category Varien
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
Accordion = Class.create();
js/varien/configurable.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Varien
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
if (typeof Product == 'undefined') {
@@ -40,12 +40,12 @@ Product.Config.prototype = {
40
this.state = new Hash();
41
this.priceTemplate = new Template(this.config.template);
42
this.prices = config.prices;
43
-
44
// Set default values from config
45
if (config.defaultValues) {
46
this.values = config.defaultValues;
47
}
48
-
49
// Overwrite defaults by url
50
var separatorIndex = window.location.href.indexOf('#');
51
if (separatorIndex != -1) {
@@ -58,7 +58,7 @@ Product.Config.prototype = {
58
this.values[i] = urlValues[i];
59
}
60
}
61
-
62
// Overwrite defaults by inputs values if needed
63
if (config.inputsInitialized) {
64
this.values = {};
@@ -69,8 +69,8 @@ Product.Config.prototype = {
69
}
70
}.bind(this));
71
}
72
-
73
- // Put events to check select reloads
74
this.settings.each(function(element){
75
Event.observe(element, 'change', this.configure.bind(this))
76
}.bind(this));
@@ -105,7 +105,7 @@ Product.Config.prototype = {
105
this.configureForValues();
106
document.observe("dom:loaded", this.configureForValues.bind(this));
107
},
108
-
109
configureForValues: function () {
110
if (this.values) {
111
this.settings.each(function(element){
@@ -168,7 +168,8 @@ Product.Config.prototype = {
168
var attributeId = element.id.replace(/[a-z]*/, '');
169
var options = this.getAttributeOptions(attributeId);
170
this.clearSelect(element);
171
- element.options[0] = new Option(this.config.chooseText, '');
172
173
var prevConfig = false;
174
if(element.prevSetting){
19
*
20
* @category Varien
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
if (typeof Product == 'undefined') {
40
this.state = new Hash();
41
this.priceTemplate = new Template(this.config.template);
42
this.prices = config.prices;
43
+
44
// Set default values from config
45
if (config.defaultValues) {
46
this.values = config.defaultValues;
47
}
48
+
49
// Overwrite defaults by url
50
var separatorIndex = window.location.href.indexOf('#');
51
if (separatorIndex != -1) {
58
this.values[i] = urlValues[i];
59
}
60
}
61
+
62
// Overwrite defaults by inputs values if needed
63
if (config.inputsInitialized) {
64
this.values = {};
69
}
70
}.bind(this));
71
}
72
+
73
+ // Put events to check select reloads
74
this.settings.each(function(element){
75
Event.observe(element, 'change', this.configure.bind(this))
76
}.bind(this));
105
this.configureForValues();
106
document.observe("dom:loaded", this.configureForValues.bind(this));
107
},
108
+
109
configureForValues: function () {
110
if (this.values) {
111
this.settings.each(function(element){
168
var attributeId = element.id.replace(/[a-z]*/, '');
169
var options = this.getAttributeOptions(attributeId);
170
this.clearSelect(element);
171
+ element.options[0] = new Option('', '');
172
+ element.options[0].innerHTML = this.config.chooseText;
173
174
var prevConfig = false;
175
if(element.prevSetting){
js/varien/form.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Varien
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
VarienForm = Class.create();
@@ -289,6 +289,7 @@ RegionUpdater.prototype = {
289
}
290
this.setMarkDisplay(this.regionSelectEl, true);
291
} else {
292
if (this.disableAction=='hide') {
293
if (this.regionTextEl) {
294
this.regionTextEl.style.display = '';
19
*
20
* @category Varien
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
VarienForm = Class.create();
289
}
290
this.setMarkDisplay(this.regionSelectEl, true);
291
} else {
292
+ this.regionSelectEl.options.length = 1;
293
if (this.disableAction=='hide') {
294
if (this.regionTextEl) {
295
this.regionTextEl.style.display = '';
js/varien/iehover-fix.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Varien
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
function toggleMenu(el, over)
19
*
20
* @category Varien
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
function toggleMenu(el, over)
js/varien/js.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Varien
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
function popWin(url,win,para) {
@@ -280,10 +280,12 @@ if (!window.Varien)
280
var Varien = new Object();
281
282
Varien.showLoading = function(){
283
- Element.show('loading-process');
284
}
285
Varien.hideLoading = function(){
286
- Element.hide('loading-process');
287
}
288
Varien.GlobalHandlers = {
289
onCreate: function() {
@@ -437,10 +439,13 @@ Varien.DateElement.prototype = {
437
},
438
validate: function() {
439
var error = false,
440
- day = parseInt(this.day.value.replace(/^0*/, '')) || 0,
441
- month = parseInt(this.month.value.replace(/^0*/, '')) || 0,
442
- year = parseInt(this.year.value) || 0;
443
- if (!day && !month && !year) {
444
if (this.required) {
445
error = 'This date is a required value.';
446
} else {
19
*
20
* @category Varien
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
function popWin(url,win,para) {
280
var Varien = new Object();
281
282
Varien.showLoading = function(){
283
+ var loader = $('loading-process');
284
+ loader && loader.show();
285
}
286
Varien.hideLoading = function(){
287
+ var loader = $('loading-process');
288
+ loader && loader.hide();
289
}
290
Varien.GlobalHandlers = {
291
onCreate: function() {
439
},
440
validate: function() {
441
var error = false,
442
+ day = parseInt(this.day.value, 10) || 0,
443
+ month = parseInt(this.month.value, 10) || 0,
444
+ year = parseInt(this.year.value, 10) || 0;
445
+ if (this.day.value.strip().empty()
446
+ && this.month.value.strip().empty()
447
+ && this.year.value.strip().empty()
448
+ ) {
449
if (this.required) {
450
error = 'This date is a required value.';
451
} else {
js/varien/menu.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Varien
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Varien
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
js/varien/payment.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Varien
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var paymentForm = Class.create();
19
*
20
* @category Varien
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var paymentForm = Class.create();
js/varien/product.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Varien
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
if(typeof Product=='undefined') {
@@ -133,14 +133,17 @@ Product.Zoom.prototype = {
133
this.imageZoom = this.floorZoom+(v*(this.ceilingZoom-this.floorZoom));
134
135
if (overSize) {
136
- if (this.imageDim.width > this.containerDim.width) {
137
this.imageEl.style.width = (this.imageZoom*this.containerDim.width)+'px';
138
- } else if (this.imageDim.height > this.containerDim.height) {
139
this.imageEl.style.height = (this.imageZoom*this.containerDim.height)+'px';
140
}
141
-
142
- if(this.containerDim.ratio){
143
- this.imageEl.style.height = (this.imageZoom*this.containerDim.width*this.containerDim.ratio)+'px'; // for safari
144
}
145
} else {
146
this.slider.setDisabled();
@@ -365,7 +368,8 @@ Product.Config.prototype = {
365
var attributeId = element.id.replace(/[a-z]*/, '');
366
var options = this.getAttributeOptions(attributeId);
367
this.clearSelect(element);
368
- element.options[0] = new Option(this.config.chooseText, '');
369
370
var prevConfig = false;
371
if(element.prevSetting){
@@ -561,7 +565,7 @@ Product.OptionsPrice.prototype = {
561
this.productOldPrice = config.productOldPrice;
562
this.priceInclTax = config.priceInclTax;
563
this.priceExclTax = config.priceExclTax;
564
- this.skipCalculate = config.skipCalculate;//@deprecated after 1.5.1.0
565
this.duplicateIdSuffix = config.idSuffix;
566
this.specialTaxPrice = config.specialTaxPrice;
567
this.tierPrices = config.tierPrices;
@@ -760,8 +764,8 @@ Product.OptionsPrice.prototype = {
760
};
761
var container = $(this.containers[3]) ? this.containers[3] : this.containers[0];
762
var price = parsePrice($(container).innerHTML);
763
- var tierPrice = $('.price.tier-' + i);
764
- tierPrice = tierPrice.length ? parseInt(tierPrice[0].innerHTML, 10) : 0;
765
var $percent = Selector.findChildElements(el, ['.percent.tier-' + i]);
766
$percent.each(function (el) {
767
el.innerHTML = Math.ceil(100 - ((100 / price) * tierPrice));
19
*
20
* @category Varien
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
if(typeof Product=='undefined') {
133
this.imageZoom = this.floorZoom+(v*(this.ceilingZoom-this.floorZoom));
134
135
if (overSize) {
136
+ if (this.imageDim.width > this.imageDim.height) {
137
this.imageEl.style.width = (this.imageZoom*this.containerDim.width)+'px';
138
+ } else {
139
this.imageEl.style.height = (this.imageZoom*this.containerDim.height)+'px';
140
}
141
+ if (this.containerDim.ratio) {
142
+ if (this.imageDim.width > this.imageDim.height) {
143
+ this.imageEl.style.height = (this.imageZoom*this.containerDim.width*this.containerDim.ratio)+'px'; // for safari
144
+ } else {
145
+ this.imageEl.style.width = (this.imageZoom*this.containerDim.height*this.containerDim.ratio)+'px'; // for safari
146
+ }
147
}
148
} else {
149
this.slider.setDisabled();
368
var attributeId = element.id.replace(/[a-z]*/, '');
369
var options = this.getAttributeOptions(attributeId);
370
this.clearSelect(element);
371
+ element.options[0] = new Option('', '');
372
+ element.options[0].innerHTML = this.config.chooseText;
373
374
var prevConfig = false;
375
if(element.prevSetting){
565
this.productOldPrice = config.productOldPrice;
566
this.priceInclTax = config.priceInclTax;
567
this.priceExclTax = config.priceExclTax;
568
+ this.skipCalculate = config.skipCalculate; /** @deprecated after 1.5.1.0 */
569
this.duplicateIdSuffix = config.idSuffix;
570
this.specialTaxPrice = config.specialTaxPrice;
571
this.tierPrices = config.tierPrices;
764
};
765
var container = $(this.containers[3]) ? this.containers[3] : this.containers[0];
766
var price = parsePrice($(container).innerHTML);
767
+ var tierPrice = $('.tier-price.tier-' + i+' .price');
768
+ tierPrice = tierPrice.length ? parsePrice(tierPrice[0].innerHTML, 10) : 0;
769
var $percent = Selector.findChildElements(el, ['.percent.tier-' + i]);
770
$percent.each(function (el) {
771
el.innerHTML = Math.ceil(100 - ((100 / price) * tierPrice));
js/varien/telephone.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Varien
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var telephoneElem = Class.create();
19
*
20
* @category Varien
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
var telephoneElem = Class.create();
js/varien/weee.js CHANGED
@@ -19,7 +19,7 @@
19
*
20
* @category Varien
21
* @package js
22
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
19
*
20
* @category Varien
21
* @package js
22
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
23
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
24
*/
25
package.xml CHANGED
@@ -1,18 +1,18 @@
1
<?xml version="1.0"?>
2
<package>
3
<name>Lib_Js_Mage</name>
4
- <version>1.7.0.1</version>
5
<stability>stable</stability>
6
<license>Mixed</license>
7
<channel>community</channel>
8
<extends/>
9
<summary>Javascript Libraries for Magento</summary>
10
<description>Javascript Libraries for Magento</description>
11
- <notes>1.7.0.1</notes>
12
<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
- <date>2012-06-20</date>
14
- <time>11:26:39</time>
15
- <contents><target name="mageweb"><dir name="js"><dir name="lib"><file name="boxover.js" hash="a5ade77452e8d5066cb84dcac3d34ed5"/><file name="ccard.js" hash="d3e849be0977d53de4af933b40293ff6"/><file name="dropdown.js" hash="7757104b80e01d507082b60a271f57e7"/><file name="ds-sleight.js" hash="85af457d444865d1587bfe4875bd4fc6"/><file name="FABridge.js" hash="64244d8d58abd42bd71f0ee3309767ad"/><file name="flex.js" hash="060f10cef353267ae9fbc04aaae9c961"/></dir><dir name="mage"><dir name="adminhtml"><file name="accordion.js" hash="d7cc8f6c90e080e1fb51917193e5606a"/><file name="backup.js" hash="144263655a5b8de10133c9d8f820ba48"/><file name="browser.js" hash="92b52032653fca56121c080d1d3af4b4"/><file name="events.js" hash="c25dc9026707492f99c2b540baae2a89"/><file name="flexuploader.js" hash="323a7703f4e513f129f32e7128ee95f8"/><file name="form.js" hash="d8c5f666cdfbe8b69b69d7eb9851e9f7"/><file name="giftmessage.js" hash="ca431002459046736333283c91a960dc"/><dir name="giftoptions"><file name="tooltip.js" hash="4922615b101277d29b6134946fa225ee"/></dir><file name="grid.js" hash="9c80acd70822d1617d110ee4a09f4335"/><file name="hash.js" hash="966e0d30a0ae5f49f0d88b854cd03938"/><file name="image.js" hash="2e9b2b2cb643696abd66080008f6d60b"/><file name="loader.js" hash="da82d1a8038dabb927a64c865c74738c"/><file name="magento-all.js" hash="6ea56eb8812f5cbb8b6d52cf10cbff38"/><dir name="product"><dir name="composite"><file name="configure.js" hash="53dd550f86fc844f7014595641855aab"/></dir></dir><file name="product.js" hash="ed9ce060316daef1b12114a9032cc055"/><file name="rules.js" hash="119108973a2b00903832a3d9b7f9f52b"/><dir name="sales"><file name="packaging.js" hash="db2815a9e6827240757f5465e5bb6cad"/></dir><file name="sales.js" hash="a1df25cf1fe8c45c6efe0e8816690b43"/><file name="scrollbar.js" hash="9f667d4cb5f0bac81c9904d776fb6ef7"/><file name="tabs.js" hash="592a85acec47abe61c849639c99c0f6f"/><file name="tools.js" hash="86bbebe2745581cd8f613ceb5ef82269"/><file name="uploader.js" hash="f26849cfba32c032b6b9eaefd6a25335"/><file name="variables.js" hash="d435a922116e7aa987847f2c393f3a91"/><dir name="wysiwyg"><dir name="tiny_mce"><dir name="plugins"><dir name="magentovariable"><file name="editor_plugin.js" hash="b8dbb8f7cc375c9593e1fd90ec906a50"/><dir name="img"><file name="icon.gif" hash="682b29a0e734f952cb2edabede6a25d1"/></dir></dir><dir name="magentowidget"><file name="editor_plugin.js" hash="87ea6f9c3fbe5da01641972ab7a64890"/><dir name="img"><file name="icon.gif" hash="532c141286373f098f1f4362e001c7f8"/></dir></dir></dir><file name="setup.js" hash="620d54292445b941c236b5324d3af304"/><dir name="themes"><dir name="advanced"><dir name="skins"><dir name="default"><file name="content.css" hash="297eee5563d686c6d35a7bee4d594f4a"/><file name="dialog.css" hash="4e1e5f92c4e7ed40c5d49fda68b84751"/></dir></dir></dir></dir></dir><file name="widget.js" hash="871d4672a43f227bff4deef36fda5215"/></dir></dir><file name="captcha.js" hash="159fcd4a765500a54bad03a41b592371"/><file name="centinel.js" hash="ee5d37c1ea3465d91184c48f5f2d6df0"/><file name="cookies.js" hash="910c5adfacb3e86d4dc3abc4a03f6b72"/><file name="directpost.js" hash="4a2a4778b51a25922d29cead199d1559"/><file name="translate_inline.css" hash="c60b7f338f5c369feeda574325dfeda0"/><file name="translate_inline.js" hash="04b7a93d865b1912ac9797624ba5c8b5"/><file name="translate.js" hash="ba0eda44563ecf432eaabd5c681d7ed5"/></dir><dir name="varien"><file name="accordion.js" hash="cd2d7e0af239a0474de3c93408b9b85f"/><file name="configurable.js" hash="a578e6e7aeba8e4588aecb068fe8b3f9"/><file name="form.js" hash="c16ed6f82b78d8f3bc07de6f5ebd8eb6"/><file name="iehover-fix.js" hash="7def97b6b209314c761178f0e50c4d25"/><file name="js.js" hash="bff5486446e27aeceb7eb73de7756c17"/><file name="menu.js" hash="a457935d44e224b38fce6ad4bdd17e2c"/><file name="payment.js" hash="88dc739195b68244382573b4ad87a94b"/><file name="product.js" hash="baccd30adfbec3c2b4331bc31f1df9d7"/><file name="telephone.js" hash="fd686f1e9635984bb1b754ec3eac5db0"/><file name="weee.js" hash="7c22f52bacac3de7fbd961b49910884e"/></dir><file name="blank.html" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="index.php" hash="9a76023de59c1958cac0473ef31efa26"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><dir name="flash"><file name="AC_RunActiveContent.js" hash="3e038cea960c1b650442b85cea237053"/></dir></dir></target></contents>
16
<compatible/>
17
- <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Lib_Js_Prototype</name><channel>community</channel><min>1.7.0.0.3</min><max>1.7.1.0</max></package></required></dependencies>
18
</package>
1
<?xml version="1.0"?>
2
<package>
3
<name>Lib_Js_Mage</name>
4
+ <version>1.8.0.0</version>
5
<stability>stable</stability>
6
<license>Mixed</license>
7
<channel>community</channel>
8
<extends/>
9
<summary>Javascript Libraries for Magento</summary>
10
<description>Javascript Libraries for Magento</description>
11
+ <notes>1.8.0.0</notes>
12
<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
+ <date>2013-09-24</date>
14
+ <time>09:09:42</time>
15
+ <contents><target name="mageweb"><dir name="js"><dir name="lib"><file name="boxover.js" hash="a5ade77452e8d5066cb84dcac3d34ed5"/><file name="ccard.js" hash="d3e849be0977d53de4af933b40293ff6"/><file name="dropdown.js" hash="59f4f83e1dabf0a755e563f352ca897d"/><file name="ds-sleight.js" hash="85af457d444865d1587bfe4875bd4fc6"/><file name="FABridge.js" hash="64244d8d58abd42bd71f0ee3309767ad"/><file name="flex.js" hash="2833054f3e3040e98014621b60bbbb85"/></dir><dir name="mage"><dir name="adminhtml"><file name="accordion.js" hash="b6161df7432f44074a240295ece00532"/><file name="backup.js" hash="28cb096d1f81542b314a36e0bca8638c"/><file name="browser.js" hash="79a10c4a78aa109efe0c96fec10c885f"/><file name="events.js" hash="732067f6a9ee289849901daf650e7279"/><file name="flexuploader.js" hash="46eb45e3285df0e1eac97a5112e753b3"/><file name="form.js" hash="2db66b43acabc8e3ec13ac84a95f3c5c"/><file name="giftmessage.js" hash="a552774c6b91722bc7d525f603e20cc1"/><dir name="giftoptions"><file name="tooltip.js" hash="07d82234a7680e7222e6b2ac667caed7"/></dir><file name="grid.js" hash="822246fc687e2164680a6587ea2f4ce8"/><file name="hash.js" hash="7ef7287161eda370f5856eeb8b40b91d"/><file name="image.js" hash="1f71519a2eb2326acef74fa2defe2d73"/><file name="loader.js" hash="8bdf6c1bc16c458711ca3597922931b0"/><file name="magento-all.js" hash="3d521110ba9afbbffcb20e4238c62b11"/><dir name="product"><dir name="composite"><file name="configure.js" hash="a9bd5bbc7a7619fffd859aa8b7d0a2d2"/></dir></dir><file name="product.js" hash="000826460eca2d405b98ef57a4890bf3"/><file name="rules.js" hash="a827fe4f2bdaea5fe0dcac206c958355"/><dir name="sales"><file name="packaging.js" hash="9941efa8ecb61004504ca1cfe0b6b856"/></dir><file name="sales.js" hash="26c8fd113b4e51aeffe200ce7880b67a"/><file name="scrollbar.js" hash="2b303f431f23ff6b58bafeb6599c97aa"/><file name="tabs.js" hash="6b912991ccb7805b5038b633a435de00"/><file name="tools.js" hash="c5f8f2f8c69ca53546a966065cca5d9e"/><file name="uploader.js" hash="ef900af8fd343fee143abafbc42b2da8"/><file name="variables.js" hash="0d3a859eaa32b35f048bf946fd496244"/><dir name="wysiwyg"><dir name="tiny_mce"><dir name="plugins"><dir name="magentovariable"><file name="editor_plugin.js" hash="33aa3999aec905d1f32199426ad78570"/><dir name="img"><file name="icon.gif" hash="682b29a0e734f952cb2edabede6a25d1"/></dir></dir><dir name="magentowidget"><file name="editor_plugin.js" hash="7e3cc1adc243559bf55d9eb4c836aec8"/><dir name="img"><file name="icon.gif" hash="532c141286373f098f1f4362e001c7f8"/></dir></dir></dir><file name="setup.js" hash="58bff8b95d60c93efd8d686e35b7a2b9"/><dir name="themes"><dir name="advanced"><dir name="skins"><dir name="default"><file name="content.css" hash="787fd97c0640646b1a471b3b84b559fe"/><file name="dialog.css" hash="70c98cab1e2eef43ca68429720f946b0"/></dir></dir></dir></dir></dir><file name="widget.js" hash="48dd1877b3731a775c8a41d1981e339e"/></dir></dir><file name="captcha.js" hash="ff5ecf8cf78c4cc1b2a61157878d1913"/><file name="centinel.js" hash="aa8036d10159786454413df2b3dba6bd"/><file name="cookies.js" hash="3b9f031ab2859f553bac1dcee4614cad"/><file name="directpost.js" hash="43c9ce054295bd2bf99272d3a21ffcb5"/><file name="translate_inline.css" hash="6adbdc441637a5ec8409e4272309df35"/><file name="translate_inline.js" hash="af5ab4a6192b9f30aa76c3bbbdb9dc2c"/><file name="translate.js" hash="33fd17d71ec8ef4ee1de5f10a69d0b7d"/></dir><dir name="varien"><file name="accordion.js" hash="9e2631995ce93f0c905b14a5c831b441"/><file name="configurable.js" hash="11e2fc14a2f3a09c2dffdc57b6f72fe3"/><file name="form.js" hash="97f4e9bb5c9b78bff3de601dd3447975"/><file name="iehover-fix.js" hash="3c6179bd66597c07fe825798a3606ce3"/><file name="js.js" hash="fff0a9a07982c134d54b5b00c0c8884c"/><file name="menu.js" hash="6a914283a1414a66771bc915f4ca9dd9"/><file name="payment.js" hash="09eba80d26ae8fda53fdb6b296a1fa62"/><file name="product.js" hash="90ab2ca1e4303cc4ba3e41140b038f68"/><file name="telephone.js" hash="d3cead00e1fd7c1d805cad8cd2fbaada"/><file name="weee.js" hash="b743eab978648fbf67c2e99baa756ab8"/></dir><file name="blank.html" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="index.php" hash="9a76023de59c1958cac0473ef31efa26"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><dir name="flash"><file name="AC_RunActiveContent.js" hash="3e038cea960c1b650442b85cea237053"/></dir></dir></target></contents>
16
<compatible/>
17
+ <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Lib_Js_Prototype</name><channel>community</channel><min>1.7.0.0.4</min><max>1.7.1.0</max></package></required></dependencies>
18
</package>