aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Angular.js157
-rw-r--r--src/AngularPublic.js8
-rw-r--r--src/Browser.js51
-rw-r--r--src/Compiler.js21
-rw-r--r--src/JSON.js8
-rw-r--r--src/Parser.js11
-rw-r--r--src/Resource.js3
-rw-r--r--src/Scope.js49
-rw-r--r--src/angular-bootstrap.js6
-rw-r--r--src/angular.suffix2
-rw-r--r--src/apis.js75
-rw-r--r--src/delete/Binder.js356
-rw-r--r--src/delete/Model.js65
-rw-r--r--src/delete/Scope.js407
-rw-r--r--src/delete/Widgets.js806
-rw-r--r--src/directives.js76
-rw-r--r--src/filters.js354
-rw-r--r--src/formatters.js48
-rw-r--r--src/jqLite.js61
-rw-r--r--src/moveToAngularCom/ControlBar.js72
-rw-r--r--src/moveToAngularCom/DataStore.js330
-rw-r--r--src/moveToAngularCom/Server.js68
-rw-r--r--src/moveToAngularCom/Users.js35
-rw-r--r--src/moveToAngularCom/directivesAngularCom.js29
-rw-r--r--src/scenario/DSL.js125
-rw-r--r--src/scenario/Future.js13
-rw-r--r--src/scenario/Matcher.js21
-rw-r--r--src/scenario/Runner.js44
-rw-r--r--src/services.js147
-rw-r--r--src/widgets.js20
30 files changed, 597 insertions, 2871 deletions
diff --git a/src/Angular.js b/src/Angular.js
index 2b26c88d..3970f762 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -3,8 +3,6 @@
if (typeof document.getAttribute == 'undefined')
document.getAttribute = function() {};
-if (!window['console']) window['console']={'log':noop, 'error':noop};
-
var consoleNode,
PRIORITY_FIRST = -99999,
PRIORITY_WATCH = -1000,
@@ -18,11 +16,12 @@ var consoleNode,
msie = !!/(msie) ([\w.]+)/.exec(lowercase(navigator.userAgent)),
jqLite = jQuery || jqLiteWrap,
slice = Array.prototype.slice,
+ error = window['console'] ? bind(window['console'], window['console']['error'] || noop) : noop,
angular = window['angular'] || (window['angular'] = {}),
- angularTextMarkup = extensionMap(angular, 'textMarkup'),
+ angularTextMarkup = extensionMap(angular, 'markup'),
angularAttrMarkup = extensionMap(angular, 'attrMarkup'),
angularDirective = extensionMap(angular, 'directive'),
- angularWidget = extensionMap(angular, 'widget'),
+ angularWidget = extensionMap(angular, 'widget', lowercase),
angularValidator = extensionMap(angular, 'validator'),
angularFilter = extensionMap(angular, 'filter'),
angularFormatter = extensionMap(angular, 'formatter'),
@@ -30,10 +29,6 @@ var consoleNode,
angularCallbacks = extensionMap(angular, 'callbacks'),
nodeName;
-function angularAlert(){
- log(arguments); window.alert.apply(window, arguments);
-}
-
function foreach(obj, iterator, context) {
var key;
if (obj) {
@@ -78,11 +73,16 @@ function extend(dst) {
return dst;
}
+function inherit(parent, extra) {
+ return extend(new (extend(function(){}, {prototype:parent}))(), extra);
+};
+
function noop() {}
function identity($) {return $;}
-function extensionMap(angular, name) {
+function extensionMap(angular, name, transform) {
var extPoint;
return angular[name] || (extPoint = angular[name] = function (name, fn, prop){
+ name = (transform || identity)(name);
if (isDefined(fn)) {
extPoint[name] = extend(fn, prop || {});
}
@@ -173,50 +173,6 @@ function indexOf(array, obj) {
return -1;
}
-function log(a, b, c){
- var console = window['console'];
- switch(arguments.length) {
- case 1:
- console['log'](a);
- break;
- case 2:
- console['log'](a, b);
- break;
- default:
- console['log'](a, b, c);
- break;
- }
-}
-
-function error(a, b, c){
- var console = window['console'];
- switch(arguments.length) {
- case 1:
- console['error'](a);
- break;
- case 2:
- console['error'](a, b);
- break;
- default:
- console['error'](a, b, c);
- break;
- }
-}
-
-function consoleLog(level, objs) {
- var log = document.createElement("div");
- log.className = level;
- var msg = "";
- var sep = "";
- for ( var i = 0; i < objs.length; i++) {
- var obj = objs[i];
- msg += sep + (typeof obj == 'string' ? obj : toJson(obj));
- sep = " ";
- }
- log.appendChild(document.createTextNode(msg));
- consoleNode.appendChild(log);
-}
-
function isLeafNode (node) {
if (node) {
switch (node.nodeName) {
@@ -259,6 +215,32 @@ function copy(source, destination){
}
}
+function equals(o1, o2) {
+ if (o1 == o2) return true;
+ var t1 = typeof o1, t2 = typeof o2, length, key, keySet;
+ if (t1 == t2 && t1 == 'object') {
+ if (o1 instanceof Array) {
+ if ((length = o1.length) == o2.length) {
+ for(key=0; key<length; key++) {
+ if (!equals(o1[key], o2[key])) return false;
+ }
+ return true;
+ }
+ } else {
+ keySet = {};
+ for(key in o1) {
+ if (key.charAt(0) !== '$' && !equals(o1[key], o2[key])) return false;
+ keySet[key] = true;
+ }
+ for(key in o2) {
+ if (key.charAt(0) !== '$' && keySet[key] !== true) return false;
+ }
+ return true;
+ }
+ }
+ return false;
+}
+
function setHtml(node, html) {
if (isLeafNode(node)) {
if (msie) {
@@ -309,27 +291,24 @@ function escapeAttr(html) {
'&quot;');
}
-function bind(_this, _function) {
- if (!isFunction(_function))
- throw "Not a function!";
- var curryArgs = slice.call(arguments, 2, arguments.length);
- return function() {
- return _function.apply(_this, curryArgs.concat(slice.call(arguments, 0, arguments.length)));
- };
-}
-
-function outerHTML(node) {
- var temp = document.createElement('div');
- temp.appendChild(node);
- var outerHTML = temp.innerHTML;
- temp.removeChild(node);
- return outerHTML;
+function bind(self, fn) {
+ var curryArgs = arguments.length > 2 ? slice.call(arguments, 2, arguments.length) : [];
+ if (typeof fn == 'function') {
+ return curryArgs.length ? function() {
+ return arguments.length ? fn.apply(self, curryArgs.concat(slice.call(arguments, 0, arguments.length))) : fn.apply(self, curryArgs);
+ }: function() {
+ return arguments.length ? fn.apply(self, arguments) : fn.call(self);
+ };
+ } else {
+ // in IE, native methods ore not functions and so they can not be bound (but they don't need to be)
+ return fn;
+ }
}
function toBoolean(value) {
if (value && value.length !== 0) {
var v = lowercase("" + value);
- value = !(v == 'f' || v == '0' || v == 'false' || v == 'no' || v == '[]');
+ value = !(v == 'f' || v == '0' || v == 'false' || v == 'no' || v == 'n' || v == '[]');
} else {
value = false;
}
@@ -349,12 +328,11 @@ function merge(src, dst) {
}
}
-function compile(element, parentScope, overrides) {
+function compile(element, existingScope) {
var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget),
- $element = jqLite(element),
- parent = extend({}, parentScope);
+ $element = jqLite(element);
parent.$element = $element;
- return compiler.compile($element)($element, parent, overrides);
+ return compiler.compile($element)($element, existingScope);
}
/////////////////////////////////////////////////
@@ -363,8 +341,8 @@ function parseKeyValue(keyValue) {
foreach((keyValue || "").split('&'), function(keyValue){
if (keyValue) {
key_value = keyValue.split('=');
- key = decodeURIComponent(key_value[0]);
- obj[key] = key_value[1] ? decodeURIComponent(key_value[1]) : true;
+ key = unescape(key_value[0]);
+ obj[key] = key_value[1] ? unescape(key_value[1]) : true;
}
});
return obj;
@@ -373,29 +351,42 @@ function parseKeyValue(keyValue) {
function toKeyValue(obj) {
var parts = [];
foreach(obj, function(value, key){
- parts.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
+ parts.push(escape(key) + '=' + escape(value));
});
return parts.length ? parts.join('&') : '';
}
function angularInit(config){
if (config.autobind) {
- var scope = compile(window.document, null, {'$config':config});
// TODO default to the source of angular.js
- scope.$browser.addCss('css/angular.css');
+ var scope = compile(window.document, null, {'$config':config});
+ if (config.css)
+ scope.$browser.addCss(config.base_url + config.css);
scope.$init();
}
}
-function angularJsConfig(document) {
- var filename = /(.*)\/angular(-(.*))?.js(#(.*))?/,
- scripts = document.getElementsByTagName("SCRIPT"),
+function angularJsConfig(document, config) {
+ var filename = /^(.*)\/angular(-([^\/]*))?.js(#(.*))?$/,
+ scripts = document.getElementsByTagName("script"),
match;
+ config = extend({
+ base_url: '',
+ css: '../css/angular.css'
+ }, config);
for(var j = 0; j < scripts.length; j++) {
match = (scripts[j].src || "").match(filename);
if (match) {
- return match[5];
+ config.base_url = match[1] + '/';
+ extend(config, parseKeyValue(match[5]));
+ eachAttribute(jqLite(scripts[j]), function(value, name){
+ if (/^ng:/.exec(name)) {
+ name = name.substring(3).replace(/-/g, '_');
+ if (name == 'autobind') value = true;
+ config[name] = value;
+ }
+ });
}
}
- return "";
+ return config;
}
diff --git a/src/AngularPublic.js b/src/AngularPublic.js
index 7230c3e5..7b093f88 100644
--- a/src/AngularPublic.js
+++ b/src/AngularPublic.js
@@ -1,7 +1,10 @@
var browserSingleton;
angularService('$browser', function browserFactory(){
if (!browserSingleton) {
- browserSingleton = new Browser(window.location, window.document);
+ browserSingleton = new Browser(
+ window.location,
+ jqLite(window.document),
+ jqLite(window.document.getElementsByTagName('head')[0]));
browserSingleton.startUrlWatcher();
browserSingleton.bind();
}
@@ -14,9 +17,12 @@ extend(angular, {
'scope': createScope,
'copy': copy,
'extend': extend,
+ 'equals': equals,
'foreach': foreach,
'noop':noop,
'bind':bind,
+ 'toJson': toJson,
+ 'fromJson': fromJson,
'identity':identity,
'isUndefined': isUndefined,
'isDefined': isDefined,
diff --git a/src/Browser.js b/src/Browser.js
index 0552b3ae..b4314e2c 100644
--- a/src/Browser.js
+++ b/src/Browser.js
@@ -2,7 +2,7 @@
// Browser
//////////////////////////////
-function Browser(location, document) {
+function Browser(location, document, head) {
this.delay = 50;
this.expectedUrl = location.href;
this.urlListeners = [];
@@ -21,8 +21,9 @@ function Browser(location, document) {
};
this.location = location;
- this.document = jqLite(document);
- this.body = jqLite(document.body);
+ this.document = document;
+ this.head = head;
+ this.idCounter = 0;
}
Browser.prototype = {
@@ -58,21 +59,37 @@ Browser.prototype = {
callback = post;
post = null;
}
- var xhr = new this.XHR(),
- self = this;
- xhr.open(method, url, true);
- this.outstandingRequests.count ++;
- xhr.onreadystatechange = function() {
- if (xhr.readyState == 4) {
- try {
- callback(xhr.status || 200, xhr.responseText);
- } finally {
- self.outstandingRequests.count--;
- self.processRequestCallbacks();
+ if (lowercase(method) == 'json') {
+ var callbackId = "angular_" + Math.random() + '_' + (this.idCounter++);
+ callbackId = callbackId.replace(/\d\./, '');
+ var script = this.document[0].createElement('script');
+ script.type = 'text/javascript';
+ script.src = url.replace('JSON_CALLBACK', callbackId);
+ this.head.append(script);
+ window[callbackId] = function(data){
+ window[callbackId] = undefined;
+ callback(200, data);
+ };
+ } else {
+ var xhr = new this.XHR(),
+ self = this;
+ xhr.open(method, url, true);
+ xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+ xhr.setRequestHeader("Accept", "application/json, text/plain, */*");
+ xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+ this.outstandingRequests.count ++;
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4) {
+ try {
+ callback(xhr.status || 200, xhr.responseText);
+ } finally {
+ self.outstandingRequests.count--;
+ self.processRequestCallbacks();
+ }
}
- }
- };
- xhr.send(post || '');
+ };
+ xhr.send(post || '');
+ }
},
processRequestCallbacks: function(){
diff --git a/src/Compiler.js b/src/Compiler.js
index 9faafb13..e09f1876 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -30,7 +30,9 @@ Template.prototype = {
element = jqLite(element);
foreach(this.inits, function(fn) {
queue.push(function(scope) {
- scope.$tryEval(fn, element, element);
+ scope.$tryEval(function(){
+ return fn.call(scope, element);
+ }, element);
});
});
@@ -67,8 +69,8 @@ Template.prototype = {
///////////////////////////////////
//Compiler
//////////////////////////////////
-function Compiler(textMarkup, attrMarkup, directives, widgets){
- this.textMarkup = textMarkup;
+function Compiler(markup, attrMarkup, directives, widgets){
+ this.markup = markup;
this.attrMarkup = attrMarkup;
this.directives = directives;
this.widgets = widgets;
@@ -121,20 +123,25 @@ Compiler.prototype = {
descend: function(value){ if(isDefined(value)) descend = value; return descend;},
directives: function(value){ if(isDefined(value)) directives = value; return directives;}
};
- priority = element.attr('ng:eval-order') || priority || 0;
+ try {
+ priority = element.attr('ng:eval-order') || priority || 0;
+ } catch (e) {
+ // for some reason IE throws error under some weird circumstances. so just assume nothing
+ priority = priority || 0;
+ }
if (isString(priority)) {
priority = PRIORITY[uppercase(priority)] || 0;
}
template = new Template(priority);
eachAttribute(element, function(value, name){
if (!widget) {
- if (widget = self.widgets['@' + name]) {
+ if (widget = self.widgets('@' + name)) {
widget = bind(selfApi, widget, value, element);
}
}
});
if (!widget) {
- if (widget = self.widgets[nodeName(element)]) {
+ if (widget = self.widgets(nodeName(element))) {
widget = bind(selfApi, widget, element);
}
}
@@ -151,7 +158,7 @@ Compiler.prototype = {
// process markup for text nodes only
eachTextNode(element, function(textNode){
var text = textNode.text();
- foreach(self.textMarkup, function(markup){
+ foreach(self.markup, function(markup){
markup.call(selfApi, text, textNode, element);
});
});
diff --git a/src/JSON.js b/src/JSON.js
index 340b075a..0311c317 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -1,4 +1,4 @@
-array = [].constructor;
+var array = [].constructor;
function toJson(obj, pretty){
var buf = [];
@@ -6,10 +6,6 @@ function toJson(obj, pretty){
return buf.join('');
}
-function toPrettyJson(obj) {
- return toJson(obj, true);
-}
-
function fromJson(json) {
if (!json) return json;
try {
@@ -74,7 +70,7 @@ function toJsonArray(buf, obj, pretty, stack){
var childPretty = pretty ? pretty + " " : false;
var keys = [];
for(var k in obj) {
- if (k.indexOf('$$') === 0 || obj[k] === undefined)
+ if (!obj.hasOwnProperty(k) || k.indexOf('$$') === 0 || obj[k] === undefined)
continue;
keys.push(k);
}
diff --git a/src/Parser.js b/src/Parser.js
index df270792..5eb75713 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -599,12 +599,11 @@ Parser.prototype = {
for ( var i = 0; i < argsFn.length; i++) {
args.push(argsFn[i](self));
}
- var fnPtr = fn(self);
- if (typeof fnPtr === 'function') {
- return fnPtr.apply(self, args);
- } else {
- throw "Expression '" + fn.isAssignable + "' is not a function.";
- }
+ var fnPtr = fn(self) || noop;
+ // IE stupidity!
+ return fnPtr.apply ?
+ fnPtr.apply(self, args) :
+ fnPtr(args[0], args[1], args[2], args[3], args[4]);
};
},
diff --git a/src/Resource.js b/src/Resource.js
index 1279dc54..f4f26ebd 100644
--- a/src/Resource.js
+++ b/src/Resource.js
@@ -28,6 +28,7 @@ Route.prototype = {
query.push(encodeURI(key) + '=' + encodeURI(value));
}
});
+ url = url.replace(/\/*$/, '');
return url + (query.length ? '?' + query.join('&') : '');
}
};
@@ -88,7 +89,7 @@ ResourceFactory.prototype = {
throw "Expected between 0-3 arguments [params, data, callback], got " + arguments.length + " arguments.";
}
- var value = action.isArray ? [] : new Resource(data)
+ var value = action.isArray ? [] : new Resource(data);
self.xhr(
action.method,
route.url(extend({}, action.params || {}, extractParams(data), params)),
diff --git a/src/Scope.js b/src/Scope.js
index 35da77fe..27fafc3a 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -44,14 +44,16 @@ function setter(instance, path, value){
}
///////////////////////////////////
-
-var getterFnCache = {};
-var JS_KEYWORDS = {};
+var scopeId = 0;
+ getterFnCache = {},
+ compileCache = {},
+ JS_KEYWORDS = {};
foreach(
- ["break", "const", "continue", "class", "delete",
- "do", "while", "for", "function", "if",
- "instanceof", "new", "return", "switch",
- "this", "throw", "try", "catch", "with"],
+ ["abstract", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "debugger", "default",
+ "delete", "do", "double", "else", "enum", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto",
+ "if", "implements", "import", "ininstanceof", "intinterface", "long", "native", "new", "null", "package", "private",
+ "protected", "public", "return", "short", "static", "super", "switch", "synchronized", "this", "throw", "throws",
+ "transient", "true", "try", "typeof", "var", "volatile", "void", "while", "with"],
function(key){ JS_KEYWORDS[key] = true;}
);
function getterFn(path){
@@ -74,7 +76,7 @@ function getterFn(path){
code += ' type = angular.Global.typeOf(last);\n';
code += ' fn = (angular[type.charAt(0).toUpperCase() + type.substring(1)]||{})["' + name + '"];\n';
code += ' if (fn)\n';
- code += ' self = function(){ return fn.apply(last, [last].concat(slice.call(arguments, 0, arguments.length))); };\n';
+ code += ' self = function(){ return fn.apply(last, [last].concat(Array.prototype.slice.call(arguments, 0, arguments.length))); };\n';
code += ' }\n';
}
});
@@ -87,9 +89,8 @@ function getterFn(path){
///////////////////////////////////
-var compileCache = {};
function expressionCompile(exp){
- if (isFunction(exp)) return exp;
+ if (typeof exp === 'function') return exp;
var fn = compileCache[exp];
if (!fn) {
var parser = new Parser(exp);
@@ -107,7 +108,6 @@ function errorHandlerFor(element, error) {
elementError(element, NG_EXCEPTION, isDefined(error) ? toJson(error) : error);
}
-var scopeId = 0;
function createScope(parent, services, existing) {
function Parent(){}
function API(){}
@@ -129,24 +129,32 @@ function createScope(parent, services, existing) {
$set: bind(instance, setter, instance),
$eval: function $eval(exp) {
- if (exp !== undefined) {
- return expressionCompile(exp).apply(instance, slice.call(arguments, 1, arguments.length));
- } else {
+ var type = typeof exp;
+ if (type == 'undefined') {
for ( var i = 0, iSize = evalLists.sorted.length; i < iSize; i++) {
for ( var queue = evalLists.sorted[i],
- jSize = queue.length,
- j= 0; j < jSize; j++) {
+ jSize = queue.length,
+ j= 0; j < jSize; j++) {
instance.$tryEval(queue[j].fn, queue[j].handler);
}
}
+ } else if (type === 'function') {
+ return exp.call(instance);
+ } else if (type === 'string') {
+ return expressionCompile(exp).call(instance);
}
},
$tryEval: function (expression, exceptionHandler) {
+ var type = typeof expression;
try {
- return expressionCompile(expression).apply(instance, slice.call(arguments, 2, arguments.length));
+ if (type == 'function') {
+ return expression.call(instance);
+ } else if (type == 'string'){
+ return expressionCompile(expression).call(instance);
+ }
} catch (e) {
- error(e);
+ (instance.$log || {error:error}).error(e);
if (isFunction(exceptionHandler)) {
exceptionHandler(e);
} else if (exceptionHandler) {
@@ -160,12 +168,15 @@ function createScope(parent, services, existing) {
$watch: function(watchExp, listener, exceptionHandler) {
var watch = expressionCompile(watchExp),
last;
+ listener = expressionCompile(listener);
function watcher(){
var value = watch.call(instance),
lastValue = last;
if (last !== value) {
last = value;
- instance.$tryEval(listener, exceptionHandler, value, lastValue);
+ instance.$tryEval(function(){
+ return listener.call(instance, value, lastValue);
+ }, exceptionHandler);
}
}
instance.$onEval(PRIORITY_WATCH, watcher);
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index 90e1104e..1f03b8a3 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -22,16 +22,14 @@
* THE SOFTWARE.
*/
(function(previousOnLoad){
- var filename = /(.*)\/angular-(.*).js(#(.*))?/,
+ var filename = /^(.*)\/angular-bootstrap.js(#.*)?$/,
scripts = document.getElementsByTagName("SCRIPT"),
serverPath,
- config,
match;
for(var j = 0; j < scripts.length; j++) {
match = (scripts[j].src || "").match(filename);
if (match) {
serverPath = match[1];
- config = match[4];
}
}
@@ -63,7 +61,7 @@
try {
if (previousOnLoad) previousOnLoad();
} catch(e) {}
- angularInit(parseKeyValue(config));
+ angularInit(angularJsConfig(document));
};
})(window.onload);
diff --git a/src/angular.suffix b/src/angular.suffix
index 36d73df2..7e86c5d5 100644
--- a/src/angular.suffix
+++ b/src/angular.suffix
@@ -3,7 +3,7 @@
try {
if (previousOnLoad) previousOnLoad();
} catch(e) {}
- angularInit(parseKeyValue(angularJsConfig(document)));
+ angularInit(angularJsConfig(document));
};
})(window, document, window.onload);
diff --git a/src/apis.js b/src/apis.js
index 306d0ce8..0cf24016 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -12,24 +12,15 @@ var angularGlobal = {
};
var angularCollection = {
- 'size': size
+ 'copy': copy,
+ 'size': size,
+ 'equals': equals
};
var angularObject = {
'extend': extend
};
var angularArray = {
'indexOf': indexOf,
- 'include': includes,
- 'includeIf':function(array, value, condition) {
- var index = indexOf(array, value);
- if (condition) {
- if (index == -1)
- array.push(value);
- } else {
- array.splice(index, 1);
- }
- return array;
- },
'sum':function(array, expression) {
var fn = angular['Function']['compile'](expression);
var sum = 0;
@@ -47,20 +38,6 @@ var angularArray = {
array.splice(index, 1);
return value;
},
- 'find':function(array, condition, defaultValue) {
- if (!condition) return undefined;
- var fn = angular['Function']['compile'](condition);
- foreach(array, function($){
- if (fn($)){
- defaultValue = $;
- return true;
- }
- });
- return defaultValue;
- },
- 'findById':function(array, id) {
- return angular.Array.find(array, function($){return $.$id == id;}, null);
- },
'filter':function(array, expression) {
var predicates = [];
predicates.check = function(value) {
@@ -193,52 +170,6 @@ var angularArray = {
var arrayCopy = [];
for ( var i = 0; i < array.length; i++) { arrayCopy.push(array[i]); }
return arrayCopy.sort(reverse(comparator, descend));
- },
- 'orderByToggle':function(predicate, attribute) {
- var STRIP = /^([+|-])?(.*)/;
- var ascending = false;
- var index = -1;
- foreach(predicate, function($, i){
- if (index == -1) {
- if ($ == attribute) {
- ascending = true;
- index = i;
- return true;
- }
- if (($.charAt(0)=='+'||$.charAt(0)=='-') && $.substring(1) == attribute) {
- ascending = $.charAt(0) == '+';
- index = i;
- return true;
- }
- }
- });
- if (index >= 0) {
- predicate.splice(index, 1);
- }
- predicate.unshift((ascending ? "-" : "+") + attribute);
- return predicate;
- },
- 'orderByDirection':function(predicate, attribute, ascend, descend) {
- ascend = ascend || 'ng-ascend';
- descend = descend || 'ng-descend';
- var att = predicate[0] || '';
- var direction = true;
- if (att.charAt(0) == '-') {
- att = att.substring(1);
- direction = false;
- } else if(att.charAt(0) == '+') {
- att = att.substring(1);
- }
- return att == attribute ? (direction ? ascend : descend) : "";
- },
- 'merge':function(array, index, mergeValue) {
- var value = array[index];
- if (!value) {
- value = {};
- array[index] = value;
- }
- merge(mergeValue, value);
- return array;
}
};
diff --git a/src/delete/Binder.js b/src/delete/Binder.js
deleted file mode 100644
index 095e2b08..00000000
--- a/src/delete/Binder.js
+++ /dev/null
@@ -1,356 +0,0 @@
-function Binder(doc, widgetFactory, datastore, location, config) {
- this.doc = doc;
- this.location = location;
- this.datastore = datastore;
- this.anchor = {};
- this.widgetFactory = widgetFactory;
- this.config = config || {};
- this.updateListeners = [];
-}
-
-Binder.parseBindings = function(string) {
- var results = [];
- var lastIndex = 0;
- var index;
- while((index = string.indexOf('{{', lastIndex)) > -1) {
- if (lastIndex < index)
- results.push(string.substr(lastIndex, index - lastIndex));
- lastIndex = index;
-
- index = string.indexOf('}}', index);
- index = index < 0 ? string.length : index + 2;
-
- results.push(string.substr(lastIndex, index - lastIndex));
- lastIndex = index;
- }
- if (lastIndex != string.length)
- results.push(string.substr(lastIndex, string.length - lastIndex));
- return results.length === 0 ? [ string ] : results;
-};
-
-Binder.hasBinding = function(string) {
- var bindings = Binder.parseBindings(string);
- return bindings.length > 1 || Binder.binding(bindings[0]) !== null;
-};
-
-Binder.binding = function(string) {
- var binding = string.replace(/\n/gm, ' ').match(/^\{\{(.*)\}\}$/);
- return binding ? binding[1] : null;
-};
-
-
-Binder.prototype = {
- parseQueryString: function(query) {
- var params = {};
- query.replace(/(?:^|&)([^&=]*)=?([^&]*)/g,
- function (match, left, right) {
- if (left) params[decodeURIComponent(left)] = decodeURIComponent(right);
- });
- return params;
- },
-
- parseAnchor: function() {
- var self = this, url = this.location['get']() || "";
-
- var anchorIndex = url.indexOf('#');
- if (anchorIndex < 0) return;
- var anchor = url.substring(anchorIndex + 1);
-
- var anchorQuery = this.parseQueryString(anchor);
- foreach(self.anchor, function(newValue, key) {
- delete self.anchor[key];
- });
- foreach(anchorQuery, function(newValue, key) {
- self.anchor[key] = newValue;
- });
- },
-
- onUrlChange: function() {
- this.parseAnchor();
- this.updateView();
- },
-
- updateAnchor: function() {
- var url = this.location['get']() || "";
- var anchorIndex = url.indexOf('#');
- if (anchorIndex > -1)
- url = url.substring(0, anchorIndex);
- url += "#";
- var sep = '';
- for (var key in this.anchor) {
- var value = this.anchor[key];
- if (typeof value === 'undefined' || value === null) {
- delete this.anchor[key];
- } else {
- url += sep + encodeURIComponent(key);
- if (value !== true)
- url += "=" + encodeURIComponent(value);
- sep = '&';
- }
- }
- this.location['set'](url);
- return url;
- },
-
- updateView: function() {
- var start = new Date().getTime();
- var scope = jQuery(this.doc).scope();
- scope.clearInvalid();
- scope.updateView();
- var end = new Date().getTime();
- this.updateAnchor();
- foreach(this.updateListeners, function(fn) {fn();});
- },
-
- docFindWithSelf: function(exp){
- var doc = jQuery(this.doc);
- var selection = doc.find(exp);
- if (doc.is(exp)){
- selection = selection.andSelf();
- }
- return selection;
- },
-
- executeInit: function() {
- this.docFindWithSelf("[ng:init]").each(function() {
- var jThis = jQuery(this);
- var scope = jThis.scope();
- try {
- scope.eval(jThis.attr('ng:init'));
- } catch (e) {
- alert("EVAL ERROR:\n" + jThis.attr('ng:init') + '\n' + toJson(e, true));
- }
- });
- },
-
- entity: function (scope) {
- var self = this;
- this.docFindWithSelf("[ng-entity]").attr("ng:watch", function() {
- try {
- var jNode = jQuery(this);
- var decl = scope.entity(jNode.attr("ng-entity"), self.datastore);
- return decl + (jNode.attr('ng:watch') || "");
- } catch (e) {
- log(e);
- alert(e);
- }
- });
- },
-
- compile: function() {
- var jNode = jQuery(this.doc);
- if (this.config['autoSubmit']) {
- var submits = this.docFindWithSelf(":submit").not("[ng-action]");
- submits.attr("ng-action", "$save()");
- submits.not(":disabled").not("ng:bind-attr").attr("ng:bind-attr", '{disabled:"{{$invalidWidgets}}"}');
- }
- this.precompile(this.doc)(this.doc, jNode.scope(), "");
- this.docFindWithSelf("a[ng-action]").live('click', function (event) {
- var jNode = jQuery(this);
- var scope = jNode.scope();
- try {
- scope.eval(jNode.attr('ng-action'));
- jNode.removeAttr('ng-error');
- jNode.removeClass("ng-exception");
- } catch (e) {
- jNode.addClass("ng-exception");
- jNode.attr('ng-error', toJson(e, true));
- }
- scope.get('$updateView')();
- return false;
- });
- },
-
- translateBinding: function(node, parentPath, factories) {
- var path = parentPath.concat();
- var offset = path.pop();
- var parts = Binder.parseBindings(node.nodeValue);
- if (parts.length > 1 || Binder.binding(parts[0])) {
- var parent = node.parentNode;
- if (isLeafNode(parent)) {
- parent.setAttribute('ng:bind-template', node.nodeValue);
- factories.push({path:path, fn:function(node, scope, prefix) {
- return new BindUpdater(node, node.getAttribute('ng:bind-template'));
- }});
- } else {
- for (var i = 0; i < parts.length; i++) {
- var part = parts[i];
- var binding = Binder.binding(part);
- var newNode;
- if (binding) {
- newNode = document.createElement("span");
- var jNewNode = jQuery(newNode);
- jNewNode.attr("ng:bind", binding);
- if (i === 0) {
- factories.push({path:path.concat(offset + i), fn:this.ng_bind});
- }
- } else if (msie && part.charAt(0) == ' ') {
- newNode = document.createElement("span");
- newNode.innerHTML = '&nbsp;' + part.substring(1);
- } else {
- newNode = document.createTextNode(part);
- }
- parent.insertBefore(newNode, node);
- }
- }
- parent.removeChild(node);
- }
- },
-
- precompile: function(root) {
- var factories = [];
- this.precompileNode(root, [], factories);
- return function (template, scope, prefix) {
- var len = factories.length;
- for (var i = 0; i < len; i++) {
- var factory = factories[i];
- var node = template;
- var path = factory.path;
- for (var j = 0; j < path.length; j++) {
- node = node.childNodes[path[j]];
- }
- try {
- scope.addWidget(factory.fn(node, scope, prefix));
- } catch (e) {
- alert(e);
- }
- }
- };
- },
-
- precompileNode: function(node, path, factories) {
- var nodeType = node.nodeType;
- if (nodeType == Node.TEXT_NODE) {
- this.translateBinding(node, path, factories);
- return;
- } else if (nodeType != Node.ELEMENT_NODE && nodeType != Node.DOCUMENT_NODE) {
- return;
- }
-
- if (!node.getAttribute) return;
- var nonBindable = node.getAttribute('ng:non-bindable');
- if (nonBindable || nonBindable === "") return;
-
- var attributes = node.attributes;
- if (attributes) {
- var bindings = node.getAttribute('ng:bind-attr');
- node.removeAttribute('ng:bind-attr');
- bindings = bindings ? fromJson(bindings) : {};
- var attrLen = attributes.length;
- for (var i = 0; i < attrLen; i++) {
- var attr = attributes[i];
- var attrName = attr.name;
- // http://www.glennjones.net/Post/809/getAttributehrefbug.htm
- var attrValue = msie && attrName == 'href' ?
- decodeURI(node.getAttribute(attrName, 2)) : attr.value;
- if (Binder.hasBinding(attrValue)) {
- bindings[attrName] = attrValue;
- }
- }
- var json = toJson(bindings);
- if (json.length > 2) {
- node.setAttribute("ng:bind-attr", json);
- }
- }
-
- if (!node.getAttribute) log(node);
- var repeaterExpression = node.getAttribute('ng:repeat');
- if (repeaterExpression) {
- node.removeAttribute('ng:repeat');
- var precompiled = this.precompile(node);
- var view = document.createComment("ng:repeat: " + repeaterExpression);
- var parentNode = node.parentNode;
- parentNode.insertBefore(view, node);
- parentNode.removeChild(node);
- function template(childScope, prefix, i) {
- var clone = jQuery(node).clone();
- clone.css('display', '');
- clone.attr('ng:repeat-index', "" + i);
- clone.data('scope', childScope);
- precompiled(clone[0], childScope, prefix + i + ":");
- return clone;
- }
- factories.push({path:path, fn:function(node, scope, prefix) {
- return new RepeaterUpdater(jQuery(node), repeaterExpression, template, prefix);
- }});
- return;
- }
-
- if (node.getAttribute('ng:eval')) factories.push({path:path, fn:this.ng_eval});
- if (node.getAttribute('ng:bind')) factories.push({path:path, fn:this.ng_bind});
- if (node.getAttribute('ng:bind-attr')) factories.push({path:path, fn:this.ng_bind_attr});
- if (node.getAttribute('ng:hide')) factories.push({path:path, fn:this.ng_hide});
- if (node.getAttribute('ng:show')) factories.push({path:path, fn:this.ng_show});
- if (node.getAttribute('ng:class')) factories.push({path:path, fn:this.ng_class});
- if (node.getAttribute('ng:class-odd')) factories.push({path:path, fn:this.ng_class_odd});
- if (node.getAttribute('ng:class-even')) factories.push({path:path, fn:this.ng_class_even});
- if (node.getAttribute('ng:style')) factories.push({path:path, fn:this.ng_style});
- if (node.getAttribute('ng:watch')) factories.push({path:path, fn:this.ng_watch});
- var nodeName = node.nodeName;
- if ((nodeName == 'INPUT' ) ||
- nodeName == 'TEXTAREA' ||
- nodeName == 'SELECT' ||
- nodeName == 'BUTTON') {
- var self = this;
- factories.push({path:path, fn:function(node, scope, prefix) {
- node.name = prefix + node.name.split(":").pop();
- return self.widgetFactory.createController(jQuery(node), scope);
- }});
- }
- if (nodeName == 'OPTION') {
- var html = jQuery('<select/>').append(jQuery(node).clone()).html();
- if (!html.match(/<option(\s.*\s|\s)value\s*=\s*.*>.*<\/\s*option\s*>/gi)) {
- if (Binder.hasBinding(node.text)) {
- jQuery(node).attr('ng:bind-attr', angular.toJson({'value':node.text}));
- } else {
- node.value = node.text;
- }
- }
- }
-
- var children = node.childNodes;
- for (var k = 0; k < children.length; k++) {
- this.precompileNode(children[k], path.concat(k), factories);
- }
- },
-
- ng_eval: function(node) {
- return new EvalUpdater(node, node.getAttribute('ng:eval'));
- },
-
- ng_bind: function(node) {
- return new BindUpdater(node, "{{" + node.getAttribute('ng:bind') + "}}");
- },
-
- ng_bind_attr: function(node) {
- return new BindAttrUpdater(node, fromJson(node.getAttribute('ng:bind-attr')));
- },
-
- ng_hide: function(node) {
- return new HideUpdater(node, node.getAttribute('ng:hide'));
- },
-
- ng_show: function(node) {
- return new ShowUpdater(node, node.getAttribute('ng:show'));
- },
-
- ng_class: function(node) {
- return new ClassUpdater(node, node.getAttribute('ng:class'));
- },
-
- ng_class_even: function(node) {
- return new ClassEvenUpdater(node, node.getAttribute('ng:class-even'));
- },
-
- ng_class_odd: function(node) {
- return new ClassOddUpdater(node, node.getAttribute('ng:class-odd'));
- },
-
- ng_style: function(node) {
- return new StyleUpdater(node, node.getAttribute('ng:style'));
- },
-
- ng_watch: function(node, scope) {
- scope.watch(node.getAttribute('ng:watch'));
- }
-};
diff --git a/src/delete/Model.js b/src/delete/Model.js
deleted file mode 100644
index b09efd0e..00000000
--- a/src/delete/Model.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Single $ is special and does not get searched
-// Double $$ is special an is client only (does not get sent to server)
-
-function Model(entity, initial) {
- this['$$entity'] = entity;
- this['$loadFrom'](initial||{});
- this['$entity'] = entity['title'];
- this['$migrate']();
-};
-
-Model.copyDirectFields = function(src, dst) {
- if (src === dst || !src || !dst) return;
- var isDataField = function(src, dst, field) {
- return (field.substring(0,2) !== '$$') &&
- (typeof src[field] !== 'function') &&
- (typeof dst[field] !== 'function');
- };
- for (var field in dst) {
- if (isDataField(src, dst, field))
- delete dst[field];
- }
- for (field in src) {
- if (isDataField(src, dst, field))
- dst[field] = src[field];
- }
-};
-
-extend(Model.prototype, {
- '$migrate': function() {
- merge(this['$$entity']['defaults'], this);
- return this;
- },
-
- '$merge': function(other) {
- merge(other, this);
- return this;
- },
-
- '$save': function(callback) {
- this['$$entity'].datastore.save(this, callback === true ? undefined : callback);
- if (callback === true) this['$$entity'].datastore.flush();
- return this;
- },
-
- '$delete': function(callback) {
- this['$$entity'].datastore.remove(this, callback === true ? undefined : callback);
- if (callback === true) this['$$entity'].datastore.flush();
- return this;
- },
-
- '$loadById': function(id, callback) {
- this['$$entity'].datastore.load(this, id, callback);
- return this;
- },
-
- '$loadFrom': function(other) {
- Model.copyDirectFields(other, this);
- return this;
- },
-
- '$saveTo': function(other) {
- Model.copyDirectFields(this, other);
- return this;
- }
-}); \ No newline at end of file
diff --git a/src/delete/Scope.js b/src/delete/Scope.js
deleted file mode 100644
index ae3f9f11..00000000
--- a/src/delete/Scope.js
+++ /dev/null
@@ -1,407 +0,0 @@
-function Scope(initialState, name) {
- var self = this;
- self.widgets = [];
- self.evals = [];
- self.watchListeners = {};
- self.name = name;
- initialState = initialState || {};
- var State = function(){};
- State.prototype = initialState;
- self.state = new State();
- extend(self.state, {
- '$parent': initialState,
- '$watch': bind(self, self.addWatchListener),
- '$eval': bind(self, self.eval),
- '$bind': bind(self, bind, self),
- // change name to autoEval?
- '$addEval': bind(self, self.addEval),
- '$updateView': bind(self, self.updateView)
- });
- if (name == "ROOT") {
- self.state['$root'] = self.state;
- }
-};
-
-Scope.expressionCache = {};
-Scope.getter = function(instance, path) {
- if (!path) return instance;
- var element = path.split('.');
- var key;
- var lastInstance = instance;
- var len = element.length;
- for ( var i = 0; i < len; i++) {
- key = element[i];
- if (!key.match(/^[\$\w][\$\w\d]*$/))
- throw "Expression '" + path + "' is not a valid expression for accesing variables.";
- if (instance) {
- lastInstance = instance;
- instance = instance[key];
- }
- if (_.isUndefined(instance) && key.charAt(0) == '$') {
- var type = angular['Global']['typeOf'](lastInstance);
- type = angular[type.charAt(0).toUpperCase()+type.substring(1)];
- var fn = type ? type[[key.substring(1)]] : undefined;
- if (fn) {
- instance = _.bind(fn, lastInstance, lastInstance);
- return instance;
- }
- }
- }
- if (typeof instance === 'function' && !instance['$$factory']) {
- return bind(lastInstance, instance);
- }
- return instance;
-};
-
-Scope.setter = function(instance, path, value){
- var element = path.split('.');
- for ( var i = 0; element.length > 1; i++) {
- var key = element.shift();
- var newInstance = instance[key];
- if (!newInstance) {
- newInstance = {};
- instance[key] = newInstance;
- }
- instance = newInstance;
- }
- instance[element.shift()] = value;
- return value;
-};
-
-Scope.prototype = {
- // TODO: rename to update? or eval?
- updateView: function() {
- var self = this;
- this.fireWatchers();
- foreach(this.widgets, function(widget){
- self.evalWidget(widget, "", {}, function(){
- this.updateView(self);
- });
- });
- foreach(this.evals, bind(this, this.apply));
- },
-
- addWidget: function(controller) {
- if (controller) this.widgets.push(controller);
- },
-
- addEval: function(fn, listener) {
- // todo: this should take a function/string and a listener
- // todo: this is a hack, which will need to be cleaned up.
- var self = this,
- listenFn = listener || noop,
- expr = self.compile(fn);
- this.evals.push(function(){
- self.apply(listenFn, expr());
- });
- },
-
- isProperty: function(exp) {
- for ( var i = 0; i < exp.length; i++) {
- var ch = exp.charAt(i);
- if (ch!='.' && !Lexer.prototype.isIdent(ch)) {
- return false;
- }
- }
- return true;
- },
-
- get: function(path) {
-// log('SCOPE.get', path, Scope.getter(this.state, path));
- return Scope.getter(this.state, path);
- },
-
- set: function(path, value) {
-// log('SCOPE.set', path, value);
- var instance = this.state;
- return Scope.setter(instance, path, value);
- },
-
- setEval: function(expressionText, value) {
- this.eval(expressionText + "=" + toJson(value));
- },
-
- compile: function(exp) {
- if (isFunction(exp)) return bind(this.state, exp);
- var expFn = Scope.expressionCache[exp], self = this;
- if (!expFn) {
- var parser = new Parser(exp);
- expFn = parser.statements();
- parser.assertAllConsumed();
- Scope.expressionCache[exp] = expFn;
- }
- return function(context){
- context = context || {};
- context.self = self.state;
- context.scope = self;
- return expFn.call(self, context);
- };
- },
-
- eval: function(exp, context) {
-// log('Scope.eval', expressionText);
- return this.compile(exp)(context);
- },
-
- //TODO: Refactor. This function needs to be an execution closure for widgets
- // move to widgets
- // remove expression, just have inner closure.
- evalWidget: function(widget, expression, context, onSuccess, onFailure) {
- try {
- var value = this.eval(expression, context);
- if (widget.hasError) {
- widget.hasError = false;
- jQuery(widget.view).
- removeClass('ng-exception').
- removeAttr('ng-error');
- }
- if (onSuccess) {
- value = onSuccess.apply(widget, [value]);
- }
- return true;
- } catch (e){
- var jsonError = toJson(e, true);
- error('Eval Widget Error:', jsonError);
- widget.hasError = true;
- jQuery(widget.view).
- addClass('ng-exception').
- attr('ng-error', jsonError);
- if (onFailure) {
- onFailure.apply(widget, [e, jsonError]);
- }
- return false;
- }
- },
-
- validate: function(expressionText, value, element) {
- var expression = Scope.expressionCache[expressionText];
- if (!expression) {
- expression = new Parser(expressionText).validator();
- Scope.expressionCache[expressionText] = expression;
- }
- var self = {scope:this, self:this.state, '$element':element};
- return expression(self)(self, value);
- },
-
- entity: function(entityDeclaration, datastore) {
- var expression = new Parser(entityDeclaration).entityDeclaration();
- return expression({scope:this, datastore:datastore});
- },
-
- clearInvalid: function() {
- var invalid = this.state['$invalidWidgets'];
- while(invalid.length > 0) {invalid.pop();}
- },
-
- markInvalid: function(widget) {
- this.state['$invalidWidgets'].push(widget);
- },
-
- watch: function(declaration) {
- var self = this;
- new Parser(declaration).watch()({
- scope:this,
- addListener:function(watch, exp){
- self.addWatchListener(watch, function(n,o){
- try {
- return exp({scope:self}, n, o);
- } catch(e) {
- alert(e);
- }
- });
- }
- });
- },
-
- addWatchListener: function(watchExpression, listener) {
- // TODO: clean me up!
- if (!isFunction(listener)) {
- listener = this.compile(listener);
- }
- var watcher = this.watchListeners[watchExpression];
- if (!watcher) {
- watcher = {listeners:[], expression:watchExpression};
- this.watchListeners[watchExpression] = watcher;
- }
- watcher.listeners.push(listener);
- },
-
- fireWatchers: function() {
- var self = this, fired = false;
- foreach(this.watchListeners, function(watcher) {
- var value = self.eval(watcher.expression);
- if (value !== watcher.lastValue) {
- foreach(watcher.listeners, function(listener){
- listener(value, watcher.lastValue);
- fired = true;
- });
- watcher.lastValue = value;
- }
- });
- return fired;
- },
-
- apply: function(fn) {
- fn.apply(this.state, slice.call(arguments, 1, arguments.length));
- }
-};
-
-//////////////////////////////
-
-function getter(instance, path) {
- if (!path) return instance;
- var element = path.split('.');
- var key;
- var lastInstance = instance;
- var len = element.length;
- for ( var i = 0; i < len; i++) {
- key = element[i];
- if (!key.match(/^[\$\w][\$\w\d]*$/))
- throw "Expression '" + path + "' is not a valid expression for accesing variables.";
- if (instance) {
- lastInstance = instance;
- instance = instance[key];
- }
- if (_.isUndefined(instance) && key.charAt(0) == '$') {
- var type = angular['Global']['typeOf'](lastInstance);
- type = angular[type.charAt(0).toUpperCase()+type.substring(1)];
- var fn = type ? type[[key.substring(1)]] : undefined;
- if (fn) {
- instance = _.bind(fn, lastInstance, lastInstance);
- return instance;
- }
- }
- }
- if (typeof instance === 'function' && !instance['$$factory']) {
- return bind(lastInstance, instance);
- }
- return instance;
-};
-
-function setter(instance, path, value){
- var element = path.split('.');
- for ( var i = 0; element.length > 1; i++) {
- var key = element.shift();
- var newInstance = instance[key];
- if (!newInstance) {
- newInstance = {};
- instance[key] = newInstance;
- }
- instance = newInstance;
- }
- instance[element.shift()] = value;
- return value;
-};
-
-var compileCache = {};
-function expressionCompile(exp){
- if (isFunction(exp)) return exp;
- var expFn = compileCache[exp];
- if (!expFn) {
- var parser = new Parser(exp);
- expFn = parser.statements();
- parser.assertAllConsumed();
- compileCache[exp] = expFn;
- }
- // return expFn
- // TODO(remove this hack)
- return function(){
- return expFn({
- scope: {
- set: this.$set,
- get: this.$get
- }
- });
- };
-};
-
-var NON_RENDERABLE_ELEMENTS = {
- '#text': 1, '#comment':1, 'TR':1, 'TH':1
-};
-
-function isRenderableElement(element){
- return element && element[0] && !NON_RENDERABLE_ELEMENTS[element[0].nodeName];
-}
-
-function rethrow(e) { throw e; }
-function errorHandlerFor(element) {
- while (!isRenderableElement(element)) {
- element = element.parent() || jqLite(document.body);
- }
- return function(error) {
- element.attr('ng-error', angular.toJson(error));
- element.addClass('ng-exception');
- };
-}
-
-function createScope(parent, Class) {
- function Parent(){}
- function API(){}
- function Behavior(){}
-
- var instance, behavior, api, watchList = [], evalList = [];
-
- Class = Class || noop;
- parent = Parent.prototype = parent || {};
- api = API.prototype = new Parent();
- behavior = Behavior.prototype = extend(new API(), Class.prototype);
- instance = new Behavior();
-
- extend(api, {
- $parent: parent,
- $bind: bind(instance, bind, instance),
- $get: bind(instance, getter, instance),
- $set: bind(instance, setter, instance),
-
- $eval: function(exp) {
- if (isDefined(exp)) {
- return expressionCompile(exp).apply(instance, slice.call(arguments, 1, arguments.length));
- } else {
- foreach(evalList, function(eval) {
- instance.$tryEval(eval.fn, eval.handler);
- });
- foreach(watchList, function(watch) {
- var value = instance.$tryEval(watch.watch, watch.handler);
- if (watch.last !== value) {
- instance.$tryEval(watch.listener, watch.handler, value, watch.last);
- watch.last = value;
- }
- });
- }
- },
-
- $tryEval: function (expression, exceptionHandler) {
- try {
- return expressionCompile(expression).apply(instance, slice.call(arguments, 2, arguments.length));
- } catch (e) {
- error(e);
- if (isFunction(exceptionHandler)) {
- exceptionHandler(e);
- } else if (exceptionHandler) {
- errorHandlerFor(exceptionHandler)(e);
- }
- }
- },
-
- $watch: function(watchExp, listener, exceptionHandler) {
- var watch = expressionCompile(watchExp);
- watchList.push({
- watch: watch,
- last: watch.call(instance),
- handler: exceptionHandler,
- listener:expressionCompile(listener)
- });
- },
-
- $onEval: function(expr, exceptionHandler){
- evalList.push({
- fn: expressionCompile(expr),
- handler: exceptionHandler
- });
- }
- });
-
- Class.apply(instance, slice.call(arguments, 2, arguments.length));
-
- return instance;
-}
diff --git a/src/delete/Widgets.js b/src/delete/Widgets.js
deleted file mode 100644
index 53536ed0..00000000
--- a/src/delete/Widgets.js
+++ /dev/null
@@ -1,806 +0,0 @@
-function WidgetFactory(serverUrl, database) {
- this.nextUploadId = 0;
- this.serverUrl = serverUrl;
- this.database = database;
- if (window['swfobject']) {
- this.createSWF = window['swfobject']['createSWF'];
- } else {
- this.createSWF = function(){
- alert("ERROR: swfobject not loaded!");
- };
- }
-};
-
-WidgetFactory.prototype = {
- createController: function(input, scope) {
- var controller;
- var type = input.attr('type').toLowerCase();
- var exp = input.attr('name');
- if (exp) exp = exp.split(':').pop();
- var event = "change";
- var bubbleEvent = true;
- var formatter = angularFormatter[input.attr('ng:format')] || angularFormatter['noop'];
- if (type == 'button' || type == 'submit' || type == 'reset' || type == 'image') {
- controller = new ButtonController(input[0], exp, formatter);
- event = "click";
- bubbleEvent = false;
- } else if (type == 'text' || type == 'textarea' || type == 'hidden' || type == 'password') {
- controller = new TextController(input[0], exp, formatter);
- event = "keyup change";
- } else if (type == 'checkbox') {
- controller = new CheckboxController(input[0], exp, formatter);
- event = "click";
- } else if (type == 'radio') {
- controller = new RadioController(input[0], exp, formatter);
- event="click";
- } else if (type == 'select-one') {
- controller = new SelectController(input[0], exp, formatter);
- } else if (type == 'select-multiple') {
- controller = new MultiSelectController(input[0], exp, formatter);
- } else if (type == 'file') {
- controller = this.createFileController(input, exp, formatter);
- } else {
- throw 'Unknown type: ' + type;
- }
- input.data('controller', controller);
- var updateView = scope.get('$updateView');
- var action = function() {
- if (controller.updateModel(scope)) {
- var action = jQuery(controller.view).attr('ng-action') || "";
- if (scope.evalWidget(controller, action)) {
- updateView(scope);
- }
- }
- return bubbleEvent;
- };
- jQuery(controller.view, ":input").
- bind(event, action);
- return controller;
- },
-
- createFileController: function(fileInput) {
- var uploadId = '__uploadWidget_' + (this.nextUploadId++);
- var view = FileController.template(uploadId);
- fileInput.after(view);
- var att = {
- 'data':this.serverUrl + "/admin/ServerAPI.swf",
- 'width':"95", 'height':"20", 'align':"top",
- 'wmode':"transparent"};
- var par = {
- 'flashvars':"uploadWidgetId=" + uploadId,
- 'allowScriptAccess':"always"};
- var swfNode = this.createSWF(att, par, uploadId);
- fileInput.remove();
- var cntl = new FileController(view, fileInput[0].name, swfNode, this.serverUrl + "/data/" + this.database);
- jQuery(swfNode).parent().data('controller', cntl);
- return cntl;
- }
-};
-/////////////////////
-// FileController
-///////////////////////
-
-function FileController(view, scopeName, uploader, databaseUrl) {
- this.view = view;
- this.uploader = uploader;
- this.scopeName = scopeName;
- this.attachmentsPath = databaseUrl + '/_attachments';
- this.value = null;
- this.lastValue = undefined;
-};
-
-angularCallbacks['flashEvent'] = function(id, event, args) {
- var object = document.getElementById(id);
- var jobject = jQuery(object);
- var controller = jobject.parent().data("controller");
- FileController.prototype[event].apply(controller, args);
- _.defer(jobject.scope().get('$updateView'));
-};
-
-FileController.template = function(id) {
- return jQuery('<span class="ng-upload-widget">' +
- '<input type="checkbox" ng:non-bindable="true"/>' +
- '<object id="' + id + '" />' +
- '<a></a>' +
- '<span/>' +
- '</span>');
-};
-
-extend(FileController.prototype, {
- 'cancel': noop,
- 'complete': noop,
- 'httpStatus': function(status) {
- alert("httpStatus:" + this.scopeName + " status:" + status);
- },
- 'ioError': function() {
- alert("ioError:" + this.scopeName);
- },
- 'open': function() {
- alert("open:" + this.scopeName);
- },
- 'progress':noop,
- 'securityError': function() {
- alert("securityError:" + this.scopeName);
- },
- 'uploadCompleteData': function(data) {
- var value = fromJson(data);
- value.url = this.attachmentsPath + '/' + value.id + '/' + value.text;
- this.view.find("input").attr('checked', true);
- var scope = this.view.scope();
- this.value = value;
- this.updateModel(scope);
- this.value = null;
- },
- 'select': function(name, size, type) {
- this.name = name;
- this.view.find("a").text(name).attr('href', name);
- this.view.find("span").text(angular['filter']['bytes'](size));
- this.upload();
- },
-
- updateModel: function(scope) {
- var isChecked = this.view.find("input").attr('checked');
- var value = isChecked ? this.value : null;
- if (this.lastValue === value) {
- return false;
- } else {
- scope.set(this.scopeName, value);
- return true;
- }
- },
-
- updateView: function(scope) {
- var modelValue = scope.get(this.scopeName);
- if (modelValue && this.value !== modelValue) {
- this.value = modelValue;
- this.view.find("a").
- attr("href", this.value.url).
- text(this.value.text);
- this.view.find("span").text(angular['filter']['bytes'](this.value.size));
- }
- this.view.find("input").attr('checked', !!modelValue);
- },
-
- upload: function() {
- if (this.name) {
- this.uploader['uploadFile'](this.attachmentsPath);
- }
- }
-});
-
-///////////////////////
-// NullController
-///////////////////////
-function NullController(view) {this.view = view;};
-NullController.prototype = {
- updateModel: function() { return true; },
- updateView: noop
-};
-NullController.instance = new NullController();
-
-
-///////////////////////
-// ButtonController
-///////////////////////
-var ButtonController = NullController;
-
-///////////////////////
-// TextController
-///////////////////////
-function TextController(view, exp, formatter) {
- this.view = view;
- this.formatter = formatter;
- this.exp = exp;
- this.validator = view.getAttribute('ng:validate');
- this.required = typeof view.attributes['ng:required'] != "undefined";
- this.lastErrorText = null;
- this.lastValue = undefined;
- this.initialValue = this.formatter['parse'](view.value);
- var widget = view.getAttribute('ng-widget');
- if (widget === 'datepicker') {
- jQuery(view).datepicker();
- }
-};
-
-TextController.prototype = {
- updateModel: function(scope) {
- var value = this.formatter['parse'](this.view.value);
- if (this.lastValue === value) {
- return false;
- } else {
- scope.setEval(this.exp, value);
- this.lastValue = value;
- return true;
- }
- },
-
- updateView: function(scope) {
- var view = this.view;
- var value = scope.get(this.exp);
- if (typeof value === "undefined") {
- value = this.initialValue;
- scope.setEval(this.exp, value);
- }
- value = value ? value : '';
- if (!_(this.lastValue).isEqual(value)) {
- view.value = this.formatter['format'](value);
- this.lastValue = value;
- }
-
- var isValidationError = false;
- view.removeAttribute('ng-error');
- if (this.required) {
- isValidationError = !(value && $.trim("" + value).length > 0);
- }
- var errorText = isValidationError ? "Required Value" : null;
- if (!isValidationError && this.validator && value) {
- errorText = scope.validate(this.validator, value, view);
- isValidationError = !!errorText;
- }
- if (this.lastErrorText !== errorText) {
- this.lastErrorText = isValidationError;
- if (errorText && isVisible(view)) {
- view.setAttribute('ng-error', errorText);
- scope.markInvalid(this);
- }
- jQuery(view).toggleClass('ng-validation-error', isValidationError);
- }
- }
-};
-
-///////////////////////
-// CheckboxController
-///////////////////////
-function CheckboxController(view, exp, formatter) {
- this.view = view;
- this.exp = exp;
- this.lastValue = undefined;
- this.formatter = formatter;
- this.initialValue = this.formatter['parse'](view.checked ? view.value : "");
-};
-
-CheckboxController.prototype = {
- updateModel: function(scope) {
- var input = this.view;
- var value = input.checked ? input.value : '';
- value = this.formatter['parse'](value);
- value = this.formatter['format'](value);
- if (this.lastValue === value) {
- return false;
- } else {
- scope.setEval(this.exp, this.formatter['parse'](value));
- this.lastValue = value;
- return true;
- }
- },
-
- updateView: function(scope) {
- var input = this.view;
- var value = scope.eval(this.exp);
- if (typeof value === "undefined") {
- value = this.initialValue;
- scope.setEval(this.exp, value);
- }
- input.checked = this.formatter['parse'](input.value) == value;
- }
-};
-
-///////////////////////
-// SelectController
-///////////////////////
-function SelectController(view, exp) {
- this.view = view;
- this.exp = exp;
- this.lastValue = undefined;
- this.initialValue = view.value;
-};
-
-SelectController.prototype = {
- updateModel: function(scope) {
- var input = this.view;
- if (input.selectedIndex < 0) {
- scope.setEval(this.exp, null);
- } else {
- var value = this.view.value;
- if (this.lastValue === value) {
- return false;
- } else {
- scope.setEval(this.exp, value);
- this.lastValue = value;
- return true;
- }
- }
- },
-
- updateView: function(scope) {
- var input = this.view;
- var value = scope.get(this.exp);
- if (typeof value === 'undefined') {
- value = this.initialValue;
- scope.setEval(this.exp, value);
- }
- if (value !== this.lastValue) {
- input.value = value ? value : "";
- this.lastValue = value;
- }
- }
-};
-
-///////////////////////
-// MultiSelectController
-///////////////////////
-function MultiSelectController(view, exp) {
- this.view = view;
- this.exp = exp;
- this.lastValue = undefined;
- this.initialValue = this.selected();
-};
-
-MultiSelectController.prototype = {
- selected: function () {
- var value = [];
- var options = this.view.options;
- for ( var i = 0; i < options.length; i++) {
- var option = options[i];
- if (option.selected) {
- value.push(option.value);
- }
- }
- return value;
- },
-
- updateModel: function(scope) {
- var value = this.selected();
- // TODO: This is wrong! no caching going on here as we are always comparing arrays
- if (this.lastValue === value) {
- return false;
- } else {
- scope.setEval(this.exp, value);
- this.lastValue = value;
- return true;
- }
- },
-
- updateView: function(scope) {
- var input = this.view;
- var selected = scope.get(this.exp);
- if (typeof selected === "undefined") {
- selected = this.initialValue;
- scope.setEval(this.exp, selected);
- }
- if (selected !== this.lastValue) {
- var options = input.options;
- for ( var i = 0; i < options.length; i++) {
- var option = options[i];
- option.selected = _.include(selected, option.value);
- }
- this.lastValue = selected;
- }
- }
-};
-
-///////////////////////
-// RadioController
-///////////////////////
-function RadioController(view, exp) {
- this.view = view;
- this.exp = exp;
- this.lastChecked = undefined;
- this.lastValue = undefined;
- this.inputValue = view.value;
- this.initialValue = view.checked ? view.value : null;
-};
-
-RadioController.prototype = {
- updateModel: function(scope) {
- var input = this.view;
- if (this.lastChecked) {
- return false;
- } else {
- input.checked = true;
- this.lastValue = scope.setEval(this.exp, this.inputValue);
- this.lastChecked = true;
- return true;
- }
- },
-
- updateView: function(scope) {
- var input = this.view;
- var value = scope.get(this.exp);
- if (this.initialValue && typeof value === "undefined") {
- value = this.initialValue;
- scope.setEval(this.exp, value);
- }
- if (this.lastValue != value) {
- this.lastChecked = input.checked = this.inputValue == (''+value);
- this.lastValue = value;
- }
- }
-};
-
-///////////////////////
-//ElementController
-///////////////////////
-function BindUpdater(view, exp) {
- this.view = view;
- this.exp = Binder.parseBindings(exp);
- this.hasError = false;
-};
-
-BindUpdater.toText = function(obj) {
- var e = escapeHtml;
- switch(typeof obj) {
- case "string":
- case "boolean":
- case "number":
- return e(obj);
- case "function":
- return BindUpdater.toText(obj());
- case "object":
- if (isNode(obj)) {
- return outerHTML(obj);
- } else if (obj instanceof angular.filter.Meta) {
- switch(typeof obj.html) {
- case "string":
- case "number":
- return obj.html;
- case "function":
- return obj.html();
- case "object":
- if (isNode(obj.html))
- return outerHTML(obj.html);
- default:
- break;
- }
- switch(typeof obj.text) {
- case "string":
- case "number":
- return e(obj.text);
- case "function":
- return e(obj.text());
- default:
- break;
- }
- }
- if (obj === null)
- return "";
- return e(toJson(obj, true));
- default:
- return "";
- }
-};
-
-BindUpdater.prototype = {
- updateModel: noop,
- updateView: function(scope) {
- var html = [];
- var parts = this.exp;
- var length = parts.length;
- for(var i=0; i<length; i++) {
- var part = parts[i];
- var binding = Binder.binding(part);
- if (binding) {
- scope.evalWidget(this, binding, {$element:this.view}, function(value){
- html.push(BindUpdater.toText(value));
- }, function(e, text){
- setHtml(this.view, text);
- });
- if (this.hasError) {
- return;
- }
- } else {
- html.push(escapeHtml(part));
- }
- }
- setHtml(this.view, html.join(''));
- }
-};
-
-function BindAttrUpdater(view, attrs) {
- this.view = view;
- this.attrs = attrs;
-};
-
-BindAttrUpdater.prototype = {
- updateModel: noop,
- updateView: function(scope) {
- var jNode = jQuery(this.view);
- var attributeTemplates = this.attrs;
- if (this.hasError) {
- this.hasError = false;
- jNode.
- removeClass('ng-exception').
- removeAttr('ng-error');
- }
- var isImage = jNode.is('img');
- for (var attrName in attributeTemplates) {
- var attributeTemplate = Binder.parseBindings(attributeTemplates[attrName]);
- var attrValues = [];
- for ( var i = 0; i < attributeTemplate.length; i++) {
- var binding = Binder.binding(attributeTemplate[i]);
- if (binding) {
- try {
- var value = scope.eval(binding, {$element:jNode[0], attrName:attrName});
- if (value && (value.constructor !== array || value.length !== 0))
- attrValues.push(value);
- } catch (e) {
- this.hasError = true;
- error('BindAttrUpdater', e);
- var jsonError = toJson(e, true);
- attrValues.push('[' + jsonError + ']');
- jNode.
- addClass('ng-exception').
- attr('ng-error', jsonError);
- }
- } else {
- attrValues.push(attributeTemplate[i]);
- }
- }
- var attrValue = attrValues.length ? attrValues.join('') : null;
- if(isImage && attrName == 'src' && !attrValue)
- attrValue = scope.get('$config.blankImage');
- jNode.attr(attrName, attrValue);
- }
- }
-};
-
-function EvalUpdater(view, exp) {
- this.view = view;
- this.exp = exp;
- this.hasError = false;
-};
-EvalUpdater.prototype = {
- updateModel: noop,
- updateView: function(scope) {
- scope.evalWidget(this, this.exp);
- }
-};
-
-function HideUpdater(view, exp) { this.view = view; this.exp = exp; };
-HideUpdater.prototype = {
- updateModel: noop,
- updateView: function(scope) {
- scope.evalWidget(this, this.exp, {}, function(hideValue){
- var view = jQuery(this.view);
- if (toBoolean(hideValue)) {
- view.hide();
- } else {
- view.show();
- }
- });
- }
-};
-
-function ShowUpdater(view, exp) { this.view = view; this.exp = exp; };
-ShowUpdater.prototype = {
- updateModel: noop,
- updateView: function(scope) {
- scope.evalWidget(this, this.exp, {}, function(hideValue){
- var view = jQuery(this.view);
- if (toBoolean(hideValue)) {
- view.show();
- } else {
- view.hide();
- }
- });
- }
-};
-
-function ClassUpdater(view, exp) { this.view = view; this.exp = exp; };
-ClassUpdater.prototype = {
- updateModel: noop,
- updateView: function(scope) {
- scope.evalWidget(this, this.exp, {}, function(classValue){
- if (classValue !== null && classValue !== undefined) {
- this.view.className = classValue;
- }
- });
- }
-};
-
-function ClassEvenUpdater(view, exp) { this.view = view; this.exp = exp; };
-ClassEvenUpdater.prototype = {
- updateModel: noop,
- updateView: function(scope) {
- scope.evalWidget(this, this.exp, {}, function(classValue){
- var index = scope.get('$index');
- jQuery(this.view).toggleClass(classValue, index % 2 === 1);
- });
- }
-};
-
-function ClassOddUpdater(view, exp) { this.view = view; this.exp = exp; };
-ClassOddUpdater.prototype = {
- updateModel: noop,
- updateView: function(scope) {
- scope.evalWidget(this, this.exp, {}, function(classValue){
- var index = scope.get('$index');
- jQuery(this.view).toggleClass(classValue, index % 2 === 0);
- });
- }
-};
-
-function StyleUpdater(view, exp) { this.view = view; this.exp = exp; };
-StyleUpdater.prototype = {
- updateModel: noop,
- updateView: function(scope) {
- scope.evalWidget(this, this.exp, {}, function(styleValue){
- jQuery(this.view).attr('style', "").css(styleValue);
- });
- }
-};
-
-///////////////////////
-// RepeaterUpdater
-///////////////////////
-function RepeaterUpdater(view, repeaterExpression, template, prefix) {
- this.view = view;
- this.template = template;
- this.prefix = prefix;
- this.children = [];
- var match = repeaterExpression.match(/^\s*(.+)\s+in\s+(.*)\s*$/);
- if (! match) {
- throw "Expected ng:repeat in form of 'item in collection' but got '" +
- repeaterExpression + "'.";
- }
- var keyValue = match[1];
- this.iteratorExp = match[2];
- match = keyValue.match(/^([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\)$/);
- if (!match) {
- throw "'item' in 'item in collection' should be identifier or (key, value) but get '" +
- keyValue + "'.";
- }
- this.valueExp = match[3] || match[1];
- this.keyExp = match[2];
-};
-
-RepeaterUpdater.prototype = {
- updateModel: noop,
- updateView: function(scope) {
- scope.evalWidget(this, this.iteratorExp, {}, function(iterator){
- var self = this;
- if (!iterator) {
- iterator = [];
- if (scope.isProperty(this.iteratorExp)) {
- scope.set(this.iteratorExp, iterator);
- }
- }
- var childrenLength = this.children.length;
- var cursor = this.view;
- var time = 0;
- var child = null;
- var keyExp = this.keyExp;
- var valueExp = this.valueExp;
- var iteratorCounter = 0;
- foreach(iterator, function(value, key){
- if (iteratorCounter < childrenLength) {
- // reuse children
- child = self.children[iteratorCounter];
- child.scope.set(valueExp, value);
- } else {
- // grow children
- var name = self.prefix +
- valueExp + " in " + self.iteratorExp + "[" + iteratorCounter + "]";
- var childScope = new Scope(scope.state, name);
- childScope.set('$index', iteratorCounter);
- if (keyExp)
- childScope.set(keyExp, key);
- childScope.set(valueExp, value);
- child = { scope:childScope, element:self.template(childScope, self.prefix, iteratorCounter) };
- cursor.after(child.element);
- self.children.push(child);
- }
- cursor = child.element;
- var s = new Date().getTime();
- child.scope.updateView();
- time += new Date().getTime() - s;
- iteratorCounter++;
- });
- // shrink children
- for ( var r = childrenLength; r > iteratorCounter; --r) {
- this.children.pop().element.remove();
- }
- // Special case for option in select
- if (child && child.element[0].nodeName === "OPTION") {
- var select = jQuery(child.element[0].parentNode);
- var cntl = select.data('controller');
- if (cntl) {
- cntl.lastValue = undefined;
- cntl.updateView(scope);
- }
- }
- });
- }
-};
-
-//////////////////////////////////
-// PopUp
-//////////////////////////////////
-
-function PopUp(doc) {
- this.doc = doc;
-};
-
-PopUp.OUT_EVENT = "mouseleave mouseout click dblclick keypress keyup";
-
-PopUp.onOver = function(e) {
- PopUp.onOut();
- var jNode = jQuery(this);
- jNode.bind(PopUp.OUT_EVENT, PopUp.onOut);
- var position = jNode.position();
- var de = document.documentElement;
- var w = self.innerWidth || (de && de.clientWidth) || document.body.clientWidth;
- var hasArea = w - position.left;
- var width = 300;
- var title = jNode.hasClass("ng-exception") ? "EXCEPTION:" : "Validation error...";
- var msg = jNode.attr("ng-error");
-
- var x;
- var arrowPos = hasArea>(width+75) ? "left" : "right";
- var tip = jQuery(
- "<div id='ng-callout' style='width:"+width+"px'>" +
- "<div class='ng-arrow-"+arrowPos+"'/>" +
- "<div class='ng-title'>"+title+"</div>" +
- "<div class='ng-content'>"+msg+"</div>" +
- "</div>");
- jQuery("body").append(tip);
- if(arrowPos === 'left'){
- x = position.left + this.offsetWidth + 11;
- }else{
- x = position.left - (width + 15);
- tip.find('.ng-arrow-right').css({left:width+1});
- }
-
- tip.css({left: x+"px", top: (position.top - 3)+"px"});
- return true;
-};
-
-PopUp.onOut = function() {
- jQuery('#ng-callout').
- unbind(PopUp.OUT_EVENT, PopUp.onOut).
- remove();
- return true;
-};
-
-PopUp.prototype = {
- bind: function () {
- var self = this;
- this.doc.find('.ng-validation-error,.ng-exception').
- live("mouseover", PopUp.onOver);
- }
-};
-
-//////////////////////////////////
-// Status
-//////////////////////////////////
-
-function NullStatus(body) {
-};
-
-NullStatus.prototype = {
- beginRequest:function(){},
- endRequest:function(){}
-};
-
-function Status(body) {
- this.requestCount = 0;
- this.body = body;
-};
-
-Status.DOM ='<div id="ng-spacer"></div><div id="ng-loading">loading....</div>';
-
-Status.prototype = {
- beginRequest: function () {
- if (this.requestCount === 0) {
- (this.loader = this.loader || this.body.append(Status.DOM).find("#ng-loading")).show();
- }
- this.requestCount++;
- },
-
- endRequest: function () {
- this.requestCount--;
- if (this.requestCount === 0) {
- this.loader.hide("fold");
- }
- }
-};
diff --git a/src/directives.js b/src/directives.js
index 6b81d864..9aadbd11 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -26,12 +26,13 @@ angularDirective("ng:bind", function(expression){
return function(element) {
var lastValue = noop, lastError = noop;
this.$onEval(function() {
- var error,
- value = this.$tryEval(expression, function(e){
- error = toJson(e);
- }),
- isHtml,
- isDomElement;
+ var error, value, isHtml, isDomElement,
+ oldElement = this.hasOwnProperty('$element') ? this.$element : undefined;
+ this.$element = element;
+ value = this.$tryEval(expression, function(e){
+ error = toJson(e);
+ });
+ this.$element = oldElement;
if (lastValue === value && lastError == error) return;
isHtml = value instanceof HTML,
isDomElement = isElement(value);
@@ -74,7 +75,9 @@ function compileBindTemplate(template){
});
});
bindTemplateCache[template] = fn = function(element){
- var parts = [], self = this;
+ var parts = [], self = this,
+ oldElement = this.hasOwnProperty('$element') ? self.$element : undefined;
+ self.$element = element;
for ( var i = 0; i < bindings.length; i++) {
var value = bindings[i].call(self, element);
if (isElement(value))
@@ -83,6 +86,7 @@ function compileBindTemplate(template){
value = toJson(value, true);
parts.push(value);
};
+ self.$element = oldElement;
return parts.join('');
};
}
@@ -157,33 +161,32 @@ angularWidget("@ng:repeat", function(expression, element){
valueIdent = match[3] || match[1];
keyIdent = match[2];
- if (isUndefined(this.$eval(rhs))) this.$set(rhs, []);
-
var children = [], currentScope = this;
this.$onEval(function(){
var index = 0, childCount = children.length, childScope, lastElement = reference,
collection = this.$tryEval(rhs, reference), is_array = isArray(collection);
for ( var key in collection) {
- if (is_array && !collection.hasOwnProperty(key)) break;
- if (index < childCount) {
- // reuse existing child
- childScope = children[index];
- childScope[valueIdent] = collection[key];
- if (keyIdent) childScope[keyIdent] = key;
- } else {
- // grow children
- childScope = template(element.clone(), createScope(currentScope));
- childScope[valueIdent] = collection[key];
- if (keyIdent) childScope[keyIdent] = key;
- lastElement.after(childScope.$element);
- childScope.$index = index;
- childScope.$element.attr('ng:repeat-index', index);
- childScope.$init();
- children.push(childScope);
+ if (!is_array || collection.hasOwnProperty(key)) {
+ if (index < childCount) {
+ // reuse existing child
+ childScope = children[index];
+ childScope[valueIdent] = collection[key];
+ if (keyIdent) childScope[keyIdent] = key;
+ } else {
+ // grow children
+ childScope = template(element.clone(), createScope(currentScope));
+ childScope[valueIdent] = collection[key];
+ if (keyIdent) childScope[keyIdent] = key;
+ lastElement.after(childScope.$element);
+ childScope.$index = index;
+ childScope.$element.attr('ng:repeat-index', index);
+ childScope.$init();
+ children.push(childScope);
+ }
+ childScope.$eval();
+ lastElement = childScope.$element;
+ index ++;
}
- childScope.$eval();
- lastElement = childScope.$element;
- index ++;
};
// shrink children
while(children.length > index) {
@@ -196,10 +199,10 @@ angularWidget("@ng:repeat", function(expression, element){
angularDirective("ng:click", function(expression, element){
return function(element){
var self = this;
- element.bind('click', function(){
+ element.bind('click', function(event){
self.$tryEval(expression, element);
self.$root.$eval();
- return false;
+ event.preventDefault();
});
};
});
@@ -222,8 +225,8 @@ function ngClass(selector) {
var existing = element[0].className + ' ';
return function(element){
this.$onEval(function(){
- var value = this.$eval(expression);
if (selector(this.$index)) {
+ var value = this.$eval(expression);
if (isArray(value)) value = value.join(' ');
element[0].className = trim(existing + value);
}
@@ -254,8 +257,17 @@ angularDirective("ng:hide", function(expression, element){
angularDirective("ng:style", function(expression, element){
return function(element){
+ var resetStyle = getStyle(element);
this.$onEval(function(){
- element.css(this.$eval(expression) || {});
+ var style = this.$eval(expression) || {}, key, mergedStyle = {};
+ for(key in style) {
+ if (resetStyle[key] === undefined) resetStyle[key] = '';
+ mergedStyle[key] = style[key];
+ }
+ for(key in resetStyle) {
+ mergedStyle[key] = mergedStyle[key] || resetStyle[key];
+ }
+ element.css(mergedStyle);
}, element);
};
});
diff --git a/src/filters.js b/src/filters.js
index 24464477..27e3deca 100644
--- a/src/filters.js
+++ b/src/filters.js
@@ -1,298 +1,74 @@
-var angularFilterGoogleChartApi;
-
-foreach({
- 'currency': function(amount){
- this.$element.toggleClass('ng:format-negative', amount < 0);
- return '$' + angularFilter['number'].apply(this, [amount, 2]);
- },
-
- 'number': function(amount, fractionSize){
- if (isNaN(amount) || !isFinite(amount)) {
- return '';
- }
- fractionSize = typeof fractionSize == 'undefined' ? 2 : fractionSize;
- var isNegative = amount < 0;
- amount = Math.abs(amount);
- var pow = Math.pow(10, fractionSize);
- var text = "" + Math.round(amount * pow);
- var whole = text.substring(0, text.length - fractionSize);
- whole = whole || '0';
- var frc = text.substring(text.length - fractionSize);
- text = isNegative ? '-' : '';
- for (var i = 0; i < whole.length; i++) {
- if ((whole.length - i)%3 === 0 && i !== 0) {
- text += ',';
- }
- text += whole.charAt(i);
- }
- if (fractionSize > 0) {
- for (var j = frc.length; j < fractionSize; j++) {
- frc += '0';
- }
- text += '.' + frc.substring(0, fractionSize);
- }
- return text;
- },
-
- 'date': function(amount) {
- },
-
- 'json': function(object) {
- this.$element.addClass("ng-monospace");
- return toJson(object, true);
- },
-
- 'trackPackage': (function(){
- var MATCHERS = [
- { name: "UPS",
- url: "http://wwwapps.ups.com/WebTracking/processInputRequest?sort_by=status&tracknums_displayed=1&TypeOfInquiryNumber=T&loc=en_US&track.x=0&track.y=0&InquiryNumber1=",
- regexp: [
- /^1Z[0-9A-Z]{16}$/i]},
- { name: "FedEx",
- url: "http://www.fedex.com/Tracking?tracknumbers=",
- regexp: [
- /^96\d{10}?$/i,
- /^96\d{17}?$/i,
- /^96\d{20}?$/i,
- /^\d{15}$/i,
- /^\d{12}$/i]},
- { name: "USPS",
- url: "http://trkcnfrm1.smi.usps.com/PTSInternetWeb/InterLabelInquiry.do?origTrackNum=",
- regexp: [
- /^(91\d{20})$/i,
- /^(91\d{18})$/i]}];
- return function(trackingNo, noMatch) {
- trackingNo = trim(trackingNo);
- var tNo = trackingNo.replace(/ /g, '');
- var returnValue;
- foreach(MATCHERS, function(carrier){
- foreach(carrier.regexp, function(regexp){
- if (!returnValue && regexp.test(tNo)) {
- var text = carrier.name + ": " + trackingNo;
- var url = carrier.url + trackingNo;
- returnValue = jqLite('<a></a>');
- returnValue.text(text);
- returnValue.attr('href', url);
- }
- });
- });
- if (returnValue)
- return returnValue;
- else if (trackingNo)
- return noMatch || trackingNo + " is not recognized";
- else
- return null;
- };})(),
-
- 'link': function(obj, title) {
- if (obj) {
- var text = title || obj.text || obj;
- var url = obj.url || obj;
- if (url) {
- if (angular.validator.email(url) === null) {
- url = "mailto:" + url;
- }
- var a = jqLite('<a></a>');
- a.attr('href', url);
- a.text(text);
- return a;
- }
- }
- return obj;
- },
-
-
- 'bytes': (function(){
- var SUFFIX = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB'];
- return function(size) {
- if(size === null) return "";
-
- var suffix = 0;
- while (size > 1000) {
- size = size / 1024;
- suffix++;
- }
- var txt = "" + size;
- var dot = txt.indexOf('.');
- if (dot > -1 && dot + 2 < txt.length) {
- txt = txt.substring(0, dot + 2);
- }
- return txt + " " + SUFFIX[suffix];
- };
- })(),
-
- 'image': function(obj, width, height) {
- if (obj && obj.url) {
- var style = "", img = jqLite('<img>');
- if (width) {
- img.css('max-width', width + 'px');
- img.css('max-height', (height || width) + 'px');
- }
- img.attr('src', obj.url);
- return img;
+angularFilter.currency = function(amount){
+ this.$element.toggleClass('ng:format-negative', amount < 0);
+ return '$' + angularFilter['number'].apply(this, [amount, 2]);
+};
+
+angularFilter.number = function(amount, fractionSize){
+ if (isNaN(amount) || !isFinite(amount)) {
+ return '';
+ }
+ fractionSize = typeof fractionSize == 'undefined' ? 2 : fractionSize;
+ var isNegative = amount < 0;
+ amount = Math.abs(amount);
+ var pow = Math.pow(10, fractionSize);
+ var text = "" + Math.round(amount * pow);
+ var whole = text.substring(0, text.length - fractionSize);
+ whole = whole || '0';
+ var frc = text.substring(text.length - fractionSize);
+ text = isNegative ? '-' : '';
+ for (var i = 0; i < whole.length; i++) {
+ if ((whole.length - i)%3 === 0 && i !== 0) {
+ text += ',';
}
- return null;
- },
-
- 'lowercase': lowercase,
-
- 'uppercase': uppercase,
-
- 'linecount': function (obj) {
- if (isString(obj)) {
- if (obj==='') return 1;
- return obj.split(/\n|\f/).length;
+ text += whole.charAt(i);
+ }
+ if (fractionSize > 0) {
+ for (var j = frc.length; j < fractionSize; j++) {
+ frc += '0';
}
- return 1;
- },
-
- 'if': function (result, expression) {
- return expression ? result : undefined;
- },
-
- 'unless': function (result, expression) {
- return expression ? undefined : result;
- },
-
- 'googleChartApi': extend(
- function(type, data, width, height) {
- data = data || {};
- var chart = {
- 'cht':type,
- 'chco':angularFilterGoogleChartApi['collect'](data, 'color'),
- 'chtt':angularFilterGoogleChartApi['title'](data),
- 'chdl':angularFilterGoogleChartApi['collect'](data, 'label'),
- 'chd':angularFilterGoogleChartApi['values'](data),
- 'chf':'bg,s,FFFFFF00'
- };
- if (_.isArray(data['xLabels'])) {
- chart['chxt']='x';
- chart['chxl']='0:|' + data.xLabels.join('|');
- }
- return angularFilterGoogleChartApi['encode'](chart, width, height);
- },
- {
- 'values': function(data){
- var seriesValues = [];
- foreach(data['series']||[], function(serie){
- var values = [];
- foreach(serie['values']||[], function(value){
- values.push(value);
- });
- seriesValues.push(values.join(','));
- });
- var values = seriesValues.join('|');
- return values === "" ? null : "t:" + values;
- },
-
- 'title': function(data){
- var titles = [];
- var title = data['title'] || [];
- foreach(_.isArray(title)?title:[title], function(text){
- titles.push(encodeURIComponent(text));
- });
- return titles.join('|');
- },
+ text += '.' + frc.substring(0, fractionSize);
+ }
+ return text;
+};
- 'collect': function(data, key){
- var outterValues = [];
- var count = 0;
- foreach(data['series']||[], function(serie){
- var innerValues = [];
- var value = serie[key] || [];
- foreach(_.isArray(value)?value:[value], function(color){
- innerValues.push(encodeURIComponent(color));
- count++;
- });
- outterValues.push(innerValues.join('|'));
- });
- return count?outterValues.join(','):null;
- },
+angularFilter.date = function(date) {
+ if (date instanceof Date)
+ return date.toLocaleDateString();
+ else
+ return date;
+};
- 'encode': function(params, width, height) {
- width = width || 200;
- height = height || width;
- var url = "http://chart.apis.google.com/chart?",
- urlParam = [],
- img = jqLite('<img>');
- params['chs'] = width + "x" + height;
- foreach(params, function(value, key){
- if (value) {
- urlParam.push(key + "=" + value);
- }
- });
- urlParam.sort();
- url += urlParam.join("&");
- img.attr('src', url);
- img.css({width: width + 'px', height: height + 'px'});
- return img;
- }
- }
- ),
+angularFilter.json = function(object) {
+ this.$element.addClass("ng-monospace");
+ return toJson(object, true);
+};
+angularFilter.lowercase = lowercase;
- 'qrcode': function(value, width, height) {
- return angularFilterGoogleChartApi['encode']({
- 'cht':'qr', 'chl':encodeURIComponent(value)}, width, height);
- },
- 'chart': {
- 'pie':function(data, width, height) {
- return angularFilterGoogleChartApi('p', data, width, height);
- },
- 'pie3d':function(data, width, height) {
- return angularFilterGoogleChartApi('p3', data, width, height);
- },
- 'pieConcentric':function(data, width, height) {
- return angularFilterGoogleChartApi('pc', data, width, height);
- },
- 'barHorizontalStacked':function(data, width, height) {
- return angularFilterGoogleChartApi('bhs', data, width, height);
- },
- 'barHorizontalGrouped':function(data, width, height) {
- return angularFilterGoogleChartApi('bhg', data, width, height);
- },
- 'barVerticalStacked':function(data, width, height) {
- return angularFilterGoogleChartApi('bvs', data, width, height);
- },
- 'barVerticalGrouped':function(data, width, height) {
- return angularFilterGoogleChartApi('bvg', data, width, height);
- },
- 'line':function(data, width, height) {
- return angularFilterGoogleChartApi('lc', data, width, height);
- },
- 'sparkline':function(data, width, height) {
- return angularFilterGoogleChartApi('ls', data, width, height);
- },
- 'scatter':function(data, width, height) {
- return angularFilterGoogleChartApi('s', data, width, height);
- }
- },
+angularFilter.uppercase = uppercase;
- 'html': function(html){
- return new HTML(html);
- },
+angularFilter.html = function(html){
+ return new HTML(html);
+};
- 'linky': function(text){
- if (!text) return text;
- function regExpEscape(text) {
- return text.replace(/([\/\.\*\+\?\|\(\)\[\]\{\}\\])/g, '\\$1');
- }
- var URL = /(ftp|http|https|mailto):\/\/([^\(\)|\s]+)/;
- var match;
- var raw = text;
- var html = [];
- while (match=raw.match(URL)) {
- var url = match[0].replace(/[\.\;\,\(\)\{\}\<\>]$/,'');
- var i = raw.indexOf(url);
- html.push(escapeHtml(raw.substr(0, i)));
- html.push('<a href="' + url + '">');
- html.push(url);
- html.push('</a>');
- raw = raw.substring(i + url.length);
- }
- html.push(escapeHtml(raw));
- return new HTML(html.join(''));
+angularFilter.linky = function(text){
+ if (!text) return text;
+ function regExpEscape(text) {
+ return text.replace(/([\/\.\*\+\?\|\(\)\[\]\{\}\\])/g, '\\$1');
}
-}, function(v,k){angularFilter[k] = v;});
-
-angularFilterGoogleChartApi = angularFilter['googleChartApi'];
+ var URL = /(ftp|http|https|mailto):\/\/([^\(\)|\s]+)/;
+ var match;
+ var raw = text;
+ var html = [];
+ while (match=raw.match(URL)) {
+ var url = match[0].replace(/[\.\;\,\(\)\{\}\<\>]$/,'');
+ var i = raw.indexOf(url);
+ html.push(escapeHtml(raw.substr(0, i)));
+ html.push('<a href="' + url + '">');
+ html.push(url);
+ html.push('</a>');
+ raw = raw.substring(i + url.length);
+ }
+ html.push(escapeHtml(raw));
+ return new HTML(html.join(''));
+};
diff --git a/src/formatters.js b/src/formatters.js
index 40462cf3..9122489f 100644
--- a/src/formatters.js
+++ b/src/formatters.js
@@ -3,30 +3,28 @@ function toString(obj) {return (isDefined(obj) && obj !== null) ? "" + obj : obj
var NUMBER = /^\s*[-+]?\d*(\.\d*)?\s*$/;
-extend(angularFormatter, {
- 'noop':formatter(identity, identity),
- 'boolean':formatter(toString, toBoolean),
- 'number':formatter(toString,
- function(obj){
- if (isString(obj) && NUMBER.exec(obj)) {
- return obj ? 1*obj : null;
- }
- throw "Not a number";
- }),
+angularFormatter.noop = formatter(identity, identity);
+angularFormatter.json = formatter(toJson, fromJson);
+angularFormatter['boolean'] = formatter(toString, toBoolean);
+angularFormatter.number = formatter(toString, function(obj){
+ if (isString(obj) && NUMBER.exec(obj)) {
+ return obj ? 1*obj : null;
+ }
+ throw "Not a number";
+});
- 'list':formatter(
- function(obj) { return obj ? obj.join(", ") : obj; },
- function(value) {
- var list = [];
- foreach((value || '').split(','), function(item){
- item = trim(item);
- if (item) list.push(item);
- });
- return list;
- }
- ),
+angularFormatter.list = formatter(
+ function(obj) { return obj ? obj.join(", ") : obj; },
+ function(value) {
+ var list = [];
+ foreach((value || '').split(','), function(item){
+ item = trim(item);
+ if (item) list.push(item);
+ });
+ return list;
+ }
+);
- 'trim':formatter(
- function(obj) { return obj ? trim("" + obj) : ""; }
- )
-});
+angularFormatter.trim = formatter(
+ function(obj) { return obj ? trim("" + obj) : ""; }
+);
diff --git a/src/jqLite.js b/src/jqLite.js
index 68172fd8..1ad4d96d 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -2,24 +2,17 @@
//JQLite
//////////////////////////////////
-var jqCache = {};
-var jqName = 'ng-' + new Date().getTime();
-var jqId = 1;
-function jqNextId() { return (jqId++); }
-
-var addEventListener = window.document.attachEvent ?
- function(element, type, fn) {
- element.attachEvent('on' + type, fn);
- } : function(element, type, fn) {
- element.addEventListener(type, fn, false);
- };
+var jqCache = {},
+ jqName = 'ng-' + new Date().getTime(),
+ jqId = 1,
+ addEventListener = (window.document.attachEvent ?
+ function(element, type, fn) {element.attachEvent('on' + type, fn);} :
+ function(element, type, fn) {element.addEventListener(type, fn, false);}),
+ removeEventListener = (window.document.detachEvent ?
+ function(element, type, fn) {element.detachEvent('on' + type, fn); } :
+ function(element, type, fn) { element.removeEventListener(type, fn, false); });
-var removeEventListener = window.document.detachEvent ?
- function(element, type, fn) {
- element.detachEvent('on' + type, fn);
- } : function(element, type, fn) {
- element.removeEventListener(type, fn, false);
- };
+function jqNextId() { return (jqId++); }
function jqClearData(element) {
var cacheId = element[jqName],
@@ -36,6 +29,23 @@ function jqClearData(element) {
}
}
+function getStyle(element) {
+ var current = {}, style = element[0].style, value, name, i;
+ if (typeof style.length == 'number') {
+ for(i = 0; i < style.length; i++) {
+ name = style[i];
+ current[name] = style[name];
+ }
+ } else {
+ for (name in style) {
+ value = style[name];
+ if (1*name != name && name != 'cssText' && value && typeof value == 'string' && value !='false')
+ current[name] = value;
+ }
+ }
+ return current;
+}
+
function JQLite(element) {
if (isElement(element)) {
this[0] = element;
@@ -87,19 +97,14 @@ JQLite.prototype = {
eventHandler = bind[type];
if (!eventHandler) {
bind[type] = eventHandler = function(event) {
- var bubbleEvent = false;
- foreach(eventHandler.fns, function(fn){
- bubbleEvent = bubbleEvent || fn.call(self, event);
- });
- if (!bubbleEvent) {
- if (msie) {
+ if (!event.preventDefault) {
+ event.preventDefault = function(){
event.returnValue = false;
- event.cancelBubble = true;
- } else {
- event.preventDefault();
- event.stopPropagation();
- }
+ };
}
+ foreach(eventHandler.fns, function(fn){
+ fn.call(self, event);
+ });
};
eventHandler.fns = [];
addEventListener(element, type, eventHandler);
diff --git a/src/moveToAngularCom/ControlBar.js b/src/moveToAngularCom/ControlBar.js
deleted file mode 100644
index b9a2de8a..00000000
--- a/src/moveToAngularCom/ControlBar.js
+++ /dev/null
@@ -1,72 +0,0 @@
-function ControlBar(document, serverUrl, database) {
- this._document = document;
- this.serverUrl = serverUrl;
- this.database = database;
- this._window = window;
- this.callbacks = [];
-};
-
-ControlBar.HTML =
- '<div>' +
- '<div class="ui-widget-overlay"></div>' +
- '<div id="ng-login" ng:non-bindable="true">' +
- '<div class="ng-login-container"></div>' +
- '</div>' +
- '</div>';
-
-
-ControlBar.FORBIDEN =
- '<div ng:non-bindable="true" title="Permission Error:">' +
- 'Sorry, you do not have permission for this!'+
- '</div>';
-
-ControlBar.prototype = {
- bind: function () {
- },
-
- login: function (loginSubmitFn) {
- this.callbacks.push(loginSubmitFn);
- if (this.callbacks.length == 1) {
- this.doTemplate("/user_session/new.mini?database="+encodeURIComponent(this.database)+"&return_url=" + encodeURIComponent(this.urlWithoutAnchor()));
- }
- },
-
- logout: function (loginSubmitFn) {
- this.callbacks.push(loginSubmitFn);
- if (this.callbacks.length == 1) {
- this.doTemplate("/user_session/do_destroy.mini");
- }
- },
-
- urlWithoutAnchor: function (path) {
- return this._window['location']['href'].split("#")[0];
- },
-
- doTemplate: function (path) {
- var self = this;
- var id = new Date().getTime();
- var url = this.urlWithoutAnchor() + "#$iframe_notify=" + id;
- var iframeHeight = 330;
- var loginView = jQuery('<div style="overflow:hidden; padding:2px 0 0 0;"><iframe name="'+ url +'" src="'+this.serverUrl + path + '" width="500" height="'+ iframeHeight +'"/></div>');
- this._document.append(loginView);
- loginView['dialog']({
- 'height':iframeHeight + 33, 'width':500,
- 'resizable': false, 'modal':true,
- 'title': 'Authentication: <a href="http://www.getangular.com"><tt>&lt;angular/&gt;</tt></a>'
- });
- angularCallbacks["_iframe_notify_" + id] = function() {
- loginView['dialog']("destroy");
- loginView['remove']();
- foreach(self.callbacks, function(callback){
- callback();
- });
- self.callbacks = [];
- };
- },
-
- notAuthorized: function () {
- if (this.forbidenView) return;
- this.forbidenView = jQuery(ControlBar.FORBIDEN);
- this.forbidenView.dialog({bgiframe:true, height:70, modal:true});
- }
-}; \ No newline at end of file
diff --git a/src/moveToAngularCom/DataStore.js b/src/moveToAngularCom/DataStore.js
deleted file mode 100644
index 70bcc623..00000000
--- a/src/moveToAngularCom/DataStore.js
+++ /dev/null
@@ -1,330 +0,0 @@
-function DataStore(post, users, anchor) {
- this.post = post;
- this.users = users;
- this._cache_collections = [];
- this._cache = {'$collections':this._cache_collections};
- this.anchor = anchor;
- this.bulkRequest = [];
-};
-
-DataStore.NullEntity = extend(function(){}, {
- 'all': function(){return [];},
- 'query': function(){return [];},
- 'load': function(){return {};},
- 'title': undefined
-});
-
-DataStore.prototype = {
- cache: function(document) {
- if (! document.datastore === this) {
- throw "Parameter must be an instance of Entity! " + toJson(document);
- }
- var key = document['$entity'] + '/' + document['$id'];
- var cachedDocument = this._cache[key];
- if (cachedDocument) {
- Model.copyDirectFields(document, cachedDocument);
- } else {
- this._cache[key] = document;
- cachedDocument = document;
- }
- return cachedDocument;
- },
-
- load: function(instance, id, callback, failure) {
- if (id && id !== '*') {
- var self = this;
- this._jsonRequest(["GET", instance['$entity'] + "/" + id], function(response) {
- instance['$loadFrom'](response);
- instance['$migrate']();
- var clone = instance['$$entity'](instance);
- self.cache(clone);
- (callback||noop)(instance);
- }, failure);
- }
- return instance;
- },
-
- loadMany: function(entity, ids, callback) {
- var self=this;
- var list = [];
- var callbackCount = 0;
- foreach(ids, function(id){
- list.push(self.load(entity(), id, function(){
- callbackCount++;
- if (callbackCount == ids.length) {
- (callback||noop)(list);
- }
- }));
- });
- return list;
- },
-
- loadOrCreate: function(instance, id, callback) {
- var self=this;
- return this.load(instance, id, callback, function(response){
- if (response['$status_code'] == 404) {
- instance['$id'] = id;
- (callback||noop)(instance);
- } else {
- throw response;
- }
- });
- },
-
- loadAll: function(entity, callback) {
- var self = this;
- var list = [];
- list['$$accept'] = function(doc){
- return doc['$entity'] == entity['title'];
- };
- this._cache_collections.push(list);
- this._jsonRequest(["GET", entity['title']], function(response) {
- var rows = response;
- for ( var i = 0; i < rows.length; i++) {
- var document = entity();
- document['$loadFrom'](rows[i]);
- list.push(self.cache(document));
- }
- (callback||noop)(list);
- });
- return list;
- },
-
- save: function(document, callback) {
- var self = this;
- var data = {};
- document['$saveTo'](data);
- this._jsonRequest(["POST", "", data], function(response) {
- document['$loadFrom'](response);
- var cachedDoc = self.cache(document);
- _.each(self._cache_collections, function(collection){
- if (collection['$$accept'](document)) {
- angularArray['includeIf'](collection, cachedDoc, true);
- }
- });
- if (document['$$anchor']) {
- self.anchor[document['$$anchor']] = document['$id'];
- }
- if (callback)
- callback(document);
- });
- },
-
- remove: function(document, callback) {
- var self = this;
- var data = {};
- document['$saveTo'](data);
- this._jsonRequest(["DELETE", "", data], function(response) {
- delete self._cache[document['$entity'] + '/' + document['$id']];
- _.each(self._cache_collections, function(collection){
- for ( var i = 0; i < collection.length; i++) {
- var item = collection[i];
- if (item['$id'] == document['$id']) {
- collection.splice(i, 1);
- }
- }
- });
- (callback||noop)(response);
- });
- },
-
- _jsonRequest: function(request, callback, failure) {
- request['$$callback'] = callback;
- request['$$failure'] = failure||function(response){
- throw response;
- };
- this.bulkRequest.push(request);
- },
-
- flush: function() {
- if (this.bulkRequest.length === 0) return;
- var self = this;
- var bulkRequest = this.bulkRequest;
- this.bulkRequest = [];
- log('REQUEST:', bulkRequest);
- function callback(code, bulkResponse){
- log('RESPONSE[' + code + ']: ', bulkResponse);
- if(bulkResponse['$status_code'] == 401) {
- self.users['login'](function(){
- self.post(bulkRequest, callback);
- });
- } else if(bulkResponse['$status_code']) {
- alert(toJson(bulkResponse));
- } else {
- for ( var i = 0; i < bulkResponse.length; i++) {
- var response = bulkResponse[i];
- var request = bulkRequest[i];
- var responseCode = response['$status_code'];
- if(responseCode) {
- if(responseCode == 403) {
- self.users['notAuthorized']();
- } else {
- request['$$failure'](response);
- }
- } else {
- request['$$callback'](response);
- }
- }
- }
- }
- this.post(bulkRequest, callback);
- },
-
- saveScope: function(scope, callback) {
- var saveCounter = 1;
- function onSaveDone() {
- saveCounter--;
- if (saveCounter === 0 && callback)
- callback();
- }
- for(var key in scope) {
- var item = scope[key];
- if (item && item['$save'] == Model.prototype['$save']) {
- saveCounter++;
- item['$save'](onSaveDone);
- }
- }
- onSaveDone();
- },
-
- query: function(type, query, arg, callback){
- var self = this;
- var queryList = [];
- queryList['$$accept'] = function(doc){
- return false;
- };
- this._cache_collections.push(queryList);
- var request = type['title'] + '/' + query + '=' + arg;
- this._jsonRequest(["GET", request], function(response){
- var list = response;
- foreach(list, function(item){
- var document = type()['$loadFrom'](item);
- queryList.push(self.cache(document));
- });
- (callback||noop)(queryList);
- });
- return queryList;
- },
-
- entities: function(callback) {
- var entities = [];
- var self = this;
- this._jsonRequest(["GET", "$entities"], function(response) {
- foreach(response, function(value, entityName){
- entities.push(self.entity(entityName));
- });
- entities.sort(function(a,b){return a.title > b.title ? 1 : -1;});
- (callback||noop)(entities);
- });
- return entities;
- },
-
- documentCountsByUser: function(){
- var counts = {};
- var self = this;
- self.post([["GET", "$users"]], function(code, response){
- extend(counts, response[0]);
- });
- return counts;
- },
-
- userDocumentIdsByEntity: function(user){
- var ids = {};
- var self = this;
- self.post([["GET", "$users/" + user]], function(code, response){
- extend(ids, response[0]);
- });
- return ids;
- },
-
- entity: function(name, defaults){
- if (!name) {
- return DataStore.NullEntity;
- }
- var self = this;
- var entity = extend(function(initialState){
- return new Model(entity, initialState);
- }, {
- // entity.name does not work as name seems to be reserved for functions
- 'title': name,
- '$$factory': true,
- datastore: this, //private, obfuscate
- 'defaults': defaults || {},
- 'load': function(id, callback){
- return self.load(entity(), id, callback);
- },
- 'loadMany': function(ids, callback){
- return self.loadMany(entity, ids, callback);
- },
- 'loadOrCreate': function(id, callback){
- return self.loadOrCreate(entity(), id, callback);
- },
- 'all': function(callback){
- return self.loadAll(entity, callback);
- },
- 'query': function(query, queryArgs, callback){
- return self.query(entity, query, queryArgs, callback);
- },
- 'properties': function(callback) {
- self._jsonRequest(["GET", name + "/$properties"], callback);
- }
- });
- return entity;
- },
-
- join: function(join){
- function fn(){
- throw "Joined entities can not be instantiated into a document.";
- };
- function base(name){return name ? name.substring(0, name.indexOf('.')) : undefined;}
- function next(name){return name.substring(name.indexOf('.') + 1);}
- var joinOrder = _(join).chain().
- map(function($, name){
- return name;}).
- sortBy(function(name){
- var path = [];
- do {
- if (_(path).include(name)) throw "Infinite loop in join: " + path.join(" -> ");
- path.push(name);
- if (!join[name]) throw _("Named entity '<%=name%>' is undefined.").template({name:name});
- name = base(join[name].on);
- } while(name);
- return path.length;
- }).
- value();
- if (_(joinOrder).select(function($){return join[$].on;}).length != joinOrder.length - 1)
- throw "Exactly one entity needs to be primary.";
- fn['query'] = function(exp, value) {
- var joinedResult = [];
- var baseName = base(exp);
- if (baseName != joinOrder[0]) throw _("Named entity '<%=name%>' is not a primary entity.").template({name:baseName});
- var Entity = join[baseName].join;
- var joinIndex = 1;
- Entity['query'](next(exp), value, function(result){
- var nextJoinName = joinOrder[joinIndex++];
- var nextJoin = join[nextJoinName];
- var nextJoinOn = nextJoin.on;
- var joinIds = {};
- _(result).each(function(doc){
- var row = {};
- joinedResult.push(row);
- row[baseName] = doc;
- var id = Scope.getter(row, nextJoinOn);
- joinIds[id] = id;
- });
- nextJoin.join.loadMany(_.toArray(joinIds), function(result){
- var byId = {};
- _(result).each(function(doc){
- byId[doc.$id] = doc;
- });
- _(joinedResult).each(function(row){
- var id = Scope.getter(row, nextJoinOn);
- row[nextJoinName] = byId[id];
- });
- });
- });
- return joinedResult;
- };
- return fn;
- }
-};
diff --git a/src/moveToAngularCom/Server.js b/src/moveToAngularCom/Server.js
deleted file mode 100644
index 5c4ec3c6..00000000
--- a/src/moveToAngularCom/Server.js
+++ /dev/null
@@ -1,68 +0,0 @@
-function Server(url, getScript) {
- this.url = url;
- this.nextId = 0;
- this.getScript = getScript;
- this.uuid = "_" + ("" + Math.random()).substr(2) + "_";
- this.maxSize = 1800;
-};
-
-Server.prototype = {
- base64url: function(txt) {
- return Base64.encode(txt);
- },
-
- request: function(method, url, request, callback) {
- var requestId = this.uuid + (this.nextId++);
- var payload = this.base64url(toJson({'u':url, 'm':method, 'p':request}));
- var totalPockets = Math.ceil(payload.length / this.maxSize);
- var baseUrl = this.url + "/$/" + requestId + "/" + totalPockets + "/";
- angularCallbacks[requestId] = function(response) {
- delete angularCallbacks[requestId];
- callback(200, response);
- };
- for ( var pocketNo = 0; pocketNo < totalPockets; pocketNo++) {
- var pocket = payload.substr(pocketNo * this.maxSize, this.maxSize);
- this.getScript(baseUrl + (pocketNo+1) + "?h=" + pocket, noop);
- }
- }
-};
-
-function FrameServer(frame) {
- this.frame = frame;
-};
-FrameServer.PREFIX = "$DATASET:";
-
-FrameServer.prototype = {
- read:function(){
- this.data = fromJson(this.frame.name.substr(FrameServer.PREFIX.length));
- },
- write:function(){
- this.frame.name = FrameServer.PREFIX + toJson(this.data);
- },
- request: function(method, url, request, callback) {
- //alert(method + " " + url + " " + toJson(request) + " " + toJson(callback));
- }
-};
-
-
-function VisualServer(delegate, status, update) {
- this.delegate = delegate;
- this.update = update;
- this.status = status;
-};
-
-VisualServer.prototype = {
- request:function(method, url, request, callback) {
- var self = this;
- this.status.beginRequest(request);
- this.delegate.request(method, url, request, function() {
- self.status.endRequest();
- try {
- callback.apply(this, arguments);
- } catch (e) {
- alert(toJson(e));
- }
- self.update();
- });
- }
-};
diff --git a/src/moveToAngularCom/Users.js b/src/moveToAngularCom/Users.js
deleted file mode 100644
index fb5845d3..00000000
--- a/src/moveToAngularCom/Users.js
+++ /dev/null
@@ -1,35 +0,0 @@
-function Users(server, controlBar) {
- this.server = server;
- this.controlBar = controlBar;
-};
-
-extend(Users.prototype, {
- 'fetchCurrentUser':function(callback) {
- var self = this;
- this.server.request("GET", "/account.json", {}, function(code, response){
- self['current'] = response['user'];
- callback(response['user']);
- });
- },
-
- 'logout': function(callback) {
- var self = this;
- this.controlBar.logout(function(){
- delete self['current'];
- (callback||noop)();
- });
- },
-
- 'login': function(callback) {
- var self = this;
- this.controlBar.login(function(){
- self['fetchCurrentUser'](function(){
- (callback||noop)();
- });
- });
- },
-
- 'notAuthorized': function(){
- this.controlBar.notAuthorized();
- }
-});
diff --git a/src/moveToAngularCom/directivesAngularCom.js b/src/moveToAngularCom/directivesAngularCom.js
deleted file mode 100644
index 84032bdd..00000000
--- a/src/moveToAngularCom/directivesAngularCom.js
+++ /dev/null
@@ -1,29 +0,0 @@
-
-angular.directive("auth", function(expression, element){
- return function(){
- if(expression == "eager") {
- this.$users.fetchCurrent();
- }
- };
-});
-
-
-//expression = "book=Book:{year=2000}"
-angular.directive("entity", function(expression, element){
- //parse expression, ignore element
- var entityName; // "Book";
- var instanceName; // "book";
- var defaults; // {year: 2000};
-
- parse(expression);
-
- return function(){
- this[entityName] = this.$datastore.entity(entityName, defaults);
- this[instanceName] = this[entityName]();
- this.$watch("$anchor."+instanceName, function(newAnchor){
- this[instanceName] = this[entityName].get(this.$anchor[instanceName]);
- });
- };
-});
-
-
diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index b713cfd6..0607238c 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -1,38 +1,53 @@
angular.scenario.dsl.browser = {
navigateTo: function(url){
- $scenario.addStep('Navigate to: ' + url, function(done){
+ var location = this.location;
+ return $scenario.addFuture('Navigate to: ' + url, function(done){
var self = this;
this.testFrame.load(function(){
self.testFrame.unbind();
self.testWindow = self.testFrame[0].contentWindow;
- self.testDocument = jQuery(self.testWindow.document);
+ self.testDocument = self.jQuery(self.testWindow.document);
self.$browser = self.testWindow.angular.service.$browser();
- self.notifyWhenNoOutstandingRequests = bind(self.$browser, self.$browser.notifyWhenNoOutstandingRequests);
+ self.notifyWhenNoOutstandingRequests =
+ bind(self.$browser, self.$browser.notifyWhenNoOutstandingRequests);
self.notifyWhenNoOutstandingRequests(done);
});
if (this.testFrame.attr('src') == url) {
this.testFrame[0].contentWindow.location.reload();
} else {
this.testFrame.attr('src', url);
+ location.setLocation(url);
}
});
+ },
+ location: {
+ href: "",
+ hash: "",
+ toEqual: function(url) {
+ return (this.hash == "" ? (url == this.href) :
+ (url == (this.href + "/#/" + this.hash)));
+ },
+ setLocation: function(url) {
+ var urlParts = url.split("/#/");
+ this.href = urlParts[0] || "";
+ this.hash = urlParts[1] || "";
+ }
}
};
angular.scenario.dsl.input = function(selector) {
+ var namePrefix = "input '" + selector + "'";
return {
- enter: function(value){
- $scenario.addStep("Set input text of '" + selector + "' to '" +
- value + "'", function(done){
- var input = this.testDocument.find('input[name=' + selector + ']');
- input.val(value);
- this.testWindow.angular.element(input[0]).trigger('change');
- done();
+ enter: function(value) {
+ return $scenario.addFuture(namePrefix + " enter '" + value + "'", function(done) {
+ var input = this.testDocument.find('input[name=' + selector + ']');
+ input.val(value);
+ this.testWindow.angular.element(input[0]).trigger('change');
+ done();
});
},
- select: function(value){
- $scenario.addStep("Select radio '" + selector + "' to '" +
- value + "'", function(done){
+ select: function(value) {
+ return $scenario.addFuture(namePrefix + " select '" + value + "'", function(done) {
var input = this.testDocument.
find(':radio[name$=@' + selector + '][value=' + value + ']');
jqLiteWrap(input[0]).trigger('click');
@@ -41,22 +56,76 @@ angular.scenario.dsl.input = function(selector) {
});
}
};
-};
+},
-angular.scenario.dsl.expect = {
- repeater: function(selector) {
- return {
- count: {
- toEqual: function(number) {
- $scenario.addStep("Expect that there are " + number + " items in Repeater with selector '" + selector + "'", function(done) {
- var items = this.testDocument.find(selector);
- if (items.length != number) {
- this.result.fail("Expected " + number + " but was " + items.length);
- }
- done();
+angular.scenario.dsl.NG_BIND_PATTERN =/\{\{[^\}]+\}\}/;
+
+angular.scenario.dsl.repeater = function(selector) {
+ var namePrefix = "repeater '" + selector + "'";
+ return {
+ count: function() {
+ return $scenario.addFuture(namePrefix + ' count', function(done) {
+ done(this.testDocument.find(selector).size());
+ });
+ },
+ collect: function(collectSelector) {
+ return $scenario.addFuture(
+ namePrefix + " collect '" + collectSelector + "'",
+ function(done) {
+ var self = this;
+ var doCollect = bind(this, function() {
+ var repeaterArray = [], ngBindPattern;
+ var startIndex = collectSelector.search(
+ angular.scenario.dsl.NG_BIND_PATTERN);
+ if (startIndex >= 0) {
+ ngBindPattern = collectSelector.substring(
+ startIndex + 2, collectSelector.length - 2);
+ collectSelector = '*';
+
+ }
+ this.testDocument.find(selector).each(function() {
+ var element = self.jQuery(this);
+ element.find(collectSelector).
+ each(function() {
+ var foundElem = self.jQuery(this);
+ if (foundElem.attr('ng:bind') == ngBindPattern) {
+ repeaterArray.push(foundElem.text());
+ }
+ });
});
- }
- }
- };
+ return repeaterArray;
+ });
+ done(doCollect());
+ });
+ }
+ };
+};
+
+angular.scenario.dsl.element = function(selector) {
+ var namePrefix = "Element '" + selector + "'";
+ var futureJquery = {};
+ for (key in (jQuery || _jQuery).fn) {
+ (function(){
+ var jqFnName = key;
+ var jqFn = (jQuery || _jQuery).fn[key];
+ futureJquery[key] = function() {
+ var jqArgs = arguments;
+ return $scenario.addFuture(namePrefix + "." + jqFnName + "()",
+ function(done) {
+ var self = this, repeaterArray = [], ngBindPattern;
+ var startIndex = selector.search(angular.scenario.dsl.NG_BIND_PATTERN);
+ if (startIndex >= 0) {
+ ngBindPattern = selector.substring(startIndex + 2, selector.length - 2);
+ var element = this.testDocument.find('*').filter(function() {
+ return self.jQuery(this).attr('ng:bind') == ngBindPattern;
+ });
+ done(jqFn.apply(element, jqArgs));
+ } else {
+ done(jqFn.apply(this.testDocument.find(selector), jqArgs));
+ }
+ });
+ };
+ })();
}
+ return futureJquery;
};
diff --git a/src/scenario/Future.js b/src/scenario/Future.js
new file mode 100644
index 00000000..d70e8e6e
--- /dev/null
+++ b/src/scenario/Future.js
@@ -0,0 +1,13 @@
+function Future(name, behavior) {
+ this.name = name;
+ this.behavior = behavior;
+ this.fulfilled = false;
+ this.value = undefined;
+}
+
+Future.prototype = {
+ fulfill: function(value) {
+ this.fulfilled = true;
+ this.value = value;
+ }
+};
diff --git a/src/scenario/Matcher.js b/src/scenario/Matcher.js
new file mode 100644
index 00000000..a9c86571
--- /dev/null
+++ b/src/scenario/Matcher.js
@@ -0,0 +1,21 @@
+function Matcher(scope, future, logger) {
+ var self = scope.$scenario = this;
+ this.logger = logger;
+ this.future = future;
+}
+
+Matcher.addMatcher = function(name, matcher) {
+ Matcher.prototype[name] = function(expected) {
+ var future = this.future;
+ $scenario.addFuture(
+ 'expect ' + future.name + ' ' + name + ' ' + expected,
+ function(done){
+ if (!matcher(future.value, expected))
+ throw "Expected " + expected + ' but was ' + future.value;
+ done();
+ }
+ );
+ };
+};
+
+Matcher.addMatcher('toEqual', angular.equals);
diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
index 13ba5af0..ac32559c 100644
--- a/src/scenario/Runner.js
+++ b/src/scenario/Runner.js
@@ -8,6 +8,7 @@ angular.scenario.Runner = function(scope, jQuery){
this.scope.$testrun = {done: false, results: []};
var specs = this.specs = {};
+ this.currentSpec = {name: '', futures: []};
var path = [];
this.scope.describe = function(name, body){
path.push(name);
@@ -22,17 +23,20 @@ angular.scenario.Runner = function(scope, jQuery){
this.scope.afterEach = function(body) {
afterEach = body;
};
+ this.scope.expect = function(future) {
+ return new Matcher(self, future, self.logger);
+ };
this.scope.it = function(name, body) {
var specName = path.join(' ') + ': it ' + name;
self.currentSpec = specs[specName] = {
name: specName,
- steps:[]
+ futures: []
};
try {
beforeEach();
body();
} catch(err) {
- self.addStep(err.message || 'ERROR', function(){
+ self.addFuture(err.message || 'ERROR', function(){
throw err;
});
} finally {
@@ -107,14 +111,16 @@ angular.scenario.Runner.prototype = {
callback();
},
- addStep: function(name, step) {
- this.currentSpec.steps.push({name:name, fn:step});
+ addFuture: function(name, behavior) {
+ var future = new Future(name, behavior);
+ this.currentSpec.futures.push(future);
+ return future;
},
execute: function(name, callback) {
var spec = this.specs[name],
self = this,
- stepsDone = [],
+ futuresFulfilled = [],
result = {
passed: false,
failed: false,
@@ -128,33 +134,37 @@ angular.scenario.Runner.prototype = {
},
specThis = createScope({
result: result,
+ jQuery: this.jQuery,
testFrame: this.testFrame,
testWindow: this.testWindow
}, angularService, {});
this.self = specThis;
- var stepLogger = this.logger('spec', name);
- spec.nextStepIndex = 0;
+ var futureLogger = this.logger('spec', name);
+ spec.nextFutureIndex = 0;
function done() {
result.finished = true;
- stepLogger.close();
+ futureLogger.close();
self.self = null;
(callback||noop).call(specThis);
}
- function next(){
- var step = spec.steps[spec.nextStepIndex];
+ function next(value){
+ if (spec.nextFutureIndex > 0) {
+ spec.futures[spec.nextFutureIndex - 1].fulfill(value);
+ }
+ var future = spec.futures[spec.nextFutureIndex];
(result.log || {close:noop}).close();
result.log = null;
- if (step) {
- spec.nextStepIndex ++;
- result.log = stepLogger('step', step.name);
- stepsDone.push(step.name);
+ if (future) {
+ spec.nextFutureIndex ++;
+ result.log = futureLogger('future', future.name);
+ futuresFulfilled.push(future.name);
try {
- step.fn.call(specThis, next);
+ future.behavior.call(specThis, next);
} catch (e) {
console.error(e);
result.fail(e);
self.scope.$testrun.results.push(
- {name: name, passed: false, error: e, steps: stepsDone});
+ {name: name, passed: false, error: e, steps: futuresFulfilled});
done();
}
} else {
@@ -163,7 +173,7 @@ angular.scenario.Runner.prototype = {
name: name,
passed: !result.failed,
error: result.error,
- steps: stepsDone});
+ steps: futuresFulfilled});
done();
}
};
diff --git a/src/services.js b/src/services.js
index ed6f73ad..a5158149 100644
--- a/src/services.js
+++ b/src/services.js
@@ -1,82 +1,115 @@
+var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.-]*)(:([0-9]+))?([^\?#]+)(\?([^#]*))?(#(.*))?$/,
+ HASH_MATCH = /^([^\?]*)?(\?([^\?]*))?$/,
+ DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp':21};
+
angularService("$window", bind(window, identity, window));
angularService("$document", function(window){
return jqLite(window.document);
}, {inject:['$window']});
-var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.-]*)(:([0-9]+))?([^\?#]+)(\?([^#]*))?(#(.*))?$/;
-var HASH_MATCH = /^([^\?]*)?(\?([^\?]*))?$/;
-var DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp':21};
angularService("$location", function(browser){
- var scope = this, location = {parse:parseUrl, toString:toString};
- var lastHash, lastUrl;
+ var scope = this,
+ location = {parse:parseUrl, toString:toString, update:update},
+ lastLocation = {};
+
+ browser.watchUrl(function(url){
+ update(url);
+ scope.$root.$eval();
+ });
+ this.$onEval(PRIORITY_FIRST, update);
+ this.$onEval(PRIORITY_LAST, update);
+ update(browser.getUrl());
+ return location;
+
+ function update(href){
+ if (href) {
+ parseUrl(href);
+ } else {
+ href = check('href') || checkProtocol();
+ var hash = check('hash');
+ if (isUndefined(hash)) hash = checkHashPathSearch();
+ if (isDefined(hash)) {
+ href = (href || location.href).split('#')[0];
+ href+= '#' + hash;
+ }
+ if (isDefined(href)) {
+ parseUrl(href);
+ browser.setUrl(href);
+ }
+ }
+ }
+
+ function check(param) {
+ return lastLocation[param] == location[param] ? undefined : location[param];
+ }
+
+ function checkProtocol(){
+ if (lastLocation.protocol === location.protocol &&
+ lastLocation.host === location.host &&
+ lastLocation.port === location.port &&
+ lastLocation.path === location.path &&
+ equals(lastLocation.search, location.search))
+ return undefined;
+ var url = toKeyValue(location.search);
+ var port = (location.port == DEFAULT_PORTS[location.protocol] ? null : location.port);
+ return location.protocol + '://' + location.host +
+ (port ? ':' + port : '') + location.path +
+ (url ? '?' + url : '');
+ }
+
+ function checkHashPathSearch(){
+ if (lastLocation.hashPath === location.hashPath &&
+ equals(lastLocation.hashSearch, location.hashSearch) )
+ return undefined;
+ var url = toKeyValue(location.hashSearch);
+ return escape(location.hashPath) + (url ? '?' + url : '');
+ }
+
function parseUrl(url){
if (isDefined(url)) {
var match = URL_MATCH.exec(url);
if (match) {
- location.href = url;
+ location.href = url.replace('#$', '');
location.protocol = match[1];
location.host = match[3] || '';
- location.port = match[5] || DEFAULT_PORTS[location.href] || null;
+ location.port = match[5] || DEFAULT_PORTS[location.protocol] || null;
location.path = match[6];
location.search = parseKeyValue(match[8]);
- location.hash = match[9] || '';
- if (location.hash)
- location.hash = location.hash.substr(1);
- parseHash(location.hash);
+ location.hash = match[10] || '';
+ match = HASH_MATCH.exec(location.hash);
+ location.hashPath = unescape(match[1] || '');
+ location.hashSearch = parseKeyValue(match[3]);
+
+ copy(location, lastLocation);
}
}
}
- function parseHash(hash) {
- var match = HASH_MATCH.exec(hash);
- location.hashPath = match[1] || '';
- location.hashSearch = parseKeyValue(match[3]);
- lastHash = hash;
- }
+
function toString() {
- if (lastHash === location.hash) {
- var hashKeyValue = toKeyValue(location.hashSearch),
- hash = (location.hashPath ? location.hashPath : '') + (hashKeyValue ? '?' + hashKeyValue : ''),
- url = location.href.split('#')[0] + '#' + (hash ? hash : '');
- if (url !== location.href) parseUrl(url);
- return url;
- } else {
- parseUrl(location.href.split('#')[0] + '#' + location.hash);
- return toString();
- }
+ update();
+ return location.href;
}
- browser.watchUrl(function(url){
- parseUrl(url);
- scope.$root.$eval();
- });
- parseUrl(browser.getUrl());
- this.$onEval(PRIORITY_FIRST, function(){
- if (location.hash != lastHash) {
- parseHash(location.hash);
- }
- });
- this.$onEval(PRIORITY_LAST, function(){
- var url = toString();
- if (lastUrl != url) {
- browser.setUrl(url);
- lastUrl = url;
- }
- });
- return location;
}, {inject: ['$browser']});
angularService("$log", function($window){
- var console = $window.console,
- log = console && console.log || noop;
+ var console = $window.console || {log: noop, warn: noop, info: noop, error: noop},
+ log = console.log || noop;
return {
- log: log,
- warn: console && console.warn || log,
- info: console && console.info || log,
- error: console && console.error || log
+ log: bind(console, log),
+ warn: bind(console, console.warn || log),
+ info: bind(console, console.info || log),
+ error: bind(console, console.error || log)
};
}, {inject:['$window']});
-angularService("$hover", function(browser) {
- var tooltip, self = this, error, width = 300, arrowWidth = 10;
+angularService('$exceptionHandler', function($log){
+ return function(e) {
+ $log.error(e);
+ };
+}, {inject:['$log']});
+
+angularService("$hover", function(browser, document) {
+ var tooltip, self = this, error, width = 300, arrowWidth = 10, body = jqLite(document[0].body);;
browser.hover(function(element, show){
if (show && (error = element.attr(NG_EXCEPTION) || element.attr(NG_VALIDATION_ERROR))) {
if (!tooltip) {
@@ -89,9 +122,9 @@ angularService("$hover", function(browser) {
tooltip.callout.append(tooltip.arrow);
tooltip.callout.append(tooltip.title);
tooltip.callout.append(tooltip.content);
- self.$browser.body.append(tooltip.callout);
+ body.append(tooltip.callout);
}
- var docRect = self.$browser.body[0].getBoundingClientRect(),
+ var docRect = body[0].getBoundingClientRect(),
elementRect = element[0].getBoundingClientRect(),
leftSpace = docRect.right - elementRect.right - arrowWidth;
tooltip.title.text(element.hasClass("ng-exception") ? "EXCEPTION:" : "Validation error...");
@@ -119,7 +152,7 @@ angularService("$hover", function(browser) {
tooltip = null;
}
});
-}, {inject:['$browser']});
+}, {inject:['$browser', '$document']});
angularService("$invalidWidgets", function(){
var invalidWidgets = [];
@@ -181,7 +214,7 @@ function switchRouteMatcher(on, when, dstName) {
return match ? dst : null;
}
-angularService('$route', function(location, params){
+angularService('$route', function(location){
var routes = {},
onChange = [],
matcher = switchRouteMatcher,
diff --git a/src/widgets.js b/src/widgets.js
index 0b77dbf4..87a302fa 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -83,8 +83,7 @@ function valueAccessor(scope, element) {
elementError(element, NG_VALIDATION_ERROR, null);
invalidWidgets.markValid(element);
} else {
- var error,
- validateScope = extend(new (extend(function(){}, {prototype:scope}))(), {$element:element});
+ var error, validateScope = inherit(scope, {$element:element});
error = required && !value ?
'Required' :
(value ? validator(validateScope, value) : null);
@@ -199,14 +198,15 @@ function inputWidget(events, modelAccessor, viewAccessor, initFn) {
this.$eval(element.attr('ng:init')||'');
// Don't register a handler if we are a button (noopAccessor) and there is no action
if (action || modelAccessor !== noopAccessor) {
- element.bind(events, function(){
+ element.bind(events, function(event){
model.set(view.get());
lastValue = model.get();
scope.$tryEval(action, element);
scope.$root.$eval();
// if we have noop initFn than we are just a button,
// therefore we want to prevent default action
- return initFn != noop;
+ if(initFn == noop)
+ event.preventDefault();
});
}
view.set(lastValue = model.get());
@@ -223,16 +223,16 @@ function inputWidgetSelector(element){
return INPUT_TYPE[lowercase(element[0].type)] || noop;
}
-angularWidget('INPUT', inputWidgetSelector);
-angularWidget('TEXTAREA', inputWidgetSelector);
-angularWidget('BUTTON', inputWidgetSelector);
-angularWidget('SELECT', function(element){
+angularWidget('input', inputWidgetSelector);
+angularWidget('textarea', inputWidgetSelector);
+angularWidget('button', inputWidgetSelector);
+angularWidget('select', function(element){
this.descend(true);
return inputWidgetSelector.call(this, element);
});
-angularWidget('NG:INCLUDE', function(element){
+angularWidget('ng:include', function(element){
var compiler = this,
srcExp = element.attr("src"),
scopeExp = element.attr("scope") || '';
@@ -266,7 +266,7 @@ angularWidget('NG:INCLUDE', function(element){
}
});
-var ngSwitch = angularWidget('NG:SWITCH', function (element){
+var ngSwitch = angularWidget('ng:switch', function (element){
var compiler = this,
watchExpr = element.attr("on"),
usingExpr = (element.attr("using") || 'equals'),
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-05 12:50:31 +0000