add wsdoc option + better handling of jquery mobile

aFarkas · Jan 23, 2014 · 03b425a · 03b425a
1 parent 123b50a
commit 03b425a
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/demos/demos/webforms/jquery-mobile.html b/demos/demos/webforms/jquery-mobile.html
@@ -13,7 +13,7 @@
 
 	<script src="../../demo-js/src/modernizr-special.js"></script>
 
-	<script src="../../js-webshim/minified/polyfiller.js"></script>
+	<script src="../../../js-webshim/minified/polyfiller.js"></script>
 
 	<!-- jQM: make some small style adjustments -->
 	<style>
@@ -88,11 +88,12 @@
 			});
 		})();
 
+		//jQM: set wsdoc to active page or false
+		webshims.setOptions('wsdoc', $('.ui-page-active').updatePolyfill().get(0) || false);
 
-
-
-		//jQM: update polyfills on pageinit
+		//jQM: update polyfills on pageinit and change active page
 		$(document).on('pageinit', function(e){
+			webshims.setOptions('wsdoc', e.target);
 			$(e.target).updatePolyfill();
 		});
 

diff --git a/demos/js-webshim/dev/polyfiller.js b/demos/js-webshim/dev/polyfiller.js
@@ -101,6 +101,7 @@
 //			extendNative: false,
 			loadStyles: true,
 			disableShivMethods: true,
+			wsdoc: document,
 			wspopover: {appendTo: 'auto', hideOnBlur: true},
 			ajax: {},
 			loadScript: function(src, success, fail){
@@ -651,13 +652,10 @@
 	 */
 
 	(function(){
-		var doc = document;
 		//Overwrite DOM-Ready and implement a new ready-method
 		$.isDOMReady = $.isReady;
 		var onReady = function(e){
-			if(webCFG.readyEvt && e && e.type === webCFG.readyEvt){
-				doc = e.target || document;
-			}
+
 			$.isDOMReady = true;
 			isReady('DOM', true);
 			setTimeout(function(){
@@ -725,7 +723,10 @@
 					webshims.ready('DOM', function(){fn(context, elem);});
 				};
 				readyFns.push(readyFn);
-				readyFn(doc, emptyJ);
+
+				if(webCFG.wsdoc){
+					readyFn(webCFG.wsdoc, emptyJ);
+				}
 			},
 			triggerDomUpdate: function(context){
 				if(!context || !context.nodeType){

diff --git a/demos/js-webshim/minified/polyfiller.js b/demos/js-webshim/minified/polyfiller.js
diff --git a/js-webshim/dev/polyfiller.js b/js-webshim/dev/polyfiller.js
@@ -101,6 +101,7 @@
 //			extendNative: false,
 			loadStyles: true,
 			disableShivMethods: true,
+			wsdoc: document,
 			wspopover: {appendTo: 'auto', hideOnBlur: true},
 			ajax: {},
 			loadScript: function(src, success, fail){
@@ -651,13 +652,10 @@
 	 */
 
 	(function(){
-		var doc = document;
 		//Overwrite DOM-Ready and implement a new ready-method
 		$.isDOMReady = $.isReady;
 		var onReady = function(e){
-			if(webCFG.readyEvt && e && e.type === webCFG.readyEvt){
-				doc = e.target || document;
-			}
+
 			$.isDOMReady = true;
 			isReady('DOM', true);
 			setTimeout(function(){
@@ -725,7 +723,10 @@
 					webshims.ready('DOM', function(){fn(context, elem);});
 				};
 				readyFns.push(readyFn);
-				readyFn(doc, emptyJ);
+
+				if(webCFG.wsdoc){
+					readyFn(webCFG.wsdoc, emptyJ);
+				}
 			},
 			triggerDomUpdate: function(context){
 				if(!context || !context.nodeType){

diff --git a/js-webshim/minified/polyfiller.js b/js-webshim/minified/polyfiller.js
diff --git a/src/polyfiller.js b/src/polyfiller.js
@@ -101,6 +101,7 @@
 //			extendNative: false,
 			loadStyles: true,
 			disableShivMethods: true,
+			wsdoc: document,
 			wspopover: {appendTo: 'auto', hideOnBlur: true},
 			ajax: {},
 			loadScript: function(src, success, fail){
@@ -117,7 +118,7 @@
 		features: {},
 		featureList: [],
 		setOptions: function(name, opts){
-			if (typeof name == 'string' && opts !== undefined) {
+			if (typeof name == 'string' && arguments.length > 1) {
 				webCFG[name] = (!$.isPlainObject(opts)) ? opts : $.extend(true, webCFG[name] || {}, opts);
 			} else if (typeof name == 'object') {
 				$.extend(true, webCFG, name);
@@ -723,8 +724,8 @@
 				};
 				readyFns.push(readyFn);
 
-				if(!webCFG.noDocumentInit){
-					readyFn(document, emptyJ);
+				if(webCFG.wsdoc){
+					readyFn(webCFG.wsdoc, emptyJ);
 				}
 			},
 			triggerDomUpdate: function(context){