AUI-692 - Build files

build/aui-parse-content/aui-parse-content-debug.js

@@ -24,6 +24,7 @@ var L = A.Lang,
 	PARSE_CONTENT = 'ParseContent',
 	QUEUE = 'queue',
 	SCRIPT = 'script',
+	SEMICOLON = ';',
 	SRC = 'src',
 
 	SCRIPT_TYPES = {
@@ -146,13 +147,34 @@ var ParseContent = A.Component.create(
 			 */
 			parseContent: function(content) {
 				var instance = this;
+
 				var output = instance._clean(content);
 
 				instance._dispatch(output);
 
 				return output;
 			},
 
+			/**
+			 * Add inline script data to the queue.
+			 *
+			 * @method _addInlineScript
+			 * @param {String} data The script content which should be added to the queue
+			 * @protected
+			 */
+			_addInlineScript: function(data) {
+				var instance = this;
+
+				instance.get(QUEUE).add(
+					{
+						args: data,
+						context: instance,
+						fn: instance.globalEval,
+						timeout: 0
+					}
+				);
+			},
+
 			/**
 			 * Bind listeners on the <code>insert</code> and <code>setContent</code>
 		     * methods of the Node instance where you are plugging the ParseContent.
@@ -242,12 +264,21 @@ var ParseContent = A.Component.create(
 			 */
 			_dispatch: function(output) {
 				var instance = this;
+
 				var queue = instance.get(QUEUE);
 
+				var scriptContent = [];
+
 				output.js.each(function(node, i) {
 					var src = node.get(SRC);
 
 					if (src) {
+						if (scriptContent.length) {
+							instance._addInlineScript(scriptContent.join(SEMICOLON));
+
+							scriptContent.length = 0;
+						}
+
 						queue.add({
 							autoContinue: false,
 							fn: function () {
@@ -262,19 +293,16 @@ var ParseContent = A.Component.create(
 						});
 					}
 					else {
-						queue.add({
-							fn: function () {
-								var dom = node._node;
+						var dom = node._node;
 
-								instance.globalEval(
-									dom.text || dom.textContent || dom.innerHTML || ''
-								);
-							},
-							timeout: 0
-						});
+						scriptContent.push(dom.text || dom.textContent || dom.innerHTML || '');
 					}
 				});
 
+				if (scriptContent.length) {
+					instance._addInlineScript(scriptContent.join(SEMICOLON));
+				}
+
 				queue.run();
 			}
 		}

build/aui-parse-content/aui-parse-content.js

@@ -24,6 +24,7 @@ var L = A.Lang,
 	PARSE_CONTENT = 'ParseContent',
 	QUEUE = 'queue',
 	SCRIPT = 'script',
+	SEMICOLON = ';',
 	SRC = 'src',
 
 	SCRIPT_TYPES = {
@@ -146,13 +147,34 @@ var ParseContent = A.Component.create(
 			 */
 			parseContent: function(content) {
 				var instance = this;
+
 				var output = instance._clean(content);
 
 				instance._dispatch(output);
 
 				return output;
 			},
 
+			/**
+			 * Add inline script data to the queue.
+			 *
+			 * @method _addInlineScript
+			 * @param {String} data The script content which should be added to the queue
+			 * @protected
+			 */
+			_addInlineScript: function(data) {
+				var instance = this;
+
+				instance.get(QUEUE).add(
+					{
+						args: data,
+						context: instance,
+						fn: instance.globalEval,
+						timeout: 0
+					}
+				);
+			},
+
 			/**
 			 * Bind listeners on the <code>insert</code> and <code>setContent</code>
 		     * methods of the Node instance where you are plugging the ParseContent.
@@ -242,12 +264,21 @@ var ParseContent = A.Component.create(
 			 */
 			_dispatch: function(output) {
 				var instance = this;
+
 				var queue = instance.get(QUEUE);
 
+				var scriptContent = [];
+
 				output.js.each(function(node, i) {
 					var src = node.get(SRC);
 
 					if (src) {
+						if (scriptContent.length) {
+							instance._addInlineScript(scriptContent.join(SEMICOLON));
+
+							scriptContent.length = 0;
+						}
+
 						queue.add({
 							autoContinue: false,
 							fn: function () {
@@ -262,19 +293,16 @@ var ParseContent = A.Component.create(
 						});
 					}
 					else {
-						queue.add({
-							fn: function () {
-								var dom = node._node;
+						var dom = node._node;
 
-								instance.globalEval(
-									dom.text || dom.textContent || dom.innerHTML || ''
-								);
-							},
-							timeout: 0
-						});
+						scriptContent.push(dom.text || dom.textContent || dom.innerHTML || '');
 					}
 				});
 
+				if (scriptContent.length) {
+					instance._addInlineScript(scriptContent.join(SEMICOLON));
+				}
+
 				queue.run();
 			}
 		}