diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit.phtml index f9c56f311c9..be968fe9df4 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit.phtml @@ -57,9 +57,7 @@ if (response.attribute && $(response.attribute)) { $(response.attribute).setHasError(true, productForm); Validation.ajaxError($(response.attribute), response.message); - if (!Prototype.Browser.IE){ - $(response.attribute).focus(); - } + $(response.attribute).focus(); } else if ($('messages')) { $('messages').innerHTML = ''; diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml index a20b55b9db5..9e86edab188 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml @@ -43,9 +43,7 @@ attributesForm._processValidationResult = function(transport) { if (response.attribute && $(response.attribute)) { $(response.attribute).setHasError(true, attributesForm); Validation.ajaxError($(response.attribute), response.message); - if (!Prototype.Browser.IE){ - $(response.attribute).focus(); - } + $(response.attribute).focus(); } else if ($('messages')) { $('messages').innerHTML = ''; } diff --git a/app/design/adminhtml/default/default/template/notification/window.phtml b/app/design/adminhtml/default/default/template/notification/window.phtml index cc042d88dcd..9992a642827 100644 --- a/app/design/adminhtml/default/default/template/notification/window.phtml +++ b/app/design/adminhtml/default/default/template/notification/window.phtml @@ -31,13 +31,11 @@ function openMessagePopup() { var height = $('html-body').getHeight(); $('message-popup-window-mask').setStyle({'height':height+'px'}); - toggleSelectsUnderBlock($('message-popup-window-mask'), false); Element.show('message-popup-window-mask'); $('message-popup-window').addClassName('show'); } function closeMessagePopup() { - toggleSelectsUnderBlock($('message-popup-window-mask'), true); Element.hide('message-popup-window-mask'); $('message-popup-window').removeClassName('show'); messagePopupClosed = true; diff --git a/js/mage/adminhtml/browser.js b/js/mage/adminhtml/browser.js index 6441c5be0b0..d8bc31e9b1f 100644 --- a/js/mage/adminhtml/browser.js +++ b/js/mage/adminhtml/browser.js @@ -46,8 +46,6 @@ MediabrowserUtility = { window = this.dialogWindow; } if (window) { - // IE fix - hidden form select fields after closing dialog - WindowUtilities._showSelect(); window.close(); } } diff --git a/js/mage/adminhtml/form.js b/js/mage/adminhtml/form.js index b315d967dab..e8ddc3f4788 100644 --- a/js/mage/adminhtml/form.js +++ b/js/mage/adminhtml/form.js @@ -391,26 +391,6 @@ RegionUpdater.prototype = { regionUpdater = RegionUpdater; -/** - * Fix errorrs in IE - */ -Event.pointerX = function(event){ - try{ - return event.pageX || (event.clientX +(document.documentElement.scrollLeft || document.body.scrollLeft)); - } - catch(e){ - - } -}; -Event.pointerY = function(event){ - try{ - return event.pageY || (event.clientY +(document.documentElement.scrollTop || document.body.scrollTop)); - } - catch(e){ - - } -}; - SelectUpdater = Class.create(); SelectUpdater.prototype = { initialize: function (firstSelect, secondSelect, selectFirstMessage, noValuesMessage, values, selected) diff --git a/js/mage/adminhtml/giftmessage.js b/js/mage/adminhtml/giftmessage.js index c9326fcd24d..60a4ed460df 100644 --- a/js/mage/adminhtml/giftmessage.js +++ b/js/mage/adminhtml/giftmessage.js @@ -166,7 +166,6 @@ GiftOptionsPopup.prototype = { var element = Event.element(event).id; var itemId = element.sub('gift_options_link_',''); - toggleSelectsUnderBlock(this.giftOptionsWindowMask, false); this.giftOptionsWindowMask = $('gift_options_window_mask'); this.giftOptionsWindow = $('gift_options_configure'); this.giftOptionsWindow.select('select').each(function(el){ @@ -207,7 +206,6 @@ GiftOptionsPopup.prototype = { }, closeWindow : function() { - toggleSelectsUnderBlock(this.giftOptionsWindowMask, true); this.giftOptionsWindowMask.style.display = 'none'; this.giftOptionsWindow.style.display = 'none'; } diff --git a/js/mage/adminhtml/grid.js b/js/mage/adminhtml/grid.js index ca367706cd1..f7975b675d1 100644 --- a/js/mage/adminhtml/grid.js +++ b/js/mage/adminhtml/grid.js @@ -183,27 +183,10 @@ varienGrid.prototype = { setLocation(response.ajaxRedirect); } } else { - /** - * For IE <= 7. - * If there are two elements, and first has name, that equals id of second. - * In this case, IE will choose one that is above - * - * @see https://prototype.lighthouseapp.com/projects/8886/tickets/994-id-selector-finds-elements-by-name-attribute-in-ie7 - */ - var divId = $(this.containerId); - if (divId.id == this.containerId) { - divId.update(responseText); - } else { - $$('div[id="'+this.containerId+'"]')[0].update(responseText); - } + $(this.containerId).update(responseText); } } catch (e) { - var divId = $(this.containerId); - if (divId.id == this.containerId) { - divId.update(responseText); - } else { - $$('div[id="'+this.containerId+'"]')[0].update(responseText); - } + $(this.containerId).update(responseText); } }.bind(this) }); diff --git a/js/mage/adminhtml/loader.js b/js/mage/adminhtml/loader.js index 9fa8cf25b81..48279237dce 100644 --- a/js/mage/adminhtml/loader.js +++ b/js/mage/adminhtml/loader.js @@ -208,17 +208,14 @@ function showLoader(loaderArea) { return; } Element.clonePosition(loadingMask, loaderArea, {offsetLeft:-2}); - toggleSelectsUnderBlock(loadingMask, false); Element.show(loadingMask); Element.childElements(loadingMask).invoke('hide'); - setLoaderPosition(); loaderTimeout = setTimeout(function() { Element.childElements(loadingMask).invoke('show'); }, typeof window.LOADING_TIMEOUT === 'undefined' ? 200 : window.LOADING_TIMEOUT); } function hideLoader() { - toggleSelectsUnderBlock($('loading-mask'), true); Element.hide('loading-mask'); if(loaderTimeout) { clearTimeout(loaderTimeout); @@ -226,54 +223,12 @@ function hideLoader() { } } -/** - * @todo need calculate middle of visible area and scroll bind - */ -function setLoaderPosition(){ - var elem = $('loading_mask_loader'); - if (elem && Prototype.Browser.IE) { - var elementDims = elem.getDimensions(); - var viewPort = document.viewport.getDimensions(); - var offsets = document.viewport.getScrollOffsets(); - elem.style.left = Math.floor(viewPort.width / 2 + offsets.left - elementDims.width / 2) + 'px'; - elem.style.top = Math.floor(viewPort.height / 2 + offsets.top - elementDims.height / 2) + 'px'; - elem.style.position = 'absolute'; - } +/** @deprecated since 20.0.19 */ +function setLoaderPosition() { } -/*function getRealHeight() { - var body = document.body; - if (window.innerHeight && window.scrollMaxY) { - return window.innerHeight + window.scrollMaxY; - } - return Math.max(body.scrollHeight, body.offsetHeight); -}*/ - - - -function toggleSelectsUnderBlock(block, flag){ - if(Prototype.Browser.IE){ - var selects = document.getElementsByTagName("select"); - for(var i=0; i= 0; i--) { @@ -319,7 +314,7 @@ var toolbarToggle = { // Checks whether object properties are ready and valid ready: function () { // Return definitely boolean value - return (this.compatible && this.header && this.headerCopy && this.headerCopy.parentNode) ? true : false; + return (this.header && this.headerCopy && this.headerCopy.parentNode) ? true : false; }, // Updates toolbars for current scroll - shows/hides normal and floating toolbar @@ -410,10 +405,6 @@ var toolbarToggle = { // Starts object on window load startOnLoad: function () { - if (!this.compatible) { - return; - } - if (!this.funcOnWindowLoad) { this.funcOnWindowLoad = this.start.bind(this); } @@ -430,10 +421,6 @@ var toolbarToggle = { // Starts object by creating toolbar and enabling scroll/resize events start: function () { - if (!this.compatible) { - return; - } - this.reset(); this.startListening(); }, diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/js/mage/adminhtml/wysiwyg/tiny_mce/setup.js index df7768b5a3c..3340e5a26a7 100644 --- a/js/mage/adminhtml/wysiwyg/tiny_mce/setup.js +++ b/js/mage/adminhtml/wysiwyg/tiny_mce/setup.js @@ -479,14 +479,6 @@ tinyMceWysiwygSetup.prototype = this.getPluginButtons().each(function(e) { e.show(); }); - if (Prototype.Browser.IE) { - // workaround for IE textarea redraw bug - window.setTimeout(function() { - if ($(this.id)) { - $(this.id).value = $(this.id).value; - } - }.bind(this), 0); - } }, closePopups: function() { diff --git a/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css b/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css index 96edcf25a66..5d0bb5ee68b 100644 --- a/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css +++ b/js/mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css @@ -35,15 +35,3 @@ del {color:red; text-decoration:line-through} cite {border-bottom:1px dashed blue} acronym {border-bottom:1px dotted #CCC; cursor:help} abbr, html\:abbr {border-bottom:1px dashed #CCC; cursor:help} - -/* IE */ -* html body { -scrollbar-3dlight-color:#F0F0EE; -scrollbar-arrow-color:#676662; -scrollbar-base-color:#F0F0EE; -scrollbar-darkshadow-color:#DDD; -scrollbar-face-color:#E0E0DD; -scrollbar-highlight-color:#F0F0EE; -scrollbar-shadow-color:#F0F0EE; -scrollbar-track-color:#F5F5F5; -} diff --git a/js/mage/adminhtml/wysiwyg/widget.js b/js/mage/adminhtml/wysiwyg/widget.js index 6668c3a3b41..b81585ac4aa 100644 --- a/js/mage/adminhtml/wysiwyg/widget.js +++ b/js/mage/adminhtml/wysiwyg/widget.js @@ -63,8 +63,6 @@ var widgetTools = { window = this.dialogWindow; } if (window) { - // IE fix - hidden form select fields after closing dialog - WindowUtilities._showSelect(); window.close(); } } diff --git a/js/mage/directpost.js b/js/mage/directpost.js index b05c5988056..e4fff34d380 100644 --- a/js/mage/directpost.js +++ b/js/mage/directpost.js @@ -366,18 +366,10 @@ directPost.prototype = { createHiddenElement : function(name, value) { var field; - if (isIE) { - field = document.createElement('input'); - field.setAttribute('type', 'hidden'); - field.setAttribute('name', name); - field.setAttribute('value', value); - } else { - field = document.createElement('input'); - field.type = 'hidden'; - field.name = name; - field.value = value; - } - + field = document.createElement('input'); + field.type = 'hidden'; + field.name = name; + field.value = value; return field; }, diff --git a/js/mage/translate_inline.js b/js/mage/translate_inline.js index 0195be835cc..d1a90c3305b 100644 --- a/js/mage/translate_inline.js +++ b/js/mage/translate_inline.js @@ -25,20 +25,6 @@ TranslateInline.prototype = { this.trigTimer = null; this.trigContentEl = null; - if (Prototype.Browser.IE) { - $$('*[data-translate]').each(this.initializeElement.bind(this)); - var scope = this; - Ajax.Responders.register({ onComplete: function() { - window.setTimeout(scope.reinitElements.bind(scope), 50); - } - }); - var ElementNode = (typeof HTMLElement != 'undefined' ? HTMLElement : Element); - var ElementUpdate = ElementNode.prototype.update; - ElementNode.prototype.update = function() { - ElementUpdate.apply(this, arguments); - $(this).select('*[data-translate]').each(scope.initializeElement.bind(scope)); - }; - } this.trigEl = $(trigEl); this.trigEl.observe('click', this.formShow.bind(this)); diff --git a/js/varien/js.js b/js/varien/js.js index 5da09ca464e..d0341144ba3 100644 --- a/js/varien/js.js +++ b/js/varien/js.js @@ -240,8 +240,8 @@ function expandDetails(el, childClass) { } } -// Version 1.0 -var isIE = navigator.appVersion.match(/MSIE/) == "MSIE"; +/** @deprecated since 20.0.19 */ +var isIE = false; if (!window.Varien) var Varien = new Object(); @@ -618,16 +618,9 @@ Element.addMethods({ * @example fireEvent($('my-input', 'click')); */ function fireEvent(element, event) { - if (document.createEvent) { - // dispatch for all browsers except IE before version 9 - var evt = document.createEvent("HTMLEvents"); - evt.initEvent(event, true, true ); // event type, bubbling, cancelable - return element.dispatchEvent(evt); - } else { - // dispatch for IE before version 9 - var evt = document.createEventObject(); - return element.fireEvent('on' + event, evt); - } + var evt = document.createEvent("HTMLEvents"); + evt.initEvent(event, true, true ); // event type, bubbling, cancelable + return element.dispatchEvent(evt); } /** @@ -651,21 +644,6 @@ function modulo(dividend, divisor) return remainder; } -/** - * createContextualFragment is not supported in IE9. Adding its support. - */ -if ((typeof Range != "undefined") && !Range.prototype.createContextualFragment) -{ - Range.prototype.createContextualFragment = function(html) - { - var frag = document.createDocumentFragment(), - div = document.createElement("div"); - frag.appendChild(div); - div.outerHTML = html; - return frag; - }; -} - /** * Create form element. Set parameters into it and send * diff --git a/js/varien/menu.js b/js/varien/menu.js index 2e168021284..c0f3360f6ae 100644 --- a/js/varien/menu.js +++ b/js/varien/menu.js @@ -30,21 +30,13 @@ var mainNav = function() { settings : { show_delay : 0, hide_delay : 0, - _ie6 : /MSIE 6.+Win/.test(navigator.userAgent), - _ie7 : /MSIE 7.+Win/.test(navigator.userAgent) }, init : function(obj, level) { obj.lists = obj.childElements(); obj.lists.each(function(el,ind){ main.handlNavElement(el); - if((main.settings._ie6 || main.settings._ie7) && level){ - main.ieFixZIndex(el, ind, obj.lists.size()); - } }); - if(main.settings._ie6 && !level){ - document.execCommand("BackgroundImageCache", false, true); - } }, handlNavElement : function(list) { @@ -61,15 +53,6 @@ var mainNav = function() { } }, - ieFixZIndex : function(el, i, l) { - if(el.tagName.toString().toLowerCase().indexOf("iframe") == -1){ - el.style.zIndex = l - i; - } else { - el.onmouseover = "null"; - el.onmouseout = "null"; - } - }, - fireNavEvent : function(elm,ev) { if(ev){ elm.addClassName("over"); diff --git a/js/varien/product.js b/js/varien/product.js index f36197e250c..fa6448ad687 100644 --- a/js/varien/product.js +++ b/js/varien/product.js @@ -104,12 +104,6 @@ Product.Zoom.prototype = { toggleFull: function () { this.showFull = !this.showFull; - //Hide selects for IE6 only - if (typeof document.body.style.maxHeight == "undefined") { - for (i=0; i