From 8258f52fb313a49bec76a7fa994b53fb807e1af6 Mon Sep 17 00:00:00 2001 From: bg tan Date: Sat, 25 Jun 2016 00:12:41 -0700 Subject: [PATCH 1/5] added support for angular 1.5 component --- src/angularAMD.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/angularAMD.js b/src/angularAMD.js index 2faa891..3afe492 100644 --- a/src/angularAMD.js +++ b/src/angularAMD.js @@ -408,6 +408,10 @@ define(function () { compileProvider.directive(name, constructor); return this; }, + component : function(name, options) { + compileProvider.component(name, options); + return this; + }, filter : function(name, constructor) { filterProvider.register(name, constructor); return this; @@ -498,6 +502,8 @@ define(function () { AngularAMD.prototype.controller = executeProvider('controller'); // .directive AngularAMD.prototype.directive = executeProvider('directive'); + // .component + AngularAMD.prototype.component = executeProvider('component'); // .filter AngularAMD.prototype.filter = executeProvider('filter'); // .factory From fbaaf347dca26307c2cdd77d483dea315e3eca46 Mon Sep 17 00:00:00 2001 From: bg tan Date: Sat, 25 Jun 2016 00:33:01 -0700 Subject: [PATCH 2/5] see if changing to angular 1.5 will fix build --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 5041f5e..3a2ef0a 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "angularAMD", "version": "0.2.1", "dependencies": { - "angular": "^1.3.0", + "angular": "^1.5.0", "requirejs": "~2.1.9" }, "devDependencies": { From 2fe7e7e3975fc4ca4c1ffa694ba55d5bccfa6c26 Mon Sep 17 00:00:00 2001 From: bg tan Date: Sat, 25 Jun 2016 15:13:05 -0700 Subject: [PATCH 3/5] manually undoing changes to see if my changes were breaking the build --- bower.json | 2 +- src/angularAMD.js | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/bower.json b/bower.json index 3a2ef0a..61b6e6f 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "angularAMD", "version": "0.2.1", "dependencies": { - "angular": "^1.5.0", + "angular": "^1.2.221", "requirejs": "~2.1.9" }, "devDependencies": { diff --git a/src/angularAMD.js b/src/angularAMD.js index 3afe492..2faa891 100644 --- a/src/angularAMD.js +++ b/src/angularAMD.js @@ -408,10 +408,6 @@ define(function () { compileProvider.directive(name, constructor); return this; }, - component : function(name, options) { - compileProvider.component(name, options); - return this; - }, filter : function(name, constructor) { filterProvider.register(name, constructor); return this; @@ -502,8 +498,6 @@ define(function () { AngularAMD.prototype.controller = executeProvider('controller'); // .directive AngularAMD.prototype.directive = executeProvider('directive'); - // .component - AngularAMD.prototype.component = executeProvider('component'); // .filter AngularAMD.prototype.filter = executeProvider('filter'); // .factory From 7a67f3160e8214cd8793f7aa4d6d6ca8b03e25c5 Mon Sep 17 00:00:00 2001 From: bg tan Date: Sat, 25 Jun 2016 15:23:45 -0700 Subject: [PATCH 4/5] Update bower.json --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 61b6e6f..0ba02ef 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "angularAMD", "version": "0.2.1", "dependencies": { - "angular": "^1.2.221", + "angular": "^1.2.1", "requirejs": "~2.1.9" }, "devDependencies": { From e699b867984da18d5cd83e30634b093e0ede38f8 Mon Sep 17 00:00:00 2001 From: bg tan Date: Sat, 25 Jun 2016 15:25:16 -0700 Subject: [PATCH 5/5] Update bower.json --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 0ba02ef..5041f5e 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "angularAMD", "version": "0.2.1", "dependencies": { - "angular": "^1.2.1", + "angular": "^1.3.0", "requirejs": "~2.1.9" }, "devDependencies": {