Author: sshyrkov Date: Mon Oct 1 16:32:17 2007 New Revision: 18715 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18715&repname= =3Djahia Log: JAHIA-2405: SP3: New work in progress bar: bug with IE6 =
http://www.jahia.net/jira/browse/JAHIA-2405 Resolution: next try to find the workaround for IE6 Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/engin= es.js Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript= /engines.js URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/javascript/engines.js&rev=3D18715&repname= =3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/engin= es.js (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/engin= es.js Mon Oct 1 16:32:17 2007 @@ -1,6 +1,7 @@ -var jahia =3D new Object(); -jahia.config =3D new Object(); - +if (!jahia || !jahia.config) { + var jahia =3D new Object(); + jahia.config =3D new Object(); +} function check() { // override this function if neede d in subengine to perform form = data check // before submit !!! @@ -225,26 +226,35 @@ = WorkInProgressLoader.prototype =3D { initialize: function () { - this._createMarkup(jahia.config.contextPath); + this.isIE =3D navigator.appVersion.match(/\bMSIE\b/); + this.webContext =3D jahia.config.contextPath; + this._createMarkup(); }, launch: function() { - if (navigator.appVersion.match(/\bMSIE\b/)){ + if (this.isIE){ this._prepareIE('100%', 'hidden'); window.scrollTo(0, 0); $A(document.getElementsByTagName('select')).map(Element.extend).i= nvoke('hide'); + var imgLoading =3D document.createElement('img'); + imgLoading.src =3D this.webContext + '/jsp/jahia/engines/images/w= aiting_large.gif'; + imgLoading.alt =3D 'Loading...'; + imgLoading.title =3D 'Loading...'; + $('workInProgressOverlay').appendChild(imgLoading); } $('workInProgressOverlay').style.display =3D 'block'; }, = - _createMarkup: function(webContext) { + _createMarkup: function() { bod =3D document.getElementsByTagName('body')[0]; overlay =3D document.createElement('div'); overlay.id =3D 'workInProgressOverlay'; - var imgLoading =3D document.createElement('img'); - imgLoading.src =3D webContext + '/jsp/jahia/engines/images/waiting= _large.gif'; - imgLoading.alt =3D 'Loading...'; - imgLoading.title =3D 'Loading...'; - overlay.appendChild(imgLoading); + if (!this.isIE){ + var imgLoading =3D document.createElement('img'); + imgLoading.src =3D this.webContext + '/jsp/jahia/engines/image= s/waiting_large.gif'; + imgLoading.alt =3D 'Loading...'; + imgLoading.title =3D 'Loading...'; + overlay.appendChild(imgLoading); + } bod.appendChild(overlay); }, = _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
