fixed loading of duplicate reousrces

virtualidentityag · Feb 22, 2016 · 8292d98 · 8292d98
1 parent 4883c97
commit 8292d98
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 19 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "resourceLoader",
   "homepage": "https://github.com/virtualidentityag/conditional-resource-loader",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "main": "resourceLoader.js",
 }
diff --git a/demo/css/demo.css b/demo/css/demo.css
@@ -0,0 +1,5 @@
+.demo1,
+.demo2 {
+	padding: 20px;
+	margin-bottom: 20px;
+}
diff --git a/demo/css/demo1.css b/demo/css/demo1.css
@@ -1,4 +1,3 @@
-.demo {
+.demo1 {
 	background: salmon;
-	padding: 20px;
 }
diff --git a/demo/css/demo2.css b/demo/css/demo2.css
@@ -1,4 +1,3 @@
-.demo {
+.demo2 {
 	background: yellow;
-	padding: 40px;
 }
diff --git a/demo/demo.html b/demo/demo.html
@@ -24,7 +24,11 @@
 		</script>
 	</head>
 	<body>
-		<div class="demo" data-init="(function() {$('.demo').plugin1();})" data-resources="[{test: (function() {return true;}), paths: ['js/jquery.plugin1.js', 'css/demo1.css', 'css/demo2.css']}]">
+		<div class="demo1" data-init="(function() {$('.demo1').plugin();})" data-resources="[{test: (function() {return true;}), paths: ['js/jquery.plugin.js', 'css/demo.css', 'css/demo1.css']}]">
+			This component's resources (css and js) are loaded via conditional loader! See logs in console...
+		</div>
+
+		<div class="demo2" data-init="(function() {$('.demo2').plugin();})" data-resources="[{test: (function() {return true;}), paths: ['js/jquery.plugin.js', 'css/demo.css', 'css/demo2.css']}]">
 			This component's resources (css and js) are loaded via conditional loader! See logs in console...
 		</div>
 	</body>

diff --git a/demo/js/jquery.plugin1.js → demo/js/jquery.plugin.js b/demo/js/jquery.plugin1.js → demo/js/jquery.plugin.js
@@ -12,7 +12,7 @@
 ;(function ($, window, document, undefined) {
     'use strict';
 
-    var pluginName = 'plugin1',
+    var pluginName = 'plugin',
         defaults = {
             foo: 'bar'
         };
@@ -32,7 +32,7 @@
         },
 
         myFunction: function(){
-            console.log('boilerplate - myFunction was executed');
+            console.log('initializing ', this.$element.attr('class'));
         }
     };
 

diff --git a/resourceLoader.js b/resourceLoader.js
@@ -1,5 +1,5 @@
 /**
- * VI Resource Loader v0.0.4
+ * VI Resource Loader v0.0.5
  * For documentation see:
  * https://github.com/virtualidentityag/conditional-resource-loader
  */
@@ -12,14 +12,10 @@ function resourceLoader(options) {
 	};
 	var styles = [];
 	var scripts = [];
-
 	var getResources = function() {
 		$.each(loader.conditionsAllArray, function () {
 			$.each(this.resources, function() {
 				var resource = this;
-				var js = [];
-				var css = [];
-
 				var test = this.test ? this.test() : true;
 
 				if (test) {
@@ -38,19 +34,19 @@ function resourceLoader(options) {
 						}
 
 						if (path.indexOf('.css') > -1) {
-							css.push(path);
+							if ($.inArray(path, styles) === -1) {
+								styles.push(path);
+							}
 						} else {
-							js.push(path);
+							if ($.inArray(path, scripts) === -1) {
+								scripts.push(path);
+							}
 						}
 					});
-
-					$.merge(scripts, js);
-					$.merge(styles, css);
 				}
 			});
 		});
 	};
-
 	var loadResources = function () {
 		var jsCounter = 0;
 		var cssCounter = 0;