aboutsummaryrefslogtreecommitdiffstats
path: root/src/Angular.js
diff options
context:
space:
mode:
authorMisko Hevery2011-11-22 21:28:39 -0800
committerMisko Hevery2012-01-25 11:50:37 -0800
commit9ee2cdff44e7d496774b340de816344126c457b3 (patch)
tree476ffcb4425e7160865029d6b57d41b766750285 /src/Angular.js
parent8af4fde18246ac1587b471a549e70d5d858bf0ee (diff)
downloadangular.js-9ee2cdff44e7d496774b340de816344126c457b3.tar.bz2
refactor(directives): connect new compiler
- turn everything into a directive
Diffstat (limited to 'src/Angular.js')
-rw-r--r--src/Angular.js13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/Angular.js b/src/Angular.js
index 4a0589c3..f7c3e318 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -90,15 +90,7 @@ var $$scope = '$scope',
/** @name angular */
angular = window.angular || (window.angular = {}),
- angularModule = null,
- /** @name angular.markup */
- angularTextMarkup = extensionMap(angular, 'markup'),
- /** @name angular.attrMarkup */
- angularAttrMarkup = extensionMap(angular, 'attrMarkup'),
- /** @name angular.directive */
- angularDirective = extensionMap(angular, 'directive', lowercase),
- /** @name angular.widget */
- angularWidget = extensionMap(angular, 'widget', shivForIE),
+ angularModule,
/** @name angular.module.ng */
angularInputType = extensionMap(angular, 'inputType', lowercase),
nodeName_,
@@ -988,8 +980,7 @@ function assertArg(arg, name, reason) {
}
function assertArgFn(arg, name) {
- assertArg(arg, name);
assertArg(isFunction(arg), name, 'not a function, got ' +
- (typeof arg == 'object' ? arg.constructor.name || 'Object' : typeof arg));
+ (arg && typeof arg == 'object' ? arg.constructor.name || 'Object' : typeof arg));
return arg;
}