Skip to content

Commit be977cd

Browse files
bsalexbsalex
committed
Packages updates
1 parent c2e73f1 commit be977cd

File tree

8 files changed

+305
-306
lines changed

8 files changed

+305
-306
lines changed

‎dist/angular-loading-overlay.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@
1919
"author": "Alexander Beshchuk <[email protected]>",
2020
"license": "ISC",
2121
"devDependencies": {
22-
"angular": "^1.3.5",
23-
"angular-mocks": "^1.3.5",
24-
"bower": "^1.3.12",
22+
"angular": "^1.5.0-beta.0",
23+
"angular-mocks": "^1.5.0-beta.0",
24+
"bower": "^1.5.2",
2525
"grunt": "^0.4.5",
2626
"grunt-cli": "^0.1.13",
2727
"grunt-contrib-clean": "^0.6.0",
28-
"grunt-contrib-jshint": "^0.10.0",
29-
"grunt-contrib-less": "^0.12.0",
30-
"grunt-contrib-uglify": "^0.6.0",
28+
"grunt-contrib-jshint": "^0.11.3",
29+
"grunt-contrib-less": "^1.0.1",
30+
"grunt-contrib-uglify": "^0.9.2",
3131
"grunt-contrib-watch": "^0.6.1",
32-
"jasmine-core": "^2.1.3",
33-
"karma": "^0.12.28",
34-
"karma-firefox-launcher": "^0.1.3",
32+
"jasmine-core": "^2.3.4",
33+
"karma": "^0.13.10",
34+
"karma-firefox-launcher": "^0.1.6",
3535
"karma-growler-reporter": "0.0.1",
36-
"karma-jasmine": "^0.3.2",
37-
"load-grunt-tasks": "^1.0.0"
36+
"karma-jasmine": "^0.3.6",
37+
"load-grunt-tasks": "^3.3.0"
3838
}
3939
}

‎source/js/directives/loading-overlay.js‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
(function () {
2-
"use strict";
1+
(function() {
2+
"use strict";
33

4-
angular.module("angularLoadingOverlay")
5-
.directive("loadingOverlay", ["$templateCache", "$compile",
6-
function ($templateCache, $compile) {
7-
return {
8-
restrict: "A",
9-
transclude: true,
10-
scope: {
11-
loadingOverlay: "@?"
12-
},
13-
link: function(scope, element, attributes, controller, transclude) {
14-
scope.showOverlay = function () {
15-
var ids = scope.loadingOverlay.split(","),
16-
result = false;
4+
angular.module("angularLoadingOverlay")
5+
.directive("loadingOverlay", ["$templateCache", "$compile",
6+
function($templateCache, $compile) {
7+
return {
8+
restrict: "A",
9+
transclude: true,
10+
scope: {
11+
loadingOverlay: "@?"
12+
},
13+
link: function(scope, element, attributes, controller, transclude) {
14+
scope.showOverlay = function() {
15+
var ids = scope.loadingOverlay.split(","),
16+
result = false;
1717

18-
if (scope.$parent.isLoadingOverlay !== undefined) {
19-
for(var i = 0; i < ids.length; i++) {
20-
if (scope.$parent.isLoadingOverlay(ids[i].trim() || undefined)) {
21-
result = true;
22-
break;
23-
}
24-
}
25-
}
18+
if (scope.$parent.isLoadingOverlay !== undefined) {
19+
for (var i = 0; i < ids.length; i++) {
20+
if (scope.$parent.isLoadingOverlay(ids[i].trim() || undefined)) {
21+
result = true;
22+
break;
23+
}
24+
}
25+
}
2626

27-
return result;
28-
};
27+
return result;
28+
};
2929

30-
element.append($compile($templateCache.get("loadingOverlay.html"))(scope));
31-
transclude(function (clone) {
32-
element.append(clone);
33-
});
34-
}
35-
};
36-
}
37-
]);
30+
element.append($compile($templateCache.get("loadingOverlay.html"))(scope));
31+
transclude(function(clone) {
32+
element.append(clone);
33+
});
34+
}
35+
};
36+
}
37+
]);
3838
})();

‎source/js/mixins/loading-overlay.js‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
(function () {
2-
"use strict";
1+
(function() {
2+
"use strict";
33

4-
angular.module("angularLoadingOverlay")
5-
.factory("LoadingOverlay", [function () {
6-
return {
7-
mixin: function (target) {
8-
var activeOverlays = [];
4+
angular.module("angularLoadingOverlay")
5+
.factory("LoadingOverlay", [function() {
6+
return {
7+
mixin: function(target) {
8+
var activeOverlays = [];
99

10-
target.showLoadingOverlay = function (key) {
11-
activeOverlays.push(key);
12-
};
10+
target.showLoadingOverlay = function(key) {
11+
activeOverlays.push(key);
12+
};
1313

14-
target.hideLoadingOverlay = function (key) {
15-
var position = activeOverlays.indexOf(key);
14+
target.hideLoadingOverlay = function(key) {
15+
var position = activeOverlays.indexOf(key);
1616

17-
if (position !== -1) {
18-
activeOverlays.splice(position, 1);
19-
}
20-
};
17+
if (position !== -1) {
18+
activeOverlays.splice(position, 1);
19+
}
20+
};
2121

22-
target.isLoadingOverlay = function (key) {
23-
return activeOverlays.indexOf(key) !== -1;
24-
};
25-
}
26-
};
27-
}]);
28-
})();
22+
target.isLoadingOverlay = function(key) {
23+
return activeOverlays.indexOf(key) !== -1;
24+
};
25+
}
26+
};
27+
}]);
28+
})();

‎source/js/module.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
(function () {
2-
"use strict";
1+
(function() {
2+
"use strict";
33

4-
angular.module("angularLoadingOverlay", []);
5-
})();
4+
angular.module("angularLoadingOverlay", []);
5+
})();

‎source/js/templates/loading-overlay.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
(function () {
2-
"use strict";
1+
(function() {
2+
"use strict";
33

4-
angular.module("angularLoadingOverlay")
5-
.run(["$templateCache", function ($templateCache) {
6-
var template = '<div class="loading-overlay" ng-hide="!showOverlay()"></div>';
7-
$templateCache.put("loadingOverlay.html", template);
8-
}]);
9-
})();
4+
angular.module("angularLoadingOverlay")
5+
.run(["$templateCache", function($templateCache) {
6+
var template = '<div class="loading-overlay" ng-hide="!showOverlay()"></div>';
7+
$templateCache.put("loadingOverlay.html", template);
8+
}]);
9+
})();

0 commit comments

Comments
 (0)