From ab5bcc69af54ffd28beddf705a0f4e2c72fb4517 Mon Sep 17 00:00:00 2001 From: Saeid Mohadjer Date: Tue, 1 Mar 2016 13:42:04 +0100 Subject: [PATCH] update --- bower.json | 2 +- demo/demo.html | 4 ++-- resourceLoader.js | 2 -- resourceLoader.min.js | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 resourceLoader.min.js diff --git a/bower.json b/bower.json index 73cf4ec..e96edfb 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "resourceLoader", "homepage": "https://github.com/virtualidentityag/conditional-resource-loader", - "version": "0.0.7", + "version": "0.0.8", "main": "resourceLoader.js" } diff --git a/demo/demo.html b/demo/demo.html index f90d1aa..c5c84f1 100644 --- a/demo/demo.html +++ b/demo/demo.html @@ -30,11 +30,11 @@
- This component's resources (css and js) are loaded via conditional loader! See logs in console... + This component's resources (css and js) are loaded via conditional loader!
- This component's resources (css and js) are loaded via conditional loader! See logs in console... + This component's resources (css and js) are loaded via conditional loader!
diff --git a/resourceLoader.js b/resourceLoader.js index 6ffe223..e20fb57 100644 --- a/resourceLoader.js +++ b/resourceLoader.js @@ -75,7 +75,6 @@ function resourceLoader(options) { type: 'text/css', href: url }).on('load', function() { - console.log(url + ' loaded'); cssCounter++; checkIfComplete(); }).on('error', function() { @@ -100,7 +99,6 @@ function resourceLoader(options) { dataType: 'script', cache: true }).done(function() { - console.log(url + ' loaded'); jsCounter++; checkIfComplete(); }).fail(function () { diff --git a/resourceLoader.min.js b/resourceLoader.min.js deleted file mode 100644 index d2daacf..0000000 --- a/resourceLoader.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/* VI Resource Loader v0.0.6 */ -function resourceLoader(options){"use strict";var loader={conditionsAllArray:[]},styles=[],scripts=[],getResources=function(){$.each(loader.conditionsAllArray,function(){$.each(this.resources,function(){var s=this,e=this.test?this.test():!0;e&&$.each(s.paths,function(){var e=this,r=-1===e.indexOf("http://")&&-1===e.indexOf("https://");r&&(s.base?e=s.base+e:options&&options.base&&(e=options.base+e)),e.indexOf(".css")>-1?-1===$.inArray(e,styles)&&styles.push(e):-1===$.inArray(e,scripts)&&scripts.push(e)})})})},loadResources=function(){var s=0,e=0,r=[],o=function(){s===scripts.length&&e===styles.length&&$(window).trigger("resourcesReady")};return 0===scripts.length&&0===styles.length?void $(window).trigger("resourcesReady"):(styles.length>0&&($.each(styles,function(){var s=this,t=$("",{rel:"stylesheet",type:"text/css",href:s}).on("load",function(){e++,o()}).on("error",function(){console.warn("Error while loading: "+s),e++,o()});r.push(t)}),$("head").append(r)),void(scripts.length>0&&$.each(scripts,function(){var e=this;$.ajax({url:e,dataType:"script",cache:!0}).done(function(){s++,o()}).fail(function(){console.warn("Error while loading: "+e),s++,o()})})))};options&&options.resources?loader.conditionsAllArray=loader.conditionsAllArray.concat(options.resources):$("[data-resources]").each(function(){var obj={};obj.resources=eval($(this).attr("data-resources")),loader.conditionsAllArray.push(obj)}),loader.conditionsAllArray.length>0?(getResources(),loadResources()):$(window).trigger("resourcesReady")}