aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisko Hevery2010-01-24 12:10:26 -0800
committerMisko Hevery2010-01-24 12:10:26 -0800
commitc7719c24121b500f0bc2ac7c652d8ec0de418a37 (patch)
tree3b2b4b34983f8e5fdd3a7a75e59d7fe2202b8af5
parentb8ee8b8912ef4fa2f9ff55dc4f7ed27780da34bd (diff)
downloadangular.js-c7719c24121b500f0bc2ac7c652d8ec0de418a37.tar.bz2
fix initialization
-rw-r--r--src/Angular.js3
-rw-r--r--src/Binder.js2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/Angular.js b/src/Angular.js
index 51fca458..d3eef9d9 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -231,7 +231,6 @@ UrlWatcher.prototype = {
/////////////////////////////////////////////////
function configureJQueryPlugins() {
- log('Angular.configureJQueryPlugins()');
var fn = jQuery['fn'];
fn['scope'] = function() {
var element = this;
@@ -334,7 +333,7 @@ function wireAngular(element, config) {
config['location']['listen'](_(binder.onUrlChange).bind(binder));
binder.parseAnchor();
binder.executeInit();
- scope.updateView();
+ binder.updateView();
return self;
},
'element':element[0],
diff --git a/src/Binder.js b/src/Binder.js
index 3fc45a20..48a4f611 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -70,7 +70,7 @@ Binder.prototype = {
},
updateAnchor: function() {
- var url = this.location.get();
+ var url = this.location.get() || "";
var anchorIndex = url.indexOf('#');
if (anchorIndex > -1)
url = url.substring(0, anchorIndex);