Commit7aa19fe

zhourenjian

committed

Fixing Opera loading script fails on "../package.js"

Fixing IE 6.0- bugs

1 parent32d4d07 commit7aa19feCopy full SHA for 7aa19fe

File tree

+27

-1

lines changed

+27

-1

lines changed

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1047,11 +1047,29 @@ Clazz.removeEvent = function (element, type, handler) {`
`1047`	`1047`	`}`
`1048`	`1048`	`};`
`1049`	`1049`
	`1050`	`+/* private */`
	`1051`	`+Clazz.isVeryOldIE=navigator.userAgent.indexOf("MSIE 6.0")!=-1\|\|navigator.userAgent.indexOf("MSIE 5.5")!=-1\|\|navigator.userAgent.indexOf("MSIE 5.0")!=-1;`
	`1052`	`+`
`1050`	`1053`	`/* protected */`
`1051`	`1054`	`Clazz.handleEvent=function(event){`
`1052`	`1055`	`varreturnValue=true;`
`1053`	`1056`	`// grab the event object (IE uses a global event object)`
`1054`		`-event=event\|\|Clazz.fixEvent(((this.ownerDocument\|\|this.document\|\|this).parentWindow\|\|window).event);`
	`1057`	`+if(!Clazz.isVeryOldIE){`
	`1058`	`+event=event\|\|Clazz.fixEvent(((this.ownerDocument\|\|this.document\|\|this).parentWindow\|\|window).event);`
	`1059`	`+}else{// The above line is buggy in IE 6.0`
	`1060`	`+if(event==null){`
	`1061`	`+varevt=null;`
	`1062`	`+try{`
	`1063`	`+varpWindow=(this.ownerDocument\|\|this.document\|\|this).parentWindow;`
	`1064`	`+if(pWindow!=null){`
	`1065`	`+evt=pWindow.event;`
	`1066`	`+}`
	`1067`	`+}catch(e){`
	`1068`	`+evt=window.event;`
	`1069`	`+}`
	`1070`	`+event=Clazz.fixEvent(evt);`
	`1071`	`+}`
	`1072`	`+}`
`1055`	`1073`	`// get a reference to the hash table of event handlers`
`1056`	`1074`	`varhandlers=this.events[event.type];`
`1057`	`1075`	`// execute each event handler`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -939,6 +939,10 @@ ClazzLoader.generatingW3CScriptOnCallback = function (path, forError) {`
`939`	`939`	`}`
`940`	`940`	`this.onload=null;`
`941`	`941`	`this.onerror=null;`
	`942`	`+if(!forError&&ClazzLoader.isOpera// Opera only`
	`943`	`+&&!ClazzLoader.innerLoadedScripts[this.src]){`
	`944`	`+ClazzLoader.checkInteractive();`
	`945`	`+}`
`942`	`946`	`if(forError\|\|(!ClazzLoader.innerLoadedScripts[this.src]`
`943`	`947`	`&&ClazzLoader.isOpera)){`
`944`	`948`	`// Opera will not take another try.`
`@@ -976,6 +980,9 @@ ClazzLoader.generatingIEScriptOnCallback = function (path) {`
`976`	`980`	`varfss=ClazzLoader.failedScripts;`
`977`	`981`	`varstate=""+this.readyState;`
`978`	`982`
	`983`	`+`
	`984`	`+`
	`985`	`+`
`979`	`986`	`varlocal=state=="loading"`
`980`	`987`	`&&(this.src.indexOf("file:")==0`
`981`	`988`	`\|\|(window.location.protocol=="file:"`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ clpm.DEFAULT_OPACITY = 55;`
`91`	`91`	`};`
`92`	`92`	`/* private */clpm.createHandle=function(){`
`93`	`93`	`vardiv=document.createElement("DIV");`
	`94`	`+div.id="clazzloader-status";`
`94`	`95`	`div.style.cssText="position:absolute;bottom:4px;left:4px;padding:2px 8px;"`
`95`	`96`	`+"z-index:3333;background-color:#8e0000;color:yellow;"`
`96`	`97`	`+"font-family:Arial, sans-serif;font-size:10pt;white-space:nowrap;";`

Comments

(0)