Administrator
|
Beware, looks some comment parts are no copied...
Jacques From: <[hidden email]> > Author: doogie > Date: Wed Sep 15 18:01:26 2010 > New Revision: 997430 > > URL: http://svn.apache.org/viewvc?rev=997430&view=rev > Log: > Applied fix from trunk for revision: 997420 > === > > Fix incorrect use of window->load event, instead doing > document->dom:loaded. In internet explorer, the window->load event can > > Modified: > ofbiz/branches/release10.04/ (props changed) > ofbiz/branches/release10.04/applications/accounting/webapp/accounting/images/costCenters.js > ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js > ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js > ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/return.js > ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl > ofbiz/branches/release10.04/applications/party/webapp/partymgr/js/PartyProfileContent.js > ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js > ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js > ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js > ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js > ofbiz/branches/release10.04/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js > ofbiz/branches/release10.04/themes/bizznesstime/webapp/bizznesstime/js/application.js > ofbiz/branches/release10.04/themes/droppingcrumbs/webapp/droppingcrumbs/js/application.js > ofbiz/branches/release10.04/themes/tomahawk/includes/appbarClose.ftl > > Propchange: ofbiz/branches/release10.04/ > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Wed Sep 15 18:01:26 2010 > @@ -1,3 +1,3 @@ > /ofbiz/branches/addbirt:831210-885099,885686-886087 > /ofbiz/branches/multitenant20100310:921280-927264 > -/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,9 > 485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997419 > +/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,9 91 > 485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420 > > Modified: ofbiz/branches/release10.04/applications/accounting/webapp/accounting/images/costCenters.js > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/webapp/accounting/images/costCenters.js?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/applications/accounting/webapp/accounting/images/costCenters.js (original) > +++ ofbiz/branches/release10.04/applications/accounting/webapp/accounting/images/costCenters.js Wed Sep 15 18:01:26 2010 > @@ -17,7 +17,7 @@ > * under the License. > */ > > -Event.observe(window, 'load', function() { > +document.observe('dom:loaded', function() { > Event.observe($('costCentersSubmit'), 'click', processCostCenterData); > // Find all text boxes in form and add a method to list on for on change. > var categoryShareInputs = $('costCenters').getInputs('text'); > > Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js (original) > +++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js Wed Sep 15 18:01:26 2010 > @@ -18,7 +18,7 @@ under the License. > */ > > var validateNewShippingAdd = null; > -Event.observe(window, 'load', function() { > +document.observe('dom:loaded', function() { > if ($('addShippingAddress')) { > validateNewShippingAdd = new Validation('addShippingAddress', {immediate: true, onSubmit: false}); > Event.observe($('countryGeoId'), 'change', function() { > > Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js (original) > +++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js Wed Sep 15 18:01:26 2010 > @@ -17,7 +17,7 @@ > * under the License. > */ > > -Event.observe(window, 'load', function() { > +document.observe('dom:loaded', function() { > // Autocompleter for shipping panel > // Preventing getCountryList() from calling and not removed all autocompleter functions so that we can reuse in future. > //getCountryList(); > > Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/return.js > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/return.js?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/return.js (original) > +++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/images/js/return.js Wed Sep 15 18:01:26 2010 > @@ -17,7 +17,7 @@ specific language governing permissions > under the License. > */ > > -Event.observe(window, 'load', function() { > +document.observe('dom:loaded', function() { > Event.observe($('returnHeaderTypeId'), 'change', function() { > changeStatusCorrespondingToHeaderType(); > }); > > Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) > +++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Wed Sep 15 18:01:26 2010 > @@ -340,7 +340,9 @@ under the License. > </form> > </div> > <script language="JavaScript" type="text/javascript"> > + document.observe('dom:loaded', function() { > new Popup('newShippingAddressForm', 'newShippingAddress', {modal: true, position: 'center', trigger: 'click'}) > + }); > </script> > <table width="100%" border="0" cellpadding="1" cellspacing="0"> > <#if shipGroup.supplierPartyId?has_content> > > Modified: ofbiz/branches/release10.04/applications/party/webapp/partymgr/js/PartyProfileContent.js > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/webapp/partymgr/js/PartyProfileContent.js?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/applications/party/webapp/partymgr/js/PartyProfileContent.js (original) > +++ ofbiz/branches/release10.04/applications/party/webapp/partymgr/js/PartyProfileContent.js Wed Sep 15 18:01:26 2010 > @@ -19,7 +19,7 @@ under the License. > > var progressBar; > > -Event.observe(window, 'load', function() { > +document.observe('dom:loaded', function() { > Event.observe('uploadPartyContent', 'submit', uploadPartyContent); > Event.observe('uploadPartyContent', 'submit', getUploadProgressStatus); > progressBar = new Control.ProgressBar('progress_bar'); > > Modified: ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original) > +++ ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js Wed Sep 15 18:01:26 2010 > @@ -21,7 +21,7 @@ var isShipStepValidate = false; > var isShipOptionStepValidate = false; > var isBillStepValidate = false; > > -Event.observe(window, 'load', function() { > +document.observe('dom:loaded', function() { > // Cart > var validateCart = new Validation('cartForm', {immediate: true, onSubmit: false}); > var validateShip = new Validation('shippingForm', {immediate: true, onSubmit: false}); > > Modified: ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js (original) > +++ ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js Wed Sep 15 18:01:26 2010 > @@ -53,4 +53,4 @@ imgView = { > } > } > } > -Event.observe(window, 'load', imgView.init, false); > +document.observe('dom:loaded', imgView.init, false); > > Modified: ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js (original) > +++ ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js Wed Sep 15 18:01:26 2010 > @@ -20,7 +20,7 @@ under the License. > var validateNewUser = null; > var validateEditUser = null; > var validatePostalAddress = null; > -Event.observe(window, 'load', function() { > +document.observe('dom:loaded', function() { > if ($('newUserForm')) { > validateNewUser = new Validation('newUserForm', {immediate: true, onSubmit: false}); > addValidations(); > > Modified: ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js (original) > +++ ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js Wed Sep 15 18:01:26 2010 > @@ -17,13 +17,13 @@ specific language governing permissions > under the License. > */ > > -Event.observe(window, 'load', isValidElement); > +document.observe('dom:loaded', isValidElement); > > function isValidElement(element){ > var validator = new Validation('quickAnonProcessCustomer', {immediate : true}); > } > > -Event.observe(window, 'load', function() { > +document.observe('dom:loaded', function() { > Event.observe('useShippingPostalAddressForBilling', 'click', changeText2); > }); > function changeText2(){ > > Modified: ofbiz/branches/release10.04/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js (original) > +++ ofbiz/branches/release10.04/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js Wed Sep 15 18:01:26 2010 > @@ -17,7 +17,7 @@ specific language governing permissions > under the License. > */ > > -Event.observe(window, 'load', function() { > +document.observe('dom:loaded', function() { > > // Autocompleter for good identification field > var j = 0; > > Modified: ofbiz/branches/release10.04/themes/bizznesstime/webapp/bizznesstime/js/application.js > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/themes/bizznesstime/webapp/bizznesstime/js/application.js?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/themes/bizznesstime/webapp/bizznesstime/js/application.js (original) > +++ ofbiz/branches/release10.04/themes/bizznesstime/webapp/bizznesstime/js/application.js Wed Sep 15 18:01:26 2010 > @@ -80,7 +80,7 @@ javascript solution to make form focus s > consistent cross browser form platforms that > don't support input:focus (cough, cough, IE, cough) > *****************************************************/ > -Event.observe(window, 'load', function() { > +document.observe('dom:loaded', function() { > var fields = $$("input, textarea"); > for (var i = 0; i < fields.length; i++) { > fields[i].onfocus = function() {this.className += ' focused';} > @@ -168,7 +168,7 @@ ModalWindow = Class.create({ > }); > > //LOAD MODAL PREFERENCE WINDOWS > -Event.observe(window, 'load', function() { > +document.observe('dom:loaded', function() { > get = new ModalWindow(); > $("language").observe('click',function(e) { > var locale = new Element('div', {id:'modal-contents'}).update("<img src='/bizznesstime/images/ajax-loader.gif'/>Updating > Languages, please wait..."); > > Modified: ofbiz/branches/release10.04/themes/droppingcrumbs/webapp/droppingcrumbs/js/application.js > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/themes/droppingcrumbs/webapp/droppingcrumbs/js/application.js?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/themes/droppingcrumbs/webapp/droppingcrumbs/js/application.js (original) > +++ ofbiz/branches/release10.04/themes/droppingcrumbs/webapp/droppingcrumbs/js/application.js Wed Sep 15 18:01:26 2010 > @@ -80,7 +80,7 @@ javascript solution to make form focus s > consistent cross browser form platforms that > don't support input:focus (cough, cough, IE, cough) > *****************************************************/ > -Event.observe(window, 'load', function() { > +document.observe('dom:loaded', function() { > var fields = $$("input, textarea"); > for (var i = 0; i < fields.length; i++) { > fields[i].onfocus = function() {this.className += ' focused';} > @@ -168,7 +168,7 @@ ModalWindow = Class.create({ > }); > > //LOAD MODAL PREFERENCE WINDOWS > -Event.observe(window, 'load', function() { > +document.observe('dom:loaded', function() { > get = new ModalWindow(); > $("language").observe('click',function(e) { > var locale = new Element('div', {id:'modal-contents'}).update("<img src='/bizznesstime/images/ajax-loader.gif'/>Updating > Languages, please wait..."); > > Modified: ofbiz/branches/release10.04/themes/tomahawk/includes/appbarClose.ftl > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/themes/tomahawk/includes/appbarClose.ftl?rev=997430&r1=997429&r2=997430&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/themes/tomahawk/includes/appbarClose.ftl (original) > +++ ofbiz/branches/release10.04/themes/tomahawk/includes/appbarClose.ftl Wed Sep 15 18:01:26 2010 > @@ -101,7 +101,9 @@ under the License. > > <#if userLogin?exists> > <script type="text/javascript"> > + document.observe('dom:loaded', function() { > var mainmenu = new DropDownMenu($('main-navigation')); > var appmenu = new DropDownMenu($('app-navigation')); > + }); > </script> > </#if> > > |
Free forum by Nabble | Edit this page |