[Pkg-javascript-commits] [dojo] 28/88: Fix mixed content warning on IE7, fixes #16013 on 1.8 branch !strict.

David Prévot taffit at moszumanska.debian.org
Thu Aug 21 17:39:33 UTC 2014


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.8.5
in repository dojo.

commit 3340930792feb4c19cb4638dd14f55c5f8096356
Author: Bill Keese <bill at dojotoolkit.org>
Date:   Thu Oct 11 03:36:50 2012 +0000

    Fix mixed content warning on IE7, fixes #16013 on 1.8 branch !strict.
    
    
    
    git-svn-id: http://svn.dojotoolkit.org/src/branches/1.8/dojo@29806 560b804f-0ae3-0310-86f3-f6aa0a117693
---
 hccss.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/hccss.js b/hccss.js
index 90391f3..7c3e44d 100644
--- a/hccss.js
+++ b/hccss.js
@@ -2,12 +2,11 @@ define([
 	"require",			// require.toUrl
 	"./_base/config", // config.blankGif
 	"./dom-class", // domClass.add
-	"./dom-construct", // domConstruct.destroy
 	"./dom-style", // domStyle.getComputedStyle
 	"./has",
 	"./ready", // ready
 	"./_base/window" // win.body
-], function(require, config, domClass, domConstruct, domStyle, has, ready, win){
+], function(require, config, domClass, domStyle, has, ready, win){
 
 	// module:
 	//		dojo/hccss
@@ -34,7 +33,11 @@ define([
 			hc = (cs.borderTopColor == cs.borderRightColor) ||
 				(bkImg && (bkImg == "none" || bkImg == "url(invalid-url:)" ));
 
-		domConstruct.destroy(div);
+		if(has("ie") < 8){
+			div.outerHTML = "";		// prevent mixed-content warning, see http://support.microsoft.com/kb/925014
+		}else{
+			win.body().removeChild(div);
+		}
 
 		return hc;
 	});

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git



More information about the Pkg-javascript-commits mailing list