Merge pull request #45 from conversant/release/2.5.0

Release/2.5.0

Author: joezhang2

karma.conf.js

@@ -40,8 +40,8 @@ module.exports = function(config) {
 
 		// Number of browsers to run in parallel [set to 1 to avoid timing-based tests from failing]
 		concurrency: 1,
-		
-        browsers: ['Firefox', 'Chrome', 'Safari']
+		// Using SafariNative launcher to due changes in Mojave: https://github.com/karma-runner/karma-safari-launcher/issues/29
+		browsers: ['Firefox', 'Chrome', 'SafariNative']
 
     });
 

lib/dom/embedHtml.js

@@ -1,7 +1,6 @@
 'use strict';
 
-var lastParent,
-	insContainer,
+var insContainer,
 	insId,
 	insCounter = 0,
 	cloneDataAttrib = 'data-adlibs-clone';
@@ -46,11 +45,12 @@ var addToDom = function (elem, target) {
  * nor can it be used inside this function
  *
  * @param inputScriptElem {Element} Input Script Element
+ * @param win {Object}
  * @returns {Element}
  */
-var customCloneScript = function (inputScriptElem) {
+var customCloneScript = function (inputScriptElem, win) {
 	var inputScriptAttrib,
-		outputScriptElem = document.createElement('script'),
+		outputScriptElem = win.document.createElement('script'),
 		inputScriptAttribs = inputScriptElem.attributes,
 		i = 0;
 
@@ -75,10 +75,11 @@ var customCloneScript = function (inputScriptElem) {
  * Scripts have to be handled differently because the script code will not execute unless they are processed this way
  *
  * @param elemToClone
+ * @param win {Object}
  * @returns {Node | Element}
  */
-var cloneElem = function (elemToClone) {
-	var clonedElem = (isAScript(elemToClone)) ? customCloneScript(elemToClone) : elemToClone.cloneNode(true);
+var cloneElem = function (elemToClone, win) {
+	var clonedElem = (isAScript(elemToClone)) ? customCloneScript(elemToClone, win) : elemToClone.cloneNode(true);
 	clonedElem.setAttribute && clonedElem.setAttribute(cloneDataAttrib, '1'); //Mark element as being a clone
 	return clonedElem;
 };
@@ -89,10 +90,11 @@ var cloneElem = function (elemToClone) {
  *
  * @param inputElem {Node | Element}
  * @param targetElem {Node | Element}
+ * @param win {Object}
  *
  * @returns {Node | Element}
  */
-var recursiveCloneAndAddToDom = function (inputElem, targetElem) {
+var recursiveCloneAndAddToDom = function (inputElem, targetElem, win) {
 	var childClone,
 		childElem,
 		clonedElem = inputElem.cloneNode(false), //Shallow clone
@@ -102,9 +104,9 @@ var recursiveCloneAndAddToDom = function (inputElem, targetElem) {
 	for (; i < inputElem.childNodes.length; i++) {
 		childElem = inputElem.childNodes[i];
 		if (childElem.hasChildNodes() && !isAScript(childElem)) {
-			childClone = recursiveCloneAndAddToDom(childElem, clonedElem);
+			childClone = recursiveCloneAndAddToDom(childElem, clonedElem, win);
 		} else {
-			childClone = cloneElem(childElem);
+			childClone = cloneElem(childElem, win);
 			addToDom(childClone, clonedElem);
 		}
 	}
@@ -118,27 +120,27 @@ var recursiveCloneAndAddToDom = function (inputElem, targetElem) {
  *
  * @param htmlString {String} HTML String to Add to the page
  * @param [parentElem] {Node | Element} Parent element to attach 'htmlString' as a child to; defaults to document.body
+ * @param win {Object}
  * @returns {boolean}
  */
-var insertInlineHtmlString = function (htmlString, parentElem) {
-	parentElem = parentElem || lastParent || document.body;
-	lastParent = parentElem;
+var insertInlineHtmlString = function (htmlString, parentElem, win) {
+	parentElem = parentElem || win.document.body;
 
 	//Create an 'ins' tag to be a container to hold htmlString
-	(insContainer = createInsContainer()).innerHTML = htmlString;
+	(insContainer = createInsContainer(win)).innerHTML = htmlString;
 
 	//Add the HTML to 'parentElem' by recursively creating clones
-	recursiveCloneAndAddToDom(insContainer, parentElem);
+	recursiveCloneAndAddToDom(insContainer, parentElem, win);
 	return true;
 };
 
 /**
  * Returns an 'ins' element with a unique ID and class 'adlibs-ins'
- *
+ * @param win {Object}
  * @returns {HTMLModElement}
  */
-var createInsContainer = function () {
-	var ins = document.createElement('ins');
+var createInsContainer = function (win) {
+	var ins = win.document.createElement('ins');
 	insId = 'adlibs-ins-' + (++insCounter);
 	ins.setAttribute('id', insId);
 	ins.setAttribute('class', 'adlibs-ins');
@@ -149,10 +151,11 @@ var createInsContainer = function () {
  * Uses document.writeln to add an HTML string to the page
  *
  * @param htmlString {string} HTML String to Add to the page
+ * @param win {Object}
  * @returns {boolean}
  */
-var docWriteHtmlString = function (htmlString) {
-	document.writeln(htmlString); //jshint ignore: line
+var docWriteHtmlString = function (htmlString, win) {
+	win.document.writeln(htmlString); //jshint ignore: line
 	return true;
 };
 
@@ -180,28 +183,36 @@ var isNativeFunction = function (value) {
  * @param htmlString {string}
  * @param [parentElem] {HTMLElement} Parent element to attach 'htmlString' as a child to (this is only used if the document readyState is complete or interactive)
  * @param [callback] {function} Callback function
+ * @param [win] {Object} Optional window reference to write into
  *
  */
-var embedHtml = function (htmlString, parentElem, callback) {
-	if (document.readyState === 'complete' || document.readyState === 'interactive') {
+var embedHtml = function (htmlString, parentElem, callback, win) {
+    var originalDocWrite,
+            originalDocWriteln;
+	
+    win = win || window;
+    originalDocWrite = win.document.write;
+    originalDocWriteln = win.document.writeln;
+ 
+	if (win.document.readyState === 'complete' || win.document.readyState === 'interactive') {
 		//Overwrite document.write and document.writeln (so we can handle nested document.writes)
-		if (isNativeFunction(document.write)) {
-			document.write = embedHtml.bind(this);
+		if (isNativeFunction(win.document.write)) {
+            win.document.write = embedHtml.bind(this);
 		}
 
-		if (isNativeFunction(document.writeln)) {
-			document.writeln = embedHtml.bind(this);
+		if (isNativeFunction(win.document.writeln)) {
+            win.document.writeln = embedHtml.bind(this);
 		}
 
-		//Keep track of our parent element because document.write calls wont pass that in
-		parentElem = parentElem || lastParent;
-		insertInlineHtmlString(htmlString, parentElem);
+		insertInlineHtmlString(htmlString, parentElem, win);
 	} else {
-		//Restore document.write and document.writeln to their native implementations
-		delete document.write;
-		delete document.writeln;
-		docWriteHtmlString(htmlString);
+        delete win.document.write; //Restore native implementation
+        delete win.document.writeln; //Restore native implementation
+        docWriteHtmlString(htmlString, win); //Write contents to DOM using native implementation
 	}
+    //Restore document.write and document.writeln
+    win.document.write = originalDocWrite;
+    win.document.writeln = originalDocWriteln;
 
 	//Pass the container element to the callback
 	if (typeof callback === 'function') {
@@ -211,7 +222,5 @@ var embedHtml = function (htmlString, parentElem, callback) {
 
 /**
  * Handles adding HTML elements to the DOM, in whatever state the document is in
- *
- * @returns {boolean}
  */
 module.exports = embedHtml;