diff --git a/.gitignore b/.gitignore index e5202bf..2c5f592 100755 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ results npm-debug.log +bower_components node_modules .DS_Store diff --git a/README.md b/README.md index 82f47e6..e1c929c 100755 --- a/README.md +++ b/README.md @@ -91,6 +91,7 @@ Only the values you'd like overriden need to be specified. ## Release History + * v4.1.4 - Updated for Angular 1.4.5 * v4.1.3 - Fix for issue #45 and issue #49. * v4.1.2 - Small bugs fixed, wrapperClass option added. * v4.1.1 - Compatibility with Angular 1.3. diff --git a/angular-busy.js b/angular-busy.js index 557435c..8eb81a0 100755 --- a/angular-busy.js +++ b/angular-busy.js @@ -210,7 +210,7 @@ angular.module('cgBusy').directive('cgBusy',['$compile','$templateCache','cgBusy currentTemplate = options.templateUrl; backdrop = options.backdrop; - $http.get(currentTemplate,{cache: $templateCache}).success(function(indicatorTemplate){ + $http.get(currentTemplate,{cache: $templateCache}).then(function(res){ options.backdrop = typeof options.backdrop === 'undefined' ? true : options.backdrop; @@ -220,7 +220,7 @@ angular.module('cgBusy').directive('cgBusy',['$compile','$templateCache','cgBusy element.append(backdropElement); } - var template = '
' + indicatorTemplate + '
'; + var template = '
' + res.data + '
'; templateElement = $compile(template)(templateScope); angular.element(templateElement.children()[0]) @@ -231,7 +231,7 @@ angular.module('cgBusy').directive('cgBusy',['$compile','$templateCache','cgBusy .css('bottom',0); element.append(templateElement); - }).error(function(data){ + }).catch(function(data){ throw new Error('Template specified for cgBusy ('+options.templateUrl+') could not be loaded. ' + data); }); } diff --git a/bower.json b/bower.json index e670a48..426e13d 100755 --- a/bower.json +++ b/bower.json @@ -1,13 +1,13 @@ { "name": "angular-busy", - "version": "4.1.3", + "version": "4.1.4", "main": [ "dist/angular-busy.js", "dist/angular-busy.css" ], "dependencies": { - "angular": "~1.3", - "angular-animate": "~1.3" + "angular": "~1.4", + "angular-animate": "~1.4" }, "ignore": [ "**/.*", @@ -26,7 +26,7 @@ "README.md" ], "devDependencies": { - "angular-mocks": "~1.3", + "angular-mocks": "~1.4", "jquery": "~2.1.0" } } diff --git a/dist/angular-busy.js b/dist/angular-busy.js index 31c8952..e397237 100644 --- a/dist/angular-busy.js +++ b/dist/angular-busy.js @@ -210,7 +210,7 @@ angular.module('cgBusy').directive('cgBusy',['$compile','$templateCache','cgBusy currentTemplate = options.templateUrl; backdrop = options.backdrop; - $http.get(currentTemplate,{cache: $templateCache}).success(function(indicatorTemplate){ + $http.get(currentTemplate,{cache: $templateCache}).then(function(res){ options.backdrop = typeof options.backdrop === 'undefined' ? true : options.backdrop; @@ -220,7 +220,7 @@ angular.module('cgBusy').directive('cgBusy',['$compile','$templateCache','cgBusy element.append(backdropElement); } - var template = '
' + indicatorTemplate + '
'; + var template = '
' + res.data + '
'; templateElement = $compile(template)(templateScope); angular.element(templateElement.children()[0]) @@ -231,7 +231,7 @@ angular.module('cgBusy').directive('cgBusy',['$compile','$templateCache','cgBusy .css('bottom',0); element.append(templateElement); - }).error(function(data){ + }).catch(function(data){ throw new Error('Template specified for cgBusy ('+options.templateUrl+') could not be loaded. ' + data); }); } @@ -247,28 +247,51 @@ angular.module('cgBusy').run(['$templateCache', function($templateCache) { 'use strict'; $templateCache.put('angular-busy.html', - "
\n" + + "
\r" + "\n" + - "
\n" + + "\r" + "\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + + "
\r" + "\n" + - "
{{$message}}
\n" + + "\r" + "\n" + - "
\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "
\r" + + "\n" + + "\r" + + "\n" + + "
{{$message}}
\r" + + "\n" + + "\r" + + "\n" + + "
\r" + + "\n" + + "\r" + "\n" + "
" ); diff --git a/dist/angular-busy.min.js b/dist/angular-busy.min.js index 6d8738d..132529b 100644 --- a/dist/angular-busy.min.js +++ b/dist/angular-busy.min.js @@ -1 +1 @@ -angular.module("cgBusy",[]),angular.module("cgBusy").factory("_cgBusyTrackerFactory",["$timeout","$q",function(a,b){return function(){var c={};c.promises=[],c.delayPromise=null,c.durationPromise=null,c.delayJustFinished=!1,c.reset=function(b){c.minDuration=b.minDuration,c.promises=[],angular.forEach(b.promises,function(a){a&&!a.$cgBusyFulfilled&&d(a)}),0!==c.promises.length&&(c.delayJustFinished=!1,b.delay&&(c.delayPromise=a(function(){c.delayPromise=null,c.delayJustFinished=!0},parseInt(b.delay,10))),b.minDuration&&(c.durationPromise=a(function(){c.durationPromise=null},parseInt(b.minDuration,10)+(b.delay?parseInt(b.delay,10):0))))},c.isPromise=function(a){var b=a&&(a.then||a.$then||a.$promise&&a.$promise.then);return"undefined"!=typeof b},c.callThen=function(a,c,d){var e;a.then||a.$then?e=a:a.$promise?e=a.$promise:a.denodeify&&(e=b.when(a));var f=e.then||e.$then;f.call(e,c,d)};var d=function(a){if(!c.isPromise(a))throw new Error("cgBusy expects a promise (or something that has a .promise or .$promise");-1===c.promises.indexOf(a)&&(c.promises.push(a),c.callThen(a,function(){a.$cgBusyFulfilled=!0,-1!==c.promises.indexOf(a)&&c.promises.splice(c.promises.indexOf(a),1)},function(){a.$cgBusyFulfilled=!0,-1!==c.promises.indexOf(a)&&c.promises.splice(c.promises.indexOf(a),1)}))};return c.active=function(){return c.delayPromise?!1:c.delayJustFinished?(c.delayJustFinished=!1,0===c.promises.length&&(c.durationPromise=null),c.promises.length>0):c.durationPromise?!0:c.promises.length>0},c}}]),angular.module("cgBusy").value("cgBusyDefaults",{}),angular.module("cgBusy").directive("cgBusy",["$compile","$templateCache","cgBusyDefaults","$http","_cgBusyTrackerFactory",function(a,b,c,d,e){return{restrict:"A",link:function(f,g,h){var i=g.css("position");("static"===i||""===i||"undefined"==typeof i)&&g.css("position","relative");var j,k,l,m,n,o=e(),p={templateUrl:"angular-busy.html",delay:0,minDuration:0,backdrop:!0,message:"Please Wait...",wrapperClass:"cg-busy cg-busy-animation"};angular.extend(p,c),f.$watchCollection(h.cgBusy,function(c){if(c||(c={promise:null}),angular.isString(c))throw new Error("Invalid value for cg-busy. cgBusy no longer accepts string ids to represent promises/trackers.");(angular.isArray(c)||o.isPromise(c))&&(c={promise:c}),c=angular.extend(angular.copy(p),c),c.templateUrl||(c.templateUrl=p.templateUrl),angular.isArray(c.promise)||(c.promise=[c.promise]),m||(m=f.$new()),m.$message=c.message,angular.equals(o.promises,c.promise)||o.reset({promises:c.promise,delay:c.delay,minDuration:c.minDuration}),m.$cgBusyIsActive=function(){return o.active()},j&&l===c.templateUrl&&n===c.backdrop||(j&&j.remove(),k&&k.remove(),l=c.templateUrl,n=c.backdrop,d.get(l,{cache:b}).success(function(b){if(c.backdrop="undefined"==typeof c.backdrop?!0:c.backdrop,c.backdrop){var d='
';k=a(d)(m),g.append(k)}var e='
'+b+"
";j=a(e)(m),angular.element(j.children()[0]).css("position","absolute").css("top",0).css("left",0).css("right",0).css("bottom",0),g.append(j)}).error(function(a){throw new Error("Template specified for cgBusy ("+c.templateUrl+") could not be loaded. "+a)}))},!0)}}}]),angular.module("cgBusy").run(["$templateCache",function(a){"use strict";a.put("angular-busy.html",'
\n\n
\n\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n\n
{{$message}}
\n\n
\n\n
')}]); \ No newline at end of file +angular.module("cgBusy",[]),angular.module("cgBusy").factory("_cgBusyTrackerFactory",["$timeout","$q",function(a,b){return function(){var c={};c.promises=[],c.delayPromise=null,c.durationPromise=null,c.delayJustFinished=!1,c.reset=function(b){c.minDuration=b.minDuration,c.promises=[],angular.forEach(b.promises,function(a){a&&!a.$cgBusyFulfilled&&d(a)}),0!==c.promises.length&&(c.delayJustFinished=!1,b.delay&&(c.delayPromise=a(function(){c.delayPromise=null,c.delayJustFinished=!0},parseInt(b.delay,10))),b.minDuration&&(c.durationPromise=a(function(){c.durationPromise=null},parseInt(b.minDuration,10)+(b.delay?parseInt(b.delay,10):0))))},c.isPromise=function(a){var b=a&&(a.then||a.$then||a.$promise&&a.$promise.then);return"undefined"!=typeof b},c.callThen=function(a,c,d){var e;a.then||a.$then?e=a:a.$promise?e=a.$promise:a.denodeify&&(e=b.when(a));var f=e.then||e.$then;f.call(e,c,d)};var d=function(a){if(!c.isPromise(a))throw new Error("cgBusy expects a promise (or something that has a .promise or .$promise");-1===c.promises.indexOf(a)&&(c.promises.push(a),c.callThen(a,function(){a.$cgBusyFulfilled=!0,-1!==c.promises.indexOf(a)&&c.promises.splice(c.promises.indexOf(a),1)},function(){a.$cgBusyFulfilled=!0,-1!==c.promises.indexOf(a)&&c.promises.splice(c.promises.indexOf(a),1)}))};return c.active=function(){return c.delayPromise?!1:c.delayJustFinished?(c.delayJustFinished=!1,0===c.promises.length&&(c.durationPromise=null),c.promises.length>0):c.durationPromise?!0:c.promises.length>0},c}}]),angular.module("cgBusy").value("cgBusyDefaults",{}),angular.module("cgBusy").directive("cgBusy",["$compile","$templateCache","cgBusyDefaults","$http","_cgBusyTrackerFactory",function(a,b,c,d,e){return{restrict:"A",link:function(f,g,h,i){var j=g.css("position");("static"===j||""===j||"undefined"==typeof j)&&g.css("position","relative");var k,l,m,n,o,p=e(),q={templateUrl:"angular-busy.html",delay:0,minDuration:0,backdrop:!0,message:"Please Wait...",wrapperClass:"cg-busy cg-busy-animation"};angular.extend(q,c),f.$watchCollection(h.cgBusy,function(c){if(c||(c={promise:null}),angular.isString(c))throw new Error("Invalid value for cg-busy. cgBusy no longer accepts string ids to represent promises/trackers.");(angular.isArray(c)||p.isPromise(c))&&(c={promise:c}),c=angular.extend(angular.copy(q),c),c.templateUrl||(c.templateUrl=q.templateUrl),angular.isArray(c.promise)||(c.promise=[c.promise]),n||(n=f.$new()),n.$message=c.message,angular.equals(p.promises,c.promise)||p.reset({promises:c.promise,delay:c.delay,minDuration:c.minDuration}),n.$cgBusyIsActive=function(){return p.active()},k&&m===c.templateUrl&&o===c.backdrop||(k&&k.remove(),l&&l.remove(),m=c.templateUrl,o=c.backdrop,d.get(m,{cache:b}).then(function(b){if(c.backdrop="undefined"==typeof c.backdrop?!0:c.backdrop,c.backdrop){var d='
';l=a(d)(n),g.append(l)}var e='
'+b.data+"
";k=a(e)(n),angular.element(k.children()[0]).css("position","absolute").css("top",0).css("left",0).css("right",0).css("bottom",0),g.append(k)})["catch"](function(a){throw new Error("Template specified for cgBusy ("+c.templateUrl+") could not be loaded. "+a)}))},!0)}}}]),angular.module("cgBusy").run(["$templateCache",function(a){"use strict";a.put("angular-busy.html",'
\r\n\r\n
\r\n\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n\r\n
{{$message}}
\r\n\r\n
\r\n\r\n
')}]); \ No newline at end of file diff --git a/package.json b/package.json index c4e364d..fc3f108 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "angular-busy", "main": "angular-busy.js", - "version": "4.1.3", + "version": "4.1.4", "description": "", "repository": { "type": "git",