From bb0aa4c3a928a2910938ed4f47b413317c82a8f2 Mon Sep 17 00:00:00 2001 From: Volodymyr Kotulskyi Date: Tue, 9 May 2017 11:23:14 +0300 Subject: [PATCH] Calculating position from class styles --- .gitignore | 3 ++- angular-busy.js | 18 ++++++++++++------ dist/angular-busy.js | 18 ++++++++++++------ dist/angular-busy.min.js | 2 +- 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index e5202bf..2812337 100755 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ temp _SpecRunner.html -.grunt \ No newline at end of file +.grunt +.idea \ No newline at end of file diff --git a/angular-busy.js b/angular-busy.js index ac35e41..6065574 100755 --- a/angular-busy.js +++ b/angular-busy.js @@ -38,14 +38,14 @@ angular.module('cgBusy').factory('_cgBusyTrackerFactory',['$timeout','$q',functi tracker.durationPromise = $timeout(function(){ tracker.durationPromise = null; },parseInt(options.minDuration,10) + (options.delay ? parseInt(options.delay,10) : 0)); - } + } }; tracker.isPromise = function(promiseThing){ var then = promiseThing && (promiseThing.then || promiseThing.$then || (promiseThing.$promise && promiseThing.$promise.then)); - return typeof then !== 'undefined'; + return typeof then !== 'undefined'; }; tracker.callThen = function(promiseThing,success,error){ @@ -57,7 +57,7 @@ angular.module('cgBusy').factory('_cgBusyTrackerFactory',['$timeout','$q',functi } else if (promiseThing.denodeify){ promise = $q.when(promiseThing); } - + var then = (promise.then || promise.$then); then.call(promise,success,error); @@ -100,8 +100,8 @@ angular.module('cgBusy').factory('_cgBusyTrackerFactory',['$timeout','$q',functi } return tracker.promises.length > 0; } else { - //if both delay and min duration are set, - //we don't want to initiate the min duration if the + //if both delay and min duration are set, + //we don't want to initiate the min duration if the //promise finished before the delay was complete tracker.delayJustFinished = false; if (tracker.promises.length === 0) { @@ -125,7 +125,13 @@ angular.module('cgBusy').directive('cgBusy',['$compile','$templateCache','cgBusy link: function(scope, element, attrs, fn) { //Apply position:relative to parent element if necessary - var position = element.css('position'); + var position = ''; + if (typeof window.getComputedStyle === 'function'){ + position = window.getComputedStyle(element[0]).position; + } + if (!position) { + position = element.css('position'); + } if (position === 'static' || position === '' || typeof position === 'undefined'){ element.css('position','relative'); } diff --git a/dist/angular-busy.js b/dist/angular-busy.js index c696ebd..b5d0fb3 100644 --- a/dist/angular-busy.js +++ b/dist/angular-busy.js @@ -38,14 +38,14 @@ angular.module('cgBusy').factory('_cgBusyTrackerFactory',['$timeout','$q',functi tracker.durationPromise = $timeout(function(){ tracker.durationPromise = null; },parseInt(options.minDuration,10) + (options.delay ? parseInt(options.delay,10) : 0)); - } + } }; tracker.isPromise = function(promiseThing){ var then = promiseThing && (promiseThing.then || promiseThing.$then || (promiseThing.$promise && promiseThing.$promise.then)); - return typeof then !== 'undefined'; + return typeof then !== 'undefined'; }; tracker.callThen = function(promiseThing,success,error){ @@ -57,7 +57,7 @@ angular.module('cgBusy').factory('_cgBusyTrackerFactory',['$timeout','$q',functi } else if (promiseThing.denodeify){ promise = $q.when(promiseThing); } - + var then = (promise.then || promise.$then); then.call(promise,success,error); @@ -100,8 +100,8 @@ angular.module('cgBusy').factory('_cgBusyTrackerFactory',['$timeout','$q',functi } return tracker.promises.length > 0; } else { - //if both delay and min duration are set, - //we don't want to initiate the min duration if the + //if both delay and min duration are set, + //we don't want to initiate the min duration if the //promise finished before the delay was complete tracker.delayJustFinished = false; if (tracker.promises.length === 0) { @@ -125,7 +125,13 @@ angular.module('cgBusy').directive('cgBusy',['$compile','$templateCache','cgBusy link: function(scope, element, attrs, fn) { //Apply position:relative to parent element if necessary - var position = element.css('position'); + var position = ''; + if (typeof window.getComputedStyle === 'function'){ + position = window.getComputedStyle(element[0]).position; + } + if (!position) { + position = element.css('position'); + } if (position === 'static' || position === '' || typeof position === 'undefined'){ element.css('position','relative'); } diff --git a/dist/angular-busy.min.js b/dist/angular-busy.min.js index 4e6f58c..6a0816f 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}).then(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.data+"
";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)},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
{{$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="";"function"==typeof window.getComputedStyle&&(j=window.getComputedStyle(g[0]).position),j||(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)},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
{{$message}}
\n\n
\n\n
')}]); \ No newline at end of file