fixes for angular 1.6, and publish to npm

cgross · Jan 5, 2017 · 4e6ea95 · 4e6ea95
1 parent 4d159b6
commit 4e6ea95
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 12 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -42,7 +42,8 @@ module.exports = function (grunt) {
     copy: {
       main: {
         files: [
-          {src:'angular-notify.css',dest:'dist/'}
+          {src:'angular-notify.css',dest:'dist/'},
+          {src:'index.js',dest:'dist/'}
         ]
       }
     },

diff --git a/angular-notify.js b/angular-notify.js
@@ -36,9 +36,9 @@ angular.module('cgNotify', []).factory('notify',['$timeout','$http','$compile','
                 }
             }
 
-            $http.get(args.templateUrl,{cache: $templateCache}).success(function(template){
+            $http.get(args.templateUrl,{cache: $templateCache}).then(function(template){
 
-                var templateElement = $compile(template)(scope);
+                var templateElement = $compile(template.data)(scope);
                 templateElement.bind('webkitTransitionEnd oTransitionEnd otransitionend transitionend msTransitionEnd', function(e){
                     if (e.propertyName === 'opacity' || e.currentTarget.style.opacity === 0 || 
                         (e.originalEvent && e.originalEvent.propertyName === 'opacity')){
@@ -107,7 +107,7 @@ angular.module('cgNotify', []).factory('notify',['$timeout','$http','$compile','
                     },args.duration);
                 }
 
-            }).error(function(data){
+            }, function(data) {
                     throw new Error('Template specified for cgNotify ('+args.templateUrl+') could not be loaded. ' + data);
             });
 

diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
     "dist/angular-notify.js",
     "dist/angular-notify.css"
   ],
-  "version": "2.5.0",
+  "version": "2.5.1",
   "homepage": "https://github.com/cgross/angular-notify",
   "authors": [
     "Chris Gross <schtoo@schtoo.com>"
@@ -31,6 +31,6 @@
     "demo"
   ],
   "dependencies": {
-    "angular": "~1.3"
+    "angular": ">=1.3"
   }
 }
diff --git a/dist/angular-notify.js b/dist/angular-notify.js
@@ -36,9 +36,9 @@ angular.module('cgNotify', []).factory('notify',['$timeout','$http','$compile','
                 }
             }
 
-            $http.get(args.templateUrl,{cache: $templateCache}).success(function(template){
+            $http.get(args.templateUrl,{cache: $templateCache}).then(function(template){
 
-                var templateElement = $compile(template)(scope);
+                var templateElement = $compile(template.data)(scope);
                 templateElement.bind('webkitTransitionEnd oTransitionEnd otransitionend transitionend msTransitionEnd', function(e){
                     if (e.propertyName === 'opacity' || e.currentTarget.style.opacity === 0 || 
                         (e.originalEvent && e.originalEvent.propertyName === 'opacity')){
@@ -107,7 +107,7 @@ angular.module('cgNotify', []).factory('notify',['$timeout','$http','$compile','
                     },args.duration);
                 }
 
-            }).error(function(data){
+            }, function(data) {
                     throw new Error('Template specified for cgNotify ('+args.templateUrl+') could not be loaded. ' + data);
             });
 

diff --git a/dist/angular-notify.min.js b/dist/angular-notify.min.js
diff --git a/dist/index.js b/dist/index.js
@@ -0,0 +1,2 @@
+require('./angular-notify');
+module.exports = 'cgNotify';
diff --git a/index.js b/index.js
@@ -0,0 +1,2 @@
+require('./angular-notify');
+module.exports = 'cgNotify';
diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
-  "name": "angular-notify",
-  "version": "2.5.0",
+  "name": "@cgross/angular-notify",
+  "main":"dist/index.js",
+  "version": "2.5.1",
   "description": "A minimalistic notification service for angular.",
   "repository": {
     "type": "git",