aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisko Hevery2010-01-09 13:43:16 -0800
committerMisko Hevery2010-01-09 13:43:16 -0800
commit88eca572fdc7f68a7f384b612052c49de00df433 (patch)
treea84283782326ce7d5467e055c4aaba780adfd8db
parenteb9e66f4804cf417ce142e5515b039db73d31144 (diff)
downloadangular.js-88eca572fdc7f68a7f384b612052c49de00df433.tar.bz2
change bootstrap to angular.compile
-rw-r--r--example/calculator-manual_init.html1
-rw-r--r--src/Loader.js14
-rw-r--r--test/ExternalApiTest.js2
3 files changed, 5 insertions, 12 deletions
diff --git a/example/calculator-manual_init.html b/example/calculator-manual_init.html
index 6013345e..175d07b9 100644
--- a/example/calculator-manual_init.html
+++ b/example/calculator-manual_init.html
@@ -4,7 +4,6 @@
<script type="text/javascript" src="../angular.js#autoBind=false"></script>
<script type="text/javascript">
$(document).ready(function(){
- var angular = angularFactory({});
var scope = angular.compile(document);
scope.set('a', 3);
scope.updateView();
diff --git a/src/Loader.js b/src/Loader.js
index 5240944c..eae6e4f5 100644
--- a/src/Loader.js
+++ b/src/Loader.js
@@ -387,19 +387,15 @@ nglr.UrlWatcher.prototype.getUrl = function() {
return window.location.href;
};
-window['angularFactory'] = function(config) {
+angular['compile'] = function(root, config) {
+ config = config || {};
var defaults = {
server: ""
};
//todo: don't load stylesheet by default
//todo: don't start watcher
- function compile(root){
- var loader = new nglr.Loader(root, jQuery("head"), _(defaults).extend(config));
- loader.load();
- return jQuery(root).scope();
- };
- return {
- compile:compile
- };
+ var loader = new nglr.Loader(root, jQuery("head"), _(defaults).extend(config));
+ loader.load();
+ return jQuery(root).scope();
};
diff --git a/test/ExternalApiTest.js b/test/ExternalApiTest.js
index 08771c49..40cb0ab4 100644
--- a/test/ExternalApiTest.js
+++ b/test/ExternalApiTest.js
@@ -3,8 +3,6 @@ ExternalApiTest = TestCase("ExternalApiTest");
ExternalApiTest.prototype = {
testItShouldExposefactory:function(){
var node = $('<div ng-init="a=1">{{b=a+1}}</div>')[0];
- var settings = {};
- var angular = angularFactory(settings);
var scope = angular.compile(node);
assertEquals(1, scope.get('a'));
assertEquals(2, scope.get('b'));