"+c+"
"+a+"
loading....
';U.prototype={vb:function(){this.ba===0&&this.Ma.show();this.ba++},Lb:function(){this.ba--;this.ba===
-0&&this.Ma.hide("fold")}}})(window,document);
+a;this.R(b||{});this.Q=a.title;this.hb()}function F(a,b){this.text=a;this.Jb=b?20:-1;this.h=[];this.index=0}function D(a,b){this.text=a;this.h=(new F(a,b)).parse();this.index=0}function v(a,b){this.eb=[];this.qa={};this.name=b;a=a||{};function c(){}c.prototype=a;this.q=new c;this.q.Uc=a;if(b=="ROOT")this.q.Vc=this.q}function ka(a,b){this.url=a;this.fc=0;this.getScript=b;this.Jc="_"+(""+Math.random()).substr(2)+"_";this.ka=1800}function aa(a){this.frame=a}function la(a,b,c){this.Lb=a;this.update=c;
+this.status=b}function ma(a,b){this.H=a;this.ea=b}function na(a,b){this.gc=0;this.ca=a;this.F=b;this.Aa=o.Jd?swfobject.Aa:function(){alert("ERROR: swfobject not loaded!")};this.rc=J()}function M(a,b,c,d){this.view=a;this.Md=c;this.Za=b;this.$c=d+"/_attachments";this.value=null;this.d=undefined}function Q(a){this.view=a}function oa(a,b){this.view=a;this.exp=b;this.O=a.getAttribute("ng-validate");this.zc=typeof a.attributes["ng-required"]!="undefined";this.Ka=null;this.d=undefined;this.p=a.value;a.getAttribute("ng-widget")===
+"datepicker"&&k(a).sd()}function pa(a,b){this.view=a;this.exp=b;this.d=undefined;this.p=a.checked?a.value:""}function qa(a,b){this.view=a;this.exp=b;this.d=undefined;this.p=a.value}function ra(a,b){this.view=a;this.exp=b;this.d=undefined;this.p=this.selected()}function sa(a,b){this.view=a;this.exp=b;this.d=this.ia=undefined;this.Ja=a.value;this.p=a.checked?a.value:null}function N(a,b){this.view=a;this.exp=x.Z(b);this.w=false;this.Bc={element:a}}function ta(a,b){this.view=a;this.vb=b}function ua(a,
+b){this.view=a;this.exp=b;this.w=false}function va(a,b){this.view=a;this.exp=b}function wa(a,b){this.view=a;this.exp=b}function xa(a,b){this.view=a;this.exp=b}function ya(a,b){this.view=a;this.exp=b}function za(a,b){this.view=a;this.exp=b}function Aa(a,b){this.view=a;this.exp=b}function Ba(a,b,c,d){this.view=a;this.template=c;this.prefix=d;this.children=[];a=b.match(/^\s*(.+)\s+in\s+(.*)\s*$/);if(!a)throw"Expected ng-repeat in form of 'item in collection' but got '"+b+"'.";b=a[1];this.X=a[2];a=b.match(/^([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\)$/);
+if(!a)throw"'item' in 'item in collection' should be identifier or (key, value) but get '"+b+"'.";this.Lc=a[3]||a[1];this.$b=a[2]}function B(a){this.B=a}function U(a){this.Oa=a.append(U.jb).find("#ng-loading");this.ba=0}var ba={u:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_=",Mb:function(a){var b="",c,d,e,f,g,h,i=0;for(a=ba.qb(a);i"+c+"
"+a+"
loading....
';U.prototype={xb:function(){this.ba===0&&this.Oa.show();this.ba++},Nb:function(){this.ba--;this.ba===0&&this.Oa.hide("fold")}}})(window,document);
diff --git a/angular.js b/angular.js
index e3f24ecb..dee0b57e 100644
--- a/angular.js
+++ b/angular.js
@@ -342,17 +342,17 @@ function merge(src, dst) {
}
// ////////////////////////////
-// Loader
+// Angular
// ////////////////////////////
-function Loader(document, head, config) {
+function Angular(document, head, config) {
this.document = jQuery(document);
this.head = jQuery(head);
this.config = config;
this.location = window.location;
}
-Loader.prototype = {
+Angular.prototype = {
load: function() {
this.configureLogging();
log("Server: " + this.config.server);
@@ -362,7 +362,7 @@ Loader.prototype = {
},
configureJQueryPlugins: function() {
- log('Loader.configureJQueryPlugins()');
+ log('Angular.configureJQueryPlugins()');
jQuery['fn']['scope'] = function() {
var element = this;
while (element && element.get(0)) {
@@ -391,8 +391,8 @@ Loader.prototype = {
},
bindHtml: function() {
- log('Loader.bindHtml()');
- var watcher = new UrlWatcher(this.location);
+ log('Angular.bindHtml()');
+ var watcher = this.watcher = new UrlWatcher(this.location);
var document = this.document;
var widgetFactory = new WidgetFactory(this.config.server, this.config.database);
var binder = new Binder(document[0], widgetFactory, watcher, this.config);
@@ -450,12 +450,6 @@ Loader.prototype = {
log('$binder.parseAnchor()');
binder.parseAnchor();
- log('$binder.updateView()');
- binder.updateView();
-
- //watcher.listener = bind(binder, binder.onUrlChange, watcher);
- //watcher.onUpdate = function(){alert("update");};
- //watcher.watch();
document.find("body").show();
log('ready()');
},
@@ -498,16 +492,6 @@ Loader.prototype = {
consoleLog('ng-console-error', arguments);
};
}
- },
-
- loadCss: function(css) {
- var cssTag = document.createElement('link');
- cssTag.rel = "stylesheet";
- cssTag.type = "text/css";
- if (!css.match(/^http:/))
- css = this.config.server + css;
- cssTag.href = css;
- this.head[0].appendChild(cssTag);
}
};
@@ -553,12 +537,12 @@ UrlWatcher.prototype = {
},
setUrl: function(url) {
-// var existingURL = window.location.href;
-// if (!existingURL.match(/#/))
-// existingURL += '#';
-// if (existingURL != url)
-// window.location.href = url;
-// this.existingURL = url;
+ var existingURL = window.location.href;
+ if (!existingURL.match(/#/))
+ existingURL += '#';
+ if (existingURL != url)
+ window.location.href = url;
+ this.existingURL = url;
},
getUrl: function() {
@@ -573,18 +557,25 @@ angular['compile'] = function(root, config) {
'addUrlChangeListener': noop
};
//todo: don't start watcher
- var loader = new Loader(root, jQuery("head"), _(defaults).extend(config));
+ var angular = new Angular(root, jQuery("head"), _(defaults).extend(config));
//todo: don't load stylesheet by default
// loader.loadCss('/stylesheets/jquery-ui/smoothness/jquery-ui-1.7.1.css');
// loader.loadCss('/stylesheets/css');
- loader.load();
+ angular.load();
var scope = jQuery(root).scope();
//TODO: cleanup
return {
'updateView':function(){return scope.updateView();},
'set':function(){return scope.set.apply(scope, arguments);},
'get':function(){return scope.get.apply(scope, arguments);},
- 'init':function(){scope.get('$binder.executeInit')(); scope.updateView();}
+ 'init':function(){scope.get('$binder.executeInit')(); scope.updateView();},
+ 'watchUrl':function(){
+ var binder = scope.get('$binder');
+ var watcher = angular.watcher;
+ watcher.listener = bind(binder, binder.onUrlChange, watcher);
+ watcher.onUpdate = function(){alert("update");};
+ watcher.watch();
+ }
};
};var angularGlobal = {
'typeOf':function(obj){
@@ -977,7 +968,6 @@ Binder.prototype = {
},
onUrlChange: function (url) {
- log("URL change detected", url);
this.parseAnchor(url);
this.updateView();
},
@@ -1959,6 +1949,23 @@ foreach({
'html': function(html){
return new angularFilter.Meta({html:html});
+ },
+
+ 'linky': function(text){
+ function regExpEscape(text) {
+ return text.replace(/([\/\.\*\+\?\|\(\)\[\]\{\}\\])/g, '\\$1');
+ }
+ var URL = /(ftp|http|https):\/\/([^\(\)|\s]+)/gm;
+ var html = text;
+ var dups = {};
+ foreach(text.match(URL)||[], function(url){
+ url = url.replace(/\.$/, '');
+ if (!dups[url]) {
+ html = html.replace(new RegExp(regExpEscape(url), 'gm'), ''+url+'');
+ dups[url] = true;
+ }
+ });
+ return new angularFilter.Meta({text:text, html:html});
}
}, function(v,k){angularFilter[k] = v;});
diff --git a/example/business_card.html b/example/business_card.html
deleted file mode 100644
index cc45529f..00000000
--- a/example/business_card.html
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- - Fetch tweets for: - - -
-
Loading...
- -
-
[{{tweet.user.screen_name}}]: {{tweet.text}}
-
+
+
+ Address Book
+ [ Filter: ] +-
+
-
+
+ {{user.screen_name}} + as {{user.name}} + [ edit + | X + ] +
{{user.notes}}+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/example/tweeter/tweeterclient.js b/example/tweeter/tweeterclient.js
new file mode 100644
index 00000000..27ec3348
--- /dev/null
+++ b/example/tweeter/tweeterclient.js
@@ -0,0 +1,35 @@
+function noop(){}
+$(document).ready(function(){
+ var scope = window.scope = angular.compile(document);
+ scope.getJSON = function(url, callback) {
+ var list = [];
+ var self = this;
+ self.set('status', 'fetching');
+ $.getJSON(url, function(response){
+ _(response).forEach(function(v,k){
+ list[k] = v;
+ });
+ (callback||noop)(response);
+ self.set('status', '');
+ self.updateView();
+ });
+ return list;
+ };
+
+ function fetchTweets(username){
+ return scope.getJSON(
+ username ?
+ "http://twitter.com/statuses/user_timeline/"+username+".json" :
+ "http://twitter.com/statuses/home_timeline.json");
+ }
+
+ scope.set('fetchTweets', fetchTweets);
+ scope.set('users', [
+ {screen_name:'mhevery', name:'Mi\u0161ko Hevery', notes:'Author of Tweets: {{$anchor.user}}
+ [ Filter: + | << All + ] +Loading...
+ -
+
-
+
+