' +
+ '' +
+ '
';
+
+nglr.ControlBar.prototype.login = function (loginSubmitFn) {
+ this.callbacks.push(loginSubmitFn);
+ if (this.callbacks.length == 1) {
+ this.doTemplate("/user_session/new.mini?return_url=" + encodeURIComponent(this.urlWithoutAnchor()));
+ }
+};
+
+nglr.ControlBar.prototype.logout = function (loginSubmitFn) {
+ this.callbacks.push(loginSubmitFn);
+ if (this.callbacks.length == 1) {
+ this.doTemplate("/user_session/do_destroy.mini");
+ }
+};
+
+nglr.ControlBar.prototype.urlWithoutAnchor = function (path) {
+ return this.window.location.href.split("#")[0];
+};
+
+nglr.ControlBar.prototype.doTemplate = function (path) {
+ var self = this;
+ var id = new Date().getTime();
+ var url = this.urlWithoutAnchor();
+ url += "#$iframe_notify=" + id;
+ var iframeHeight = 330;
+ var loginView = jQuery('');
+ this.document.append(loginView);
+ loginView.dialog({
+ height:iframeHeight + 33, width:500,
+ resizable: false, modal:true,
+ title: 'Authentication: <angular/>'
+ });
+ nglr["_iframe_notify_" + id] = function() {
+ loginView.dialog("destroy");
+ loginView.remove();
+ jQuery.each(self.callbacks, function(i, callback){
+ callback();
+ });
+ self.callbacks = [];
+ };
+};
+
+nglr.ControlBar.FORBIDEN =
+ '' +
+ '' +
+ '
' +
+ '' +
+ 'Sorry, you do not have permission for this!'+
+ '
';
+
+nglr.ControlBar.prototype.notAuthorized = function () {
+ if (this.forbidenView) return;
+ this.forbidenView = jQuery(nglr.ControlBar.FORBIDEN);
+ this.forbidenView.dialog({bgiframe:true, height:70, modal:true});
+};
diff --git a/src/DataStore.js b/src/DataStore.js
new file mode 100644
index 00000000..97ab92ff
--- /dev/null
+++ b/src/DataStore.js
@@ -0,0 +1,332 @@
+// Copyright (C) 2009 BRAT Tech LLC
+
+nglr.DataStore = function(post, users, anchor) {
+ this.post = post;
+ this.users = users;
+ this._cache = {$collections:[]};
+ this.anchor = anchor;
+ this.bulkRequest = [];
+};
+
+nglr.DataStore.prototype.cache = function(document) {
+ if (document.constructor != nglr.Model) {
+ throw "Parameter must be an instance of Entity! " + nglr.toJson(document);
+ }
+ var key = document.$entity + '/' + document.$id;
+ var cachedDocument = this._cache[key];
+ if (cachedDocument) {
+ nglr.Model.copyDirectFields(document, cachedDocument);
+ } else {
+ this._cache[key] = document;
+ cachedDocument = document;
+ }
+ return cachedDocument;
+};
+
+nglr.DataStore.prototype.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||nglr.noop)(instance);
+ }, failure);
+ }
+ return instance;
+};
+
+nglr.DataStore.prototype.loadMany = function(entity, ids, callback) {
+ var self=this;
+ var list = [];
+ var callbackCount = 0;
+ jQuery.each(ids, function(i, id){
+ list.push(self.load(entity(), id, function(){
+ callbackCount++;
+ if (callbackCount == ids.length) {
+ (callback||nglr.noop)(list);
+ }
+ }));
+ });
+ return list;
+}
+
+nglr.DataStore.prototype.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||nglr.noop)(instance);
+ } else {
+ throw response;
+ }
+ });
+};
+
+nglr.DataStore.prototype.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||nglr.noop)(list);
+ });
+ return list;
+};
+
+nglr.DataStore.prototype.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)) {
+ angular.Array.includeIf(collection, cachedDoc, true);
+ }
+ });
+ if (document.$$anchor) {
+ self.anchor[document.$$anchor] = document.$id;
+ }
+ if (callback)
+ callback(document);
+ });
+};
+
+nglr.DataStore.prototype.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||nglr.noop)(response);
+ });
+};
+
+nglr.DataStore.prototype._jsonRequest = function(request, callback, failure) {
+ request.$$callback = callback;
+ request.$$failure = failure||function(response){
+ throw response;
+ };
+ this.bulkRequest.push(request);
+};
+
+nglr.DataStore.prototype.flush = function() {
+ if (this.bulkRequest.length === 0) return;
+ var self = this;
+ var bulkRequest = this.bulkRequest;
+ this.bulkRequest = [];
+ console.log('REQUEST:', bulkRequest);
+ function callback(code, bulkResponse){
+ console.log('RESPONSE[' + code + ']: ', bulkResponse);
+ if(bulkResponse.$status_code == 401) {
+ self.users.login(function(){
+ self.post(bulkRequest, callback);
+ });
+ } else if(bulkResponse.$status_code) {
+ nglr.alert(nglr.toJson(bulkResponse));
+ } else {
+ for ( var i = 0; i < bulkResponse.length; i++) {
+ var response = bulkResponse[i];
+ var request = bulkRequest[i];
+ var code = response.$status_code;
+ if(code) {
+ if(code == 403) {
+ self.users.notAuthorized();
+ } else {
+ request.$$failure(response);
+ }
+ } else {
+ request.$$callback(response);
+ }
+ }
+ }
+ }
+ this.post(bulkRequest, callback);
+};
+
+nglr.DataStore.prototype.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 == nglr.Model.prototype.$save) {
+ saveCounter++;
+ item.$save(onSaveDone);
+ }
+ }
+ onSaveDone();
+};
+
+nglr.DataStore.prototype.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;
+ for(var i = 0; i < list.length; i++) {
+ var document = new type().$loadFrom(list[i]);
+ queryList.push(self.cache(document));
+ }
+ if (callback)
+ callback(queryList);
+ });
+ return queryList;
+};
+
+nglr.DataStore.prototype.entities = function(callback) {
+ var entities = [];
+ var self = this;
+ this._jsonRequest(["GET", "$entities"], function(response) {
+ for (var entityName in response) {
+ entities.push(self.entity(entityName));
+ }
+ entities.sort(function(a,b){return a.title > b.title ? 1 : -1;});
+ if (callback) callback(entities);
+ });
+ return entities;
+};
+
+nglr.DataStore.prototype.documentCountsByUser = function(){
+ var counts = {};
+ var self = this;
+ self.post([["GET", "$users"]], function(code, response){
+ jQuery.each(response[0], function(key, value){
+ counts[key] = value;
+ });
+ });
+ return counts;
+};
+
+nglr.DataStore.prototype.userDocumentIdsByEntity = function(user){
+ var ids = {};
+ var self = this;
+ self.post([["GET", "$users/" + user]], function(code, response){
+ jQuery.each(response[0], function(key, value){
+ ids[key] = value;
+ });
+ });
+ return ids;
+};
+
+nglr.DataStore.NullEntity = function(){};
+nglr.DataStore.NullEntity.all = function(){return [];};
+nglr.DataStore.NullEntity.query = function(){return [];};
+nglr.DataStore.NullEntity.load = function(){return {};};
+nglr.DataStore.NullEntity.title = undefined;
+
+nglr.DataStore.prototype.entity = function(name, defaults){
+ if (!name) {
+ return nglr.DataStore.NullEntity;
+ }
+ var self = this;
+ var entity = function(initialState){
+ return new nglr.Model(entity, initialState);
+ };
+ // entity.name does not work as name seems to be reserved for functions
+ entity.title = name;
+ entity.$$factory = true;
+ entity.datastore = this;
+ entity.defaults = defaults || {};
+ entity.load = function(id, callback){
+ return self.load(entity(), id, callback);
+ };
+ entity.loadMany = function(ids, callback){
+ return self.loadMany(entity, ids, callback);
+ };
+ entity.loadOrCreate = function(id, callback){
+ return self.loadOrCreate(entity(), id, callback);
+ };
+ entity.all = function(callback){
+ return self.loadAll(entity, callback);
+ };
+ entity.query = function(query, queryArgs, callback){
+ return self.query(entity, query, queryArgs, callback);
+ };
+ entity.properties = function(callback) {
+ self._jsonRequest(["GET", name + "/$properties"], callback);
+ };
+ return entity;
+};
+
+nglr.DataStore.prototype.join = function(join){
+ var fn = function(){
+ 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 = nglr.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 = nglr.Scope.getter(row, nextJoinOn);
+ row[nextJoinName] = byId[id];
+ });
+ });
+ });
+ return joinedResult;
+ };
+ return fn;
+};
diff --git a/src/Filters.js b/src/Filters.js
new file mode 100644
index 00000000..f75f3603
--- /dev/null
+++ b/src/Filters.js
@@ -0,0 +1,290 @@
+// Copyright (C) 2009 BRAT Tech LLC
+
+angular.filter.Meta = function(obj){
+ if (obj) {
+ for ( var key in obj) {
+ this[key] = obj[key];
+ }
+ }
+};
+angular.filter.Meta.get = function(obj, attr){
+ attr = attr || 'text';
+ switch(typeof obj) {
+ case "string":
+ return attr == "text" ? obj : undefined;
+ case "object":
+ if (obj && typeof obj[attr] !== "undefined") {
+ return obj[attr];
+ }
+ return undefined;
+ default:
+ return obj;
+ }
+};
+
+angular.filter.currency = function(amount){
+ jQuery(this.element).toggleClass('ng-format-negative', amount < 0);
+ return '$' + angular.filter.number.apply(this, [amount, 2]);
+};
+
+angular.filter.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;
+};
+
+angular.filter.date = function(amount) {
+};
+
+angular.filter.json = function(object) {
+ jQuery(this.element).addClass("ng-monospace");
+ return nglr.toJson(object, true);
+};
+
+angular.filter.trackPackage = function(trackingNo, noMatch) {
+ trackingNo = nglr.trim(trackingNo);
+ var tNo = trackingNo.replace(/ /g, '');
+ var MATCHERS = angular.filter.trackPackage.MATCHERS;
+ for ( var i = 0; i < MATCHERS.length; i++) {
+ var carrier = MATCHERS[i];
+ for ( var j = 0; j < carrier.regexp.length; j++) {
+ var regexp = carrier.regexp[j];
+ if (regexp.test(tNo)) {
+ var text = carrier.name + ": " + trackingNo;
+ var url = carrier.url + trackingNo;
+ return new angular.filter.Meta({
+ text:text,
+ url:url,
+ html: '' + text + '',
+ trackingNo:trackingNo});
+ }
+ }
+ }
+ if (trackingNo)
+ return noMatch ||
+ new angular.filter.Meta({text:trackingNo + " is not recognized"});
+ else
+ return null;
+};
+
+angular.filter.trackPackage.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]}];
+
+angular.filter.link = function(obj, title) {
+ var text = title || angular.filter.Meta.get(obj);
+ var url = angular.filter.Meta.get(obj, "url") || angular.filter.Meta.get(obj);
+ if (url) {
+ if (angular.validator.email(url) === null) {
+ url = "mailto:" + url;
+ }
+ var html = '' + text + '';
+ return new angular.filter.Meta({text:text, url:url, html:html});
+ }
+ return obj;
+};
+
+
+angular.filter.bytes = 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 + " " + angular.filter.bytes.SUFFIX[suffix];
+};
+angular.filter.bytes.SUFFIX = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB'];
+
+angular.filter.image = function(obj, width, height) {
+ if (obj && obj.url) {
+ var style = "";
+ if (width) {
+ style = ' style="max-width: ' + width +
+ 'px; max-height: ' + (height || width) + 'px;"';
+ }
+ return new angular.filter.Meta({url:obj.url, text:obj.url,
+ html:'" +
+ "" +
+ "
");
+ 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;
+};
+
+nglr.PopUp.onOut = function() {
+ jQuery('#ng-callout').
+ unbind(nglr.PopUp.OUT_EVENT, nglr.PopUp.onOut).
+ remove();
+ return true;
+};
+
+//////////////////////////////////
+// Status
+//////////////////////////////////
+
+
+nglr.Status = function(body) {
+ this.loader = body.append(nglr.Status.DOM).find("#ng-loading");
+ this.requestCount = 0;
+};
+
+nglr.Status.DOM ='"+title+"
" +
+ ""+msg+"
" +
+ "loading....
';
+
+nglr.Status.prototype.beginRequest = function () {
+ if (this.requestCount === 0) {
+ this.loader.show();
+ }
+ this.requestCount++;
+};
+
+nglr.Status.prototype.endRequest = function () {
+ this.requestCount--;
+ if (this.requestCount === 0) {
+ this.loader.hide("fold");
+ }
+};
diff --git a/src/Widgets.js.orig b/src/Widgets.js.orig
new file mode 100644
index 00000000..df1d3e40
--- /dev/null
+++ b/src/Widgets.js.orig
@@ -0,0 +1,764 @@
+ // Copyright (C) 2009 BRAT Tech LLC
+
+
+nglr.WidgetFactory = function(serverUrl) {
+ this.nextUploadId = 0;
+ this.serverUrl = serverUrl;
+ this.createSWF = swfobject.createSWF;
+ this.onChangeListener = function(){};
+};
+
+nglr.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;
+ if (type == 'button' || type == 'submit' || type == 'reset') {
+ controller = new nglr.ButtonController(input[0], exp);
+ event = "click";
+ bubbleEvent = false;
+ } else if (type == 'text' || type == 'textarea') {
+ controller = new nglr.TextController(input[0], exp);
+ event = "keyup change";
+ } else if (type == 'checkbox') {
+ controller = new nglr.CheckboxController(input[0], exp);
+ event = "click";
+ } else if (type == 'radio') {
+ controller = new nglr.RadioController(input[0], exp);
+ event="click";
+ } else if (type == 'select-one') {
+ controller = new nglr.SelectController(input[0], exp);
+ } else if (type == 'select-multiple') {
+ controller = new nglr.MultiSelectController(input[0], exp);
+ } else if (type == 'file') {
+ controller = this.createFileController(input, exp);
+ } else {
+ throw 'Unknown type: ' + type;
+ }
+ input.data('controller', controller);
+ var binder = scope.get('$binder');
+ var action = function() {
+ if (controller.updateModel(scope)) {
+ var action = jQuery(controller.view).attr('ng-action') || "";
+ if (scope.evalWidget(controller, action)) {
+ binder.updateView(scope);
+ }
+ }
+ return bubbleEvent;
+ };
+ jQuery(controller.view, ":input").
+ bind(event, action);
+ return controller;
+};
+
+nglr.WidgetFactory.prototype.createFileController = function(fileInput) {
+ var uploadId = '__uploadWidget_' + (this.nextUploadId++);
+ var view = nglr.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 nglr.FileController(view, fileInput[0].name, swfNode, this.serverUrl);
+ jQuery(swfNode).data('controller', cntl);
+ return cntl;
+};
+
+nglr.WidgetFactory.prototype.createTextWidget = function(textInput) {
+ var controller = new nglr.TextController(textInput);
+ controller.onChange(this.onChangeListener);
+ return controller;
+};
+
+/////////////////////
+// FileController
+///////////////////////
+
+nglr.FileController = function(view, scopeName, uploader, serverUrl) {
+ this.view = view;
+ this.uploader = uploader;
+ this.scopeName = scopeName;
+ this.uploadUrl = serverUrl + '/upload';
+ this.attachmentBase = serverUrl + '/attachments';
+ this.value = null;
+ this.lastValue = undefined;
+};
+
+nglr.FileController.dispatchEvent = function(id, event, args) {
+ var object = document.getElementById(id);
+ var controller = jQuery(object).data("controller");
+ nglr.FileController.prototype['_on_' + event].apply(controller, args);
+};
+
+nglr.FileController.template = function(id) {
+ return jQuery('');
+};
+
+nglr.FileController.prototype._on_cancel = function() {
+};
+
+nglr.FileController.prototype._on_complete = function() {
+};
+
+nglr.FileController.prototype._on_httpStatus = function(status) {
+ nglr.alert("httpStatus:" + this.scopeName + " status:" + status);
+};
+
+nglr.FileController.prototype._on_ioError = function() {
+ nglr.alert("ioError:" + this.scopeName);
+};
+
+nglr.FileController.prototype._on_open = function() {
+ nglr.alert("open:" + this.scopeName);
+};
+
+nglr.FileController.prototype._on_progress = function(bytesLoaded, bytesTotal) {
+};
+
+nglr.FileController.prototype._on_securityError = function() {
+ nglr.alert("securityError:" + this.scopeName);
+};
+
+nglr.FileController.prototype._on_uploadCompleteData = function(data) {
+ this.value = nglr.fromJson(data);
+ this.value.url = this.attachmentBase + '/' + this.value.id + '/' + this.value.text;
+ this.view.find("input").attr('checked', true);
+ var scope = this.view.scope();
+ this.updateModel(scope);
+ scope.get('$binder').updateView();
+};
+
+nglr.FileController.prototype._on_select = function(name, size, type) {
+ this.name = name;
+ this.view.find("a").text(name).attr('href', name);
+ this.view.find("span").text(filters.bytes(size));
+ this.upload();
+};
+
+nglr.FileController.prototype.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;
+ }
+};
+
+nglr.FileController.prototype.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.name);
+ this.view.find("span").text(filters.bytes(this.value.size));
+ }
+ this.view.find("input").attr('checked', !!modelValue);
+};
+
+nglr.FileController.prototype.upload = function() {
+ if (this.name) {
+ this.uploader.uploadFile(this.uploadUrl);
+ }
+};
+
+
+///////////////////////
+// NullController
+///////////////////////
+nglr.NullController = function(view) {this.view = view;};
+nglr.NullController.prototype.updateModel = function() { return true; };
+nglr.NullController.prototype.updateView = function() { };
+nglr.NullController.instance = new nglr.NullController();
+
+
+///////////////////////
+// ButtonController
+///////////////////////
+nglr.ButtonController = function(view) {this.view = view;};
+nglr.ButtonController.prototype.updateModel = function(scope) { return true; };
+nglr.ButtonController.prototype.updateView = function(scope) {};
+
+///////////////////////
+// TextController
+///////////////////////
+nglr.TextController = function(view, exp) {
+ this.view = view;
+ 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 = view.value;
+ var widget = view.getAttribute('ng-widget');
+ if (widget === 'datepicker') {
+ jQuery(view).datepicker();
+ }
+};
+
+nglr.TextController.prototype.updateModel = function(scope) {
+ var value = this.view.value;
+ if (this.lastValue === value) {
+ return false;
+ } else {
+ scope.set(this.exp, value);
+ this.lastValue = value;
+ return true;
+ }
+};
+
+nglr.TextController.prototype.updateView = function(scope) {
+ var view = this.view;
+ var value = scope.get(this.exp);
+ if (typeof value === "undefined") {
+ value = this.initialValue;
+ scope.set(this.exp, value);
+ }
+ value = value ? value : '';
+ if (this.lastValue != value) {
+ view.value = value;
+ this.lastValue = value;
+ }
+ var isValidationError = false;
+ view.removeAttribute('ng-error');
+ if (this.required) {
+ isValidationError = !(value && value.length > 0);
+ }
+ var errorText = isValidationError ? "Required Value" : null;
+ if (!isValidationError && this.validator && value) {
+ errorText = scope.validate(this.validator, value);
+ isValidationError = !!errorText;
+ }
+ if (this.lastErrorText !== errorText) {
+ this.lastErrorText = isValidationError;
+ if (errorText !== null) {
+ view.setAttribute('ng-error', errorText);
+ scope.markInvalid(this);
+ }
+ jQuery(view).toggleClass('ng-validation-error', isValidationError);
+ }
+};
+
+///////////////////////
+// CheckboxController
+///////////////////////
+nglr.CheckboxController = function(view, exp) {
+ this.view = view;
+ this.exp = exp;
+ this.lastValue = undefined;
+ this.initialValue = view.checked ? view.value : "";
+};
+
+nglr.CheckboxController.prototype.updateModel = function(scope) {
+ var input = this.view;
+ var value = input.checked ? input.value : '';
+ if (this.lastValue === value) {
+ return false;
+ } else {
+ scope.setEval(this.exp, value);
+ this.lastValue = value;
+ return true;
+ }
+};
+
+nglr.CheckboxController.prototype.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 = input.value == (''+value);
+};
+
+///////////////////////
+// SelectController
+///////////////////////
+nglr.SelectController = function(view, exp) {
+ this.view = view;
+ this.exp = exp;
+ this.lastValue = undefined;
+ this.initialValue = view.value;
+};
+
+nglr.SelectController.prototype.updateModel = function(scope) {
+ var input = this.view;
+ if (input.selectedIndex < 0) {
+ scope.set(this.exp, null);
+ } else {
+ var value = this.view.value;
+ if (this.lastValue === value) {
+ return false;
+ } else {
+ scope.set(this.exp, value);
+ this.lastValue = value;
+ return true;
+ }
+ }
+};
+
+nglr.SelectController.prototype.updateView = function(scope) {
+ var input = this.view;
+ var value = scope.get(this.exp);
+ if (typeof value === 'undefined') {
+ value = this.initialValue;
+ scope.set(this.exp, value);
+ }
+ if (value !== this.lastValue) {
+ input.value = value ? value : "";
+ this.lastValue = value;
+ }
+};
+
+///////////////////////
+// MultiSelectController
+///////////////////////
+nglr.MultiSelectController = function(view, exp) {
+ this.view = view;
+ this.exp = exp;
+ this.lastValue = undefined;
+ this.initialValue = this.selected();
+};
+
+nglr.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;
+};
+
+nglr.MultiSelectController.prototype.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.set(this.exp, value);
+ this.lastValue = value;
+ return true;
+ }
+};
+
+nglr.MultiSelectController.prototype.updateView = function(scope) {
+ var input = this.view;
+ var selected = scope.get(this.exp);
+ if (typeof selected === "undefined") {
+ selected = this.initialValue;
+ scope.set(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 = selected.contains(option.value);
+ }
+ this.lastValue = selected;
+ }
+};
+
+///////////////////////
+// RadioController
+///////////////////////
+nglr.RadioController = function(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;
+};
+
+nglr.RadioController.prototype.updateModel = function(scope) {
+ var input = this.view;
+ if (this.lastChecked) {
+ return false;
+ } else {
+ input.checked = true;
+ this.lastValue = scope.set(this.exp, this.inputValue);
+ this.lastChecked = true;
+ return true;
+ }
+};
+
+nglr.RadioController.prototype.updateView = function(scope) {
+ var input = this.view;
+ var value = scope.get(this.exp);
+ if (this.initialValue && typeof value === "undefined") {
+ value = this.initialValue;
+ scope.set(this.exp, value);
+ }
+ if (this.lastValue != value) {
+ this.lastChecked = input.checked = this.inputValue == (''+value);
+ this.lastValue = value;
+ }
+};
+
+///////////////////////
+//ElementController
+///////////////////////
+nglr.BindUpdater = function(view, exp) {
+ this.view = view;
+ this.exp = exp.parseBindings();
+ this.hasError = false;
+ this.scopeSelf = {element:view};
+};
+
+nglr.BindUpdater.toText = function(obj) {
+ var e = nglr.escapeHtml;
+ switch(typeof obj) {
+ case "string":
+ case "boolean":
+ case "number":
+ return e(obj);
+ case "function":
+ return nglr.BindUpdater.toText(obj());
+ case "object":
+ if (nglr.isNode(obj)) {
+ return nglr.outerHTML(obj);
+ } else if (obj && obj.TAG === filters.Meta.TAG) {
+ switch(typeof obj.html) {
+ case "string":
+ case "number":
+ return obj.html;
+ case "function":
+ return 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(nglr.toJson(obj, true));
+ default:
+ return "";
+ }
+};
+
+nglr.BindUpdater.prototype.updateModel = function(scope) {};
+nglr.BindUpdater.prototype.updateView = function(scope) {
+ var html = [];
+ var parts = this.exp;
+ var length = parts.length;
+ for(var i=0; i" +
+ "" +
+ "
");
+ 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;
+};
+
+nglr.PopUp.onOut = function() {
+ jQuery('#ng-callout').
+ unbind(nglr.PopUp.OUT_EVENT, nglr.PopUp.onOut).
+ remove();
+ return true;
+};
+
+//////////////////////////////////
+// Status
+//////////////////////////////////
+
+nglr.Status = function (body) {
+ this.body = body;
+ this.requestCount = 0;
+};
+nglr.Status.ANGULAR = "<a class='ng-angular-logo' href='http://www.getangular.com'><angular/></a>™";
+
+nglr.Status.prototype.beginRequest = function () {
+ if (this.requestCount === 0) {
+<<<<<<< HEAD:public/javascripts/nglr/Widgets.js
+ this.dialogView = jQuery('"+title+"
" +
+ ""+msg+"
" +
+ "Please Wait...
');
+=======
+ this.dialogView = jQuery('Please Wait...
');
+ this.progressWidget = this.dialogView.find("div");
+ this.progressWidget.progressbar({value:0});
+>>>>>>> master:public/javascripts/nglr/Widgets.js
+ this.dialogView.dialog({bgiframe:true, minHeight:50, modal:true});
+ this.maxRequestCount = 0;
+ }
+ this.requestCount++;
+ this.maxRequestCount++;
+};
+
+nglr.Status.prototype.endRequest = function () {
+ this.requestCount--;
+ if (this.requestCount === 0) {
+ this.dialogView.dialog("destroy");
+ this.dialogView.remove();
+ this.dialogView = null;
+ }
+};
diff --git a/src/XSitePost.js b/src/XSitePost.js
new file mode 100644
index 00000000..7d81e207
--- /dev/null
+++ b/src/XSitePost.js
@@ -0,0 +1,100 @@
+// Copyright (C) 2008,2009 BRAT Tech LLC
+
+if (typeof nglr == 'undefined') nglr = {};
+
+if (typeof console == 'undefined') console = {};
+if (typeof console.log == 'undefined')
+ console.log = function() {};
+if (typeof console.error == 'undefined')
+ console.error = function() {};
+
+nglr.XSitePost = function(baseUrl, window, prefix) {
+ this.baseUrl = baseUrl;
+ this.post = jQuery.post;
+ this.window = window;
+ this.inQueue = {};
+ this.outQueue = [];
+ this.maxMsgSize = 100000;
+ this.delay = 20;
+ this.prefix = prefix;
+ this.setTimeout=function(fn, delay){window.setTimeout(fn, delay);};
+};
+
+nglr.XSitePost.prototype.init = function() {
+ this.window.name = '';
+ this.response('ready', 'null');
+};
+
+nglr.XSitePost.prototype.incomingFragment = function(fragment) {
+ var parts = fragment.split(";");
+ this.incomingMsg(parts.shift(), 1*parts.shift(), 1*parts.shift(), parts.shift());
+};
+
+nglr.XSitePost.prototype.incomingMsg = function(id, partNo, totalParts, msgPart) {
+ var msg = this.inQueue[id];
+ if (!msg) {
+ msg = {id:id, parts:[], count:0};
+ this.inQueue[id] = msg;
+ }
+ msg.parts[partNo] = msgPart;
+ msg.count++;
+ if (totalParts === msg.count) {
+ delete this.inQueue[id];
+ var request = this.decodePost(msg.parts.join(''));
+ var self = this;
+ this.post(this.baseUrl + request.url, request.params, function(response, status){
+ self.response(id, response, status);
+ });
+ }
+};
+
+nglr.XSitePost.prototype.response = function(id, response, status) {
+ var start = 0;
+ var end;
+ var msg = Base64.encode(response);
+ var msgLen = msg.length;
+ var total = Math.ceil(msgLen / this.maxMsgSize);
+ var part = 0;
+ while (start < msgLen) {
+ end = Math.min(msgLen, start + this.maxMsgSize);
+ this.outQueue.push(id + ':'+part+':'+total+':' + msg.substring(start, end));
+ start = end;
+ part++;
+ }
+};
+
+nglr.XSitePost.prototype.decodePost = function(post) {
+ var parts = post.split(':');
+ var url = Base64.decode(parts.shift());
+ var params = {};
+ while(parts.length !== 0) {
+ var key = parts.shift();
+ var value = Base64.decode(parts.shift());
+ params[key] = value;
+ }
+ return {url:url, params:params};
+};
+
+nglr.XSitePost.prototype.listen = function() {
+ console.log("listen()");
+ var self = this;
+ var window = this.window;
+ var outQueue = this.outQueue;
+ var setTimeout = this.setTimeout;
+ var prefix = this.prefix;
+ var prefixLen = prefix.length;
+ var prefixRec = prefix + '>';
+ var prefixRecLen = prefixRec.length;
+ window.name = prefix;
+ var pull = function(){
+ var value = window.name;
+ if (value == prefix && outQueue.length > 0) {
+ window.name = prefix + '<' + outQueue.shift();
+ } else if (value.substr(0, prefixRecLen) == prefixRec) {
+ self.incomingFragment(value.substr(prefixRecLen));
+ window.name = prefix;
+ }
+ setTimeout(pull, self.delay);
+ };
+ pull();
+};
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
new file mode 100644
index 00000000..b7ae6a38
--- /dev/null
+++ b/src/angular-bootstrap.js
@@ -0,0 +1,100 @@
+// Copyright (C) 2008,2009 BRAT Tech LLC
+
+(function(previousOnLoad){
+ var filename = /(.*)\/angular-(.*).js(#(.*))?/;
+ var scripts = document.getElementsByTagName("script");
+ var scriptConfig = {
+ autoSubmit:true,
+ autoBind:true,
+ autoLoadDependencies:false
+ };
+ for(var j = 0; j < scripts.length; j++) {
+ var src = scripts[j].src;
+ if (src && src.match(filename)) {
+ var parts = src.match(filename);
+ if (parts[2] == 'bootstrap') {
+ scriptConfig.autoLoadDependencies = true;
+ }
+ scriptConfig.server = parts[1] || '';
+ if (!scriptConfig.server) {
+ scriptConfig.server = window.location.toString().split(window.location.pathname)[0];
+ }
+ if (parts[4]) {
+ var directive = parts[4].split('&');
+ for ( var i = 0; i < directive.length; i++) {
+ var keyValue = directive[i].split('=');
+ var key = keyValue[0];
+ var value = keyValue.length == 1 ? true : keyValue[1];
+ if (value == 'false') value = false;
+ if (value == 'true') value = true;
+ scriptConfig[key] = value;
+ }
+ }
+ }
+ }
+
+ var addScript = function(path, server){
+ server = server || scriptConfig.server;
+ document.write('');
+ };
+
+ if (scriptConfig.autoLoadDependencies) {
+ addScript("/javascripts/webtoolkit.base64.js");
+ addScript("/javascripts/swfobject.js");
+ addScript("/javascripts/jQuery/jquery-1.3.2.js");
+ addScript("/javascripts/jQuery/jquery-ui-1.7.1.custom.min.js");
+ addScript("/javascripts/underscore/underscore.js");
+ addScript("/javascripts/nglr/Loader.js");
+ addScript("/javascripts/nglr/API.js");
+ addScript("/javascripts/nglr/Binder.js");
+ addScript("/javascripts/nglr/ControlBar.js");
+ addScript("/javascripts/nglr/DataStore.js");
+ addScript("/javascripts/nglr/Filters.js");
+ addScript("/javascripts/nglr/JSON.js");
+ addScript("/javascripts/nglr/Model.js");
+ addScript("/javascripts/nglr/Parser.js");
+ addScript("/javascripts/nglr/Scope.js");
+ addScript("/javascripts/nglr/Server.js");
+ addScript("/javascripts/nglr/Users.js");
+ addScript("/javascripts/nglr/Validators.js");
+ addScript("/javascripts/nglr/Widgets.js");
+ } else {
+ addScript("/ajax/libs/swfobject/2.2/swfobject.js", "http://ajax.googleapis.com");
+ addScript("/ajax/libs/jquery/1.3.2/jquery.min.js", "http://ajax.googleapis.com");
+ addScript("/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js", "http://ajax.googleapis.com");
+ }
+
+ window.onload = function() {
+ window.angular.init = function(root, config){
+ var cnfgMerged = _.clone(scriptConfig||{});
+ _.extend(cnfgMerged, config);
+ new nglr.Loader(root, jQuery("head"), cnfgMerged).load();
+ };
+
+ var doc = window.document;
+ if (scriptConfig.bindRootId) {
+ doc = null;
+ var ids = scriptConfig.bindRootId.split('|');
+ for ( var i = 0; i < ids.length && !doc; i++) {
+ var idCond = ids[i].split('?');
+ var id = idCond[0];
+ if (idCond.length > 1) {
+ if (!window.document.getElementById(idCond[1])) {
+ continue;
+ }
+ }
+ doc = window.document.getElementById(id);
+ }
+ }
+ if (scriptConfig.autoBind && doc) {
+ window.angular.init(doc);
+ }
+ if (typeof previousOnLoad === 'function') {
+ try {
+ previousOnLoad.apply(this, arguments);
+ } catch (e) {}
+ }
+ };
+})(window.onload);
+
+
diff --git a/src/test/Runner.js b/src/test/Runner.js
new file mode 100644
index 00000000..478ef73e
--- /dev/null
+++ b/src/test/Runner.js
@@ -0,0 +1,160 @@
+nglr.test.ScenarioRunner = function(scenarios, body) {
+ this.scenarios = scenarios;
+ this.body = body;
+};
+
+nglr.test.ScenarioRunner.prototype = {
+ run:function(){
+ this.setUpUI();
+ this.runScenarios();
+ },
+ setUpUI:function(){
+ this.body.html(
+ '' +
+ '' +
+ '
' +
+ '' +
+ '' +
+ '
');
+ this.console = this.body.find(".console");
+ this.testFrame = this.body.find("iframe");
+ this.console.find(".run").live("click", function(){
+ jQuery(this).parent().find('.log').toggle();
+ });
+ },
+ runScenarios:function(){
+ var runner = new nglr.test.Runner(this.console, this.testFrame);
+ _.stepper(this.scenarios, function(next, scenario, name){
+ new nglr.test.Scenario(name, scenario).run(runner, next);
+ }, function(){
+ }
+ );
+ }
+};
+
+nglr.test.Runner = function(console, frame){
+ this.console = console;
+ this.current = null;
+ this.tests = [];
+ this.frame = frame;
+};
+nglr.test.Runner.prototype = {
+ start:function(name){
+ var current = this.current = {
+ name:name,
+ start:new Date().getTime(),
+ scenario:jQuery('')
+ };
+ current.run = current.scenario.append(
+ '' +
+ '.' +
+ '.' +
+ '.' +
+ '').find(".run");
+ current.log = current.scenario.append('').find(".log");
+ current.run.find(".name").text(name);
+ this.tests.push(current);
+ this.console.append(current.scenario);
+ },
+ end:function(name){
+ var current = this.current;
+ var run = current.run;
+ this.current = null;
+ current.end = new Date().getTime();
+ current.time = current.end - current.start;
+ run.find(".time").text(current.time);
+ run.find(".state").text(current.error ? "FAIL" : "PASS");
+ run.addClass(current.error ? "fail" : "pass");
+ if (current.error)
+ run.find(".run").append('').text(current.error);
+ current.scenario.find(".log").hide();
+ },
+ log:function(level) {
+ var buf = [];
+ for ( var i = 1; i < arguments.length; i++) {
+ var arg = arguments[i];
+ buf.push(typeof arg == "string" ?arg:nglr.toJson(arg));
+ }
+ var log = jQuery('');
+ log.text(buf.join(" "));
+ this.current.log.append(log);
+ this.console.scrollTop(this.console[0].scrollHeight);
+ if (level == "error")
+ this.current.error = buf.join(" ");
+ }
+};
+
+nglr.test.Scenario = function(name, scenario){
+ this.name = name;
+ this.scenario = scenario;
+};
+nglr.test.Scenario.prototype = {
+ run:function(runner, callback) {
+ var self = this;
+ _.stepper(this.scenario, function(next, steps, name){
+ if (name.charAt(0) == '$') {
+ next();
+ } else {
+ runner.start(self.name + "::" + name);
+ var allSteps = (self.scenario.$before||[]).concat(steps);
+ _.stepper(allSteps, function(next, step){
+ self.executeStep(runner, step, next);
+ }, function(){
+ runner.end();
+ next();
+ });
+ }
+ }, callback);
+ },
+ verb:function(step){
+ var fn = null;
+ if (!step) fn = function (){ throw "Step is null!"; }
+ else if (step.Given) fn = angular.test.GIVEN[step.Given];
+ else if (step.When) fn = angular.test.WHEN[step.When];
+ else if (step.Then) fn = angular.test.THEN[step.Then];
+ return fn || function (){
+ throw "ERROR: Need Given/When/Then got: " + nglr.toJson(step);
+ };
+ },
+ context: function(runner) {
+ var frame = runner.frame;
+ var window = frame[0].contentWindow;
+ var document;
+ if (window.jQuery)
+ document = window.jQuery(window.document);
+ var context = {
+ frame:frame,
+ window:window,
+ log:_.bind(runner.log, runner, "info"),
+ document:document,
+ assert:function(element, path){
+ if (element.size() != 1) {
+ throw "Expected to find '1' found '"+
+ element.size()+"' for '"+path+"'.";
+ }
+ return element;
+ },
+ element:function(path){
+ var exp = path.replace("{{","[ng-bind=").replace("}}", "]");
+ var element = document.find(exp);
+ return context.assert(element, path);
+ }
+ };
+ return context;
+ },
+ executeStep:function(runner, step, callback) {
+ if (!step) {
+ callback();
+ return;
+ }
+ runner.log("info", nglr.toJson(step));
+ var fn = this.verb(step);
+ var context = this.context(runner);
+ _.extend(context, step);
+ try {
+ (fn.call(context)||function(c){c();})(callback);
+ } catch (e) {
+ runner.log("error", "ERROR: " + nglr.toJson(e));
+ }
+ }
+};
diff --git a/src/test/Steps.js b/src/test/Steps.js
new file mode 100644
index 00000000..af4b84d6
--- /dev/null
+++ b/src/test/Steps.js
@@ -0,0 +1,57 @@
+angular.test.GIVEN = {
+ browser:function(){
+ var self = this;
+ if (jQuery.browser.safari && this.frame.attr('src') == this.at) {
+ this.window.location.reload();
+ } else {
+ this.frame.attr('src', this.at);
+ }
+ return function(done){
+ self.frame.load(function(){
+ self.frame.unbind();
+ done();
+ });
+ };
+ },
+ dataset:function(){
+ this.frame.name="$DATASET:" + nglr.toJson({dataset:this.dataset});
+ }
+};
+angular.test.WHEN = {
+ enter:function(){
+ var element = this.element(this.at);
+ element.attr('value', this.text);
+ element.change();
+ },
+ click:function(){
+ var element = this.element(this.at);
+ var input = element[0];
+ // emulate the browser behavior which causes it
+ // to be overridden at the end.
+ var checked = input.checked = !input.checked;
+ element.click();
+ input.checked = checked;
+ },
+ select:function(){
+ var element = this.element(this.at);
+ var path = "option[value=" + this.option + "]";
+ var option = this.assert(element.find(path));
+ option[0].selected = !option[0].selected;
+ element.change();
+ }
+};
+angular.test.THEN = {
+ text:function(){
+ var element = this.element(this.at);
+ if (typeof this.should_be != undefined ) {
+ var should_be = this.should_be;
+ if (_.isArray(this.should_be))
+ should_be = JSON.stringify(should_be);
+ if (element.text() != should_be)
+ throw "Expected " + should_be +
+ " but was " + element.text() + ".";
+ }
+ },
+ drainRequestQueue:function(){
+ }
+};
diff --git a/src/test/_namespace.js b/src/test/_namespace.js
new file mode 100644
index 00000000..78f430f1
--- /dev/null
+++ b/src/test/_namespace.js
@@ -0,0 +1,5 @@
+if (!angular) angular = {};
+if (!angular.test) angular.test = {};
+if (!angular.test.GIVEN) angular.test.GIVEN = {};
+if (!angular.test.WHEN) angular.test.WHEN = {};
+if (!angular.test.THEN) angular.test.THEN = {};
--
cgit v1.2.3
From 214c142d9de60a7f53d8c7ada2812ffff4837e0f Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 8 Jan 2010 16:04:35 -0800
Subject: created a way to init the code without autobootstrap
---
src/Binder.js | 17 +++++++++++++----
src/Loader.js | 19 +++++++++++++++++--
src/angular-bootstrap.js | 49 ++++++++++++++++++++++--------------------------
src/test/Runner.js | 18 ++++++++++--------
4 files changed, 62 insertions(+), 41 deletions(-)
(limited to 'src')
diff --git a/src/Binder.js b/src/Binder.js
index 86e99fb8..8b4d27fb 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -103,8 +103,17 @@ nglr.Binder.prototype.updateView = function() {
_.each(this.updateListeners, function(fn) {fn();});
};
+nglr.Binder.prototype.docFindWithSelf = function(exp){
+ var doc = jQuery(this.doc);
+ var selection = doc.find(exp);
+ if (doc.is(exp)){
+ selection = selection.andSelf();
+ }
+ return selection;
+};
+
nglr.Binder.prototype.executeInit = function() {
- jQuery("[ng-init]", this.doc).each(function() {
+ this.docFindWithSelf("[ng-init]").each(function() {
var jThis = jQuery(this);
var scope = jThis.scope();
try {
@@ -116,7 +125,7 @@ nglr.Binder.prototype.executeInit = function() {
};
nglr.Binder.prototype.entity = function (scope) {
- jQuery("[ng-entity]", this.doc).attr("ng-watch", function() {
+ this.docFindWithSelf("[ng-entity]").attr("ng-watch", function() {
try {
var jNode = jQuery(this);
var decl = scope.entity(jNode.attr("ng-entity"));
@@ -131,12 +140,12 @@ nglr.Binder.prototype.compile = function() {
var jNode = jQuery(this.doc);
var self = this;
if (this.config.autoSubmit) {
- var submits = jQuery(":submit", this.doc).not("[ng-action]");
+ 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(), "");
- jQuery("a[ng-action]", this.doc).live('click', function (event) {
+ this.docFindWithSelf("a[ng-action]").live('click', function (event) {
var jNode = jQuery(this);
try {
jNode.scope().eval(jNode.attr('ng-action'));
diff --git a/src/Loader.js b/src/Loader.js
index fdcfa3cc..f7482d24 100644
--- a/src/Loader.js
+++ b/src/Loader.js
@@ -166,7 +166,6 @@ nglr.Loader.prototype.load = function() {
this.loadCss('/stylesheets/jquery-ui/smoothness/jquery-ui-1.7.1.css');
this.loadCss('/stylesheets/nglr.css');
console.log("Server: " + this.config.server);
- jQuery.noConflict();
nglr.msie = jQuery.browser.msie;
this.configureJQueryPlugins();
this.computeConfiguration();
@@ -201,7 +200,7 @@ nglr.Loader.prototype.uid = function() {
nglr.Loader.prototype.computeConfiguration = function() {
var config = this.config;
if (!config.database) {
- var match = config.server.match(/https?:\/\/([\w]*)/)
+ var match = config.server.match(/https?:\/\/([\w]*)/);
config.database = match ? match[1] : "$MEMORY";
}
};
@@ -387,3 +386,19 @@ nglr.UrlWatcher.prototype.setUrl = function(url) {
nglr.UrlWatcher.prototype.getUrl = function() {
return window.location.href;
};
+
+window['angularFactory'] = function(config) {
+ var defaults = {
+ server: ""
+ };
+ //todo: don't load stylesheet by default
+ //todo: don't start watcher
+ function compile(root){
+ var loader = new nglr.Loader(root, jQuery("head"), _(defaults).extend(config));
+ loader.load();
+ return jQuery(root).scope();
+ };
+ return {
+ compile:compile
+ };
+};
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index b7ae6a38..8ac4f9f3 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -39,25 +39,25 @@
};
if (scriptConfig.autoLoadDependencies) {
- addScript("/javascripts/webtoolkit.base64.js");
- addScript("/javascripts/swfobject.js");
- addScript("/javascripts/jQuery/jquery-1.3.2.js");
- addScript("/javascripts/jQuery/jquery-ui-1.7.1.custom.min.js");
- addScript("/javascripts/underscore/underscore.js");
- addScript("/javascripts/nglr/Loader.js");
- addScript("/javascripts/nglr/API.js");
- addScript("/javascripts/nglr/Binder.js");
- addScript("/javascripts/nglr/ControlBar.js");
- addScript("/javascripts/nglr/DataStore.js");
- addScript("/javascripts/nglr/Filters.js");
- addScript("/javascripts/nglr/JSON.js");
- addScript("/javascripts/nglr/Model.js");
- addScript("/javascripts/nglr/Parser.js");
- addScript("/javascripts/nglr/Scope.js");
- addScript("/javascripts/nglr/Server.js");
- addScript("/javascripts/nglr/Users.js");
- addScript("/javascripts/nglr/Validators.js");
- addScript("/javascripts/nglr/Widgets.js");
+ addScript("/../lib/webtoolkit/webtoolkit.base64.js");
+ addScript("/../lib/swfobject/swfobject.js");
+ addScript("/../lib/jquery/jquery-1.3.2.js");
+ addScript("/../lib/jquery/jquery-ui-1.7.1.custom.min.js");
+ addScript("/../lib/underscore/underscore.js");
+ addScript("/Loader.js");
+ addScript("/API.js");
+ addScript("/Binder.js");
+ addScript("/ControlBar.js");
+ addScript("/DataStore.js");
+ addScript("/Filters.js");
+ addScript("/JSON.js");
+ addScript("/Model.js");
+ addScript("/Parser.js");
+ addScript("/Scope.js");
+ addScript("/Server.js");
+ addScript("/Users.js");
+ addScript("/Validators.js");
+ addScript("/Widgets.js");
} else {
addScript("/ajax/libs/swfobject/2.2/swfobject.js", "http://ajax.googleapis.com");
addScript("/ajax/libs/jquery/1.3.2/jquery.min.js", "http://ajax.googleapis.com");
@@ -65,12 +65,6 @@
}
window.onload = function() {
- window.angular.init = function(root, config){
- var cnfgMerged = _.clone(scriptConfig||{});
- _.extend(cnfgMerged, config);
- new nglr.Loader(root, jQuery("head"), cnfgMerged).load();
- };
-
var doc = window.document;
if (scriptConfig.bindRootId) {
doc = null;
@@ -86,12 +80,13 @@
doc = window.document.getElementById(id);
}
}
+ var angular = window.angularFactory(scriptConfig);
if (scriptConfig.autoBind && doc) {
- window.angular.init(doc);
+ window.angularScope = angular.compile(doc);
}
if (typeof previousOnLoad === 'function') {
try {
- previousOnLoad.apply(this, arguments);
+ previousOnLoad.apply(this, arguments);
} catch (e) {}
}
};
diff --git a/src/test/Runner.js b/src/test/Runner.js
index 478ef73e..c7dd431a 100644
--- a/src/test/Runner.js
+++ b/src/test/Runner.js
@@ -1,3 +1,5 @@
+if (!nglr.test) nglr.test = {};
+
nglr.test.ScenarioRunner = function(scenarios, body) {
this.scenarios = scenarios;
this.body = body;
@@ -46,10 +48,10 @@ nglr.test.Runner.prototype = {
scenario:jQuery('')
};
current.run = current.scenario.append(
- '
' +
- '.' +
- '.' +
- '.' +
+ ' iteratorLength; --r) {
+ var unneeded = this.children.pop().element[0];
+ unneeded.parentNode.removeChild(unneeded);
}
- cursor = child.element;
- var s = new Date().getTime();
- child.scope.updateView();
- time += new Date().getTime() - s;
- i++;
- });
- // shrink children
- for ( var r = childrenLength; r > iteratorLength; --r) {
- var unneeded = this.children.pop().element[0];
- unneeded.parentNode.removeChild(unneeded);
- }
- // 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);
+ // 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
//////////////////////////////////
-PopUp = function(doc) {
+function PopUp(doc) {
this.doc = doc;
};
PopUp.OUT_EVENT = "mouseleave mouseout click dblclick keypress keyup";
-PopUp.prototype.bind = function () {
- var self = this;
- this.doc.find('.ng-validation-error,.ng-exception').
- live("mouseover", PopUp.onOver);
-};
-
PopUp.onOver = function(e) {
PopUp.onOut();
var jNode = jQuery(this);
@@ -753,28 +765,38 @@ PopUp.onOut = function() {
return true;
};
+PopUp.prototype = {
+ bind: function () {
+ var self = this;
+ this.doc.find('.ng-validation-error,.ng-exception').
+ live("mouseover", PopUp.onOver);
+ }
+};
+
//////////////////////////////////
// Status
//////////////////////////////////
-Status = function(body) {
+function Status(body) {
this.loader = body.append(Status.DOM).find("#ng-loading");
this.requestCount = 0;
};
Status.DOM ='.*<\/\s*option\s*>/gi)) {
- node.value = node.text;
+ 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'));
}
-};
\ No newline at end of file
+};
--
cgit v1.2.3
From 6431efef8cb6d0c77bf107b09b64b6f013b75965 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 26 Feb 2010 13:08:28 -0800
Subject: corrected repeater not removing when hash(instead of array) shrinks.
---
src/Widgets.js | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
(limited to 'src')
diff --git a/src/Widgets.js b/src/Widgets.js
index 6d7530f0..74f70f21 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -665,29 +665,28 @@ RepeaterUpdater.prototype = {
scope.set(this.iteratorExp, iterator);
}
}
- var iteratorLength = iterator.length;
var childrenLength = this.children.length;
var cursor = this.view;
var time = 0;
var child = null;
var keyExp = this.keyExp;
var valueExp = this.valueExp;
- var i = 0;
+ var iteratorCounter = 0;
foreach(iterator, function(value, key){
- if (i < childrenLength) {
+ if (iteratorCounter < childrenLength) {
// reuse children
- child = self.children[i];
+ child = self.children[iteratorCounter];
child.scope.set(valueExp, value);
} else {
// grow children
var name = self.prefix +
- valueExp + " in " + self.iteratorExp + "[" + i + "]";
+ valueExp + " in " + self.iteratorExp + "[" + iteratorCounter + "]";
var childScope = new Scope(scope.state, name);
- childScope.set('$index', i);
+ childScope.set('$index', iteratorCounter);
if (keyExp)
childScope.set(keyExp, key);
childScope.set(valueExp, value);
- child = { scope:childScope, element:self.template(childScope, self.prefix, i) };
+ child = { scope:childScope, element:self.template(childScope, self.prefix, iteratorCounter) };
cursor.after(child.element);
self.children.push(child);
}
@@ -695,10 +694,10 @@ RepeaterUpdater.prototype = {
var s = new Date().getTime();
child.scope.updateView();
time += new Date().getTime() - s;
- i++;
+ iteratorCounter++;
});
// shrink children
- for ( var r = childrenLength; r > iteratorLength; --r) {
+ for ( var r = childrenLength; r > iteratorCounter; --r) {
this.children.pop().element.remove();
}
// Special case for option in select
--
cgit v1.2.3
From cc71b745c3c821f5e012a363ae3267252a81fddb Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 15 Mar 2010 14:36:50 -0700
Subject: added resources; removed compiled code
---
src/Angular.js | 54 ++++++++++++++++++--------
src/Resource.js | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/Scope.js | 32 ++++++++--------
3 files changed, 172 insertions(+), 31 deletions(-)
create mode 100644 src/Resource.js
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 6cb3f602..9b3634be 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -20,22 +20,23 @@ if (typeof Node == 'undefined') {
function noop() {}
if (!window['console']) window['console']={'log':noop, 'error':noop};
-var consoleNode, msie,
+var consoleNode, msie,
jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
foreach = _.each,
extend = _.extend,
identity = _.identity,
- angular = window['angular'] || (window['angular'] = {}),
- angularValidator = angular['validator'] || (angular['validator'] = {}),
- angularFilter = angular['filter'] || (angular['filter'] = {}),
- angularFormatter = angular['formatter'] || (angular['formatter'] = {}),
+ angular = window['angular'] || (window['angular'] = {}),
+ angularValidator = angular['validator'] || (angular['validator'] = {}),
+ angularFilter = angular['filter'] || (angular['filter'] = {}),
+ angularFormatter = angular['formatter'] || (angular['formatter'] = {}),
angularCallbacks = angular['callbacks'] || (angular['callbacks'] = {}),
angularAlert = angular['alert'] || (angular['alert'] = function(){
- log(arguments); window.alert.apply(window, arguments);
+ log(arguments); window.alert.apply(window, arguments);
});
+angular['copy'] = copy;
var isVisible = isVisible || function (element) {
- return jQuery(element).is(":visible");
+ return jQuery(element).is(":visible");
}
function log(a, b, c){
@@ -101,6 +102,29 @@ function isLeafNode (node) {
}
}
+function copy(source, destination){
+ if (!destination) {
+ if (!source) {
+ return source;
+ } else if (_.isArray(source)) {
+ return copy(source, []);
+ } else {
+ return copy(source, {});
+ }
+ } else {
+ if (_.isArray(source)) {
+ while(destination.length) {
+ destination.pop();
+ }
+ } else {
+ _(destination).each(function(value, key){
+ delete destination[key];
+ });
+ }
+ return $.extend(true, destination, source);
+ }
+};
+
function setHtml(node, html) {
if (isLeafNode(node)) {
if (msie) {
@@ -218,7 +242,7 @@ UrlWatcher.prototype = {
};
pull();
},
-
+
set: function(url) {
var existingURL = this.location.href;
if (!existingURL.match(/#/))
@@ -227,7 +251,7 @@ UrlWatcher.prototype = {
this.location.href = url;
this.existingURL = url;
},
-
+
get: function() {
return window.location.href;
}
@@ -326,10 +350,10 @@ function wireAngular(element, config) {
binder.entity(scope);
binder.compile();
controlBar.bind();
-
+
//TODO: remove this code
new PopUp(element).bind();
-
+
var self = _(exposeMethods(scope, {
'set': scope.set,
'get': scope.get,
@@ -338,8 +362,8 @@ function wireAngular(element, config) {
'init':function(){
config['location']['listen'](_(binder.onUrlChange).bind(binder));
binder.parseAnchor();
- binder.executeInit();
- binder.updateView();
+ binder.executeInit();
+ binder.updateView();
return self;
},
'element':element[0],
@@ -349,7 +373,7 @@ function wireAngular(element, config) {
return self;
}
-angular['startUrlWatcher'] = function(){
+angular['startUrlWatcher'] = function(){
var watcher = new UrlWatcher(window['location']);
watcher.watch();
return exposeMethods(watcher, {'listen':watcher.listen, 'set':watcher.set, 'get':watcher.get});
@@ -366,6 +390,6 @@ angular['compile'] = function(element, config) {
configureLogging(config);
configureJQueryPlugins();
-
+
return wireAngular(jQuery(element), config);
};
diff --git a/src/Resource.js b/src/Resource.js
new file mode 100644
index 00000000..c0c6d220
--- /dev/null
+++ b/src/Resource.js
@@ -0,0 +1,117 @@
+function Route(template, defaults) {
+ this.template = template = template + '#';
+ this.defaults = defaults || {};
+ var urlParams = this.urlParams = {};
+ foreach(template.split(/\W/), function(param){
+ if (param && template.match(new RegExp(":" + param + "\\W"))) {
+ urlParams[param] = true;
+ }
+ });
+}
+
+Route.prototype = {
+ url: function(params) {
+ var path = [];
+ var self = this;
+ var url = this.template;
+ params = params || {};
+ foreach(this.urlParams, function(value, urlParam){
+ var value = params[urlParam] || self.defaults[urlParam] || "";
+ url = url.replace(new RegExp(":" + urlParam + "(\\W)"), value + "$1");
+ });
+ url = url.replace(/\/?#$/, '');
+ var query = [];
+ foreach(params, function(value, key){
+ if (!self.urlParams[key]) {
+ query.push(encodeURI(key) + '=' + encodeURI(value));
+ }
+ });
+ return url + (query.length ? '?' + query.join('&') : '');
+ }
+};
+
+function ResourceFactory(xhr) {
+ this.xhr = xhr;
+}
+
+ResourceFactory.DEFAULT_ACTIONS = {
+ 'get': {method:'GET'},
+ 'save': {method:'POST'},
+ 'query': {method:'GET', isArray:true},
+ 'remove': {method:'DELETE'},
+ 'delete': {method:'DELETE'}
+};
+
+ResourceFactory.prototype = {
+ route: function(url, idPaths, actions){
+ var self = this;
+ var route = new Route(url);
+ actions = $.extend({}, ResourceFactory.DEFAULT_ACTIONS, actions);
+ function extractIds(data){
+ var ids = {};
+ foreach(idPaths, function(path, id){
+ ids[id] = Scope.getter(data, path);
+ });
+ return ids;
+ }
+
+ function Resource(value){
+ copy(value || {}, this);
+ };
+
+ foreach(actions, function(action, name){
+ var isGet = action.method == 'GET';
+ var isPost = action.method == 'POST';
+ Resource[name] = function (a1, a2, a3) {
+ var params = {};
+ var data;
+ var callback = noop;
+ switch(arguments.length) {
+ case 3: callback = a3;
+ case 2:
+ if (typeof a2 == 'function') {
+ callback = a2;
+ } else {
+ params = a1;
+ data = a2;
+ break;
+ }
+ case 1: if (isPost) data = a1; else params = a1; break;
+ case 0: break;
+ default:
+ throw "Expected between 0-3 arguments [params, data, callback], got " + arguments.length + " arguments."
+ }
+
+ var value = action.isArray ? [] : new Resource(data);
+ self.xhr.method(action.method, route.url($.extend({}, action.params || {}, extractIds(data), params)), data, function(response) {
+ if (action.isArray) {
+ foreach(response, function(item){
+ value.push(new Resource(item));
+ });
+ } else {
+ copy(response, value);
+ }
+ (callback||noop)(value);
+ });
+ return value;
+ };
+
+ if (!isGet) {
+ Resource.prototype['$' + name] = function(a1, a2){
+ var params = {};
+ var callback = noop;
+ switch(arguments.length) {
+ case 2: params = a1, callback = a2;
+ case 1: if (typeof a1 == 'function') callback = a1; else params = a1;
+ case 0: break;
+ default:
+ throw "Expected between 1-3 arguments [params, data, callback], got " + arguments.length + " arguments."
+ }
+ Resource[name](params, this, callback);
+ };
+ }
+ });
+ return Resource;
+ }
+};
+
diff --git a/src/Scope.js b/src/Scope.js
index 4de57dd2..daf4b36c 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -53,11 +53,11 @@ Scope.prototype = {
});
});
},
-
+
addWidget: function(controller) {
if (controller) this.widgets.push(controller);
},
-
+
isProperty: function(exp) {
for ( var i = 0; i < exp.length; i++) {
var ch = exp.charAt(i);
@@ -67,12 +67,12 @@ Scope.prototype = {
}
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 element = path.split('.');
@@ -89,11 +89,11 @@ Scope.prototype = {
instance[element.shift()] = value;
return value;
},
-
+
setEval: function(expressionText, value) {
this.eval(expressionText + "=" + toJson(value));
},
-
+
eval: function(expressionText, context) {
// log('Scope.eval', expressionText);
var expression = Scope.expressionCache[expressionText];
@@ -108,7 +108,7 @@ Scope.prototype = {
context.self = this.state;
return expression(context);
},
-
+
//TODO: Refactor. This function needs to be an execution closure for widgets
// move to widgets
// remove expression, just have inner closure.
@@ -126,8 +126,8 @@ Scope.prototype = {
}
return true;
} catch (e){
- error('Eval Widget Error:', e);
var jsonError = toJson(e, true);
+ error('Eval Widget Error:', jsonError);
widget.hasError = true;
jQuery(widget.view).
addClass('ng-exception').
@@ -138,7 +138,7 @@ Scope.prototype = {
return false;
}
},
-
+
validate: function(expressionText, value, element) {
var expression = Scope.expressionCache[expressionText];
if (!expression) {
@@ -148,21 +148,21 @@ Scope.prototype = {
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()({
@@ -178,7 +178,7 @@ Scope.prototype = {
}
});
},
-
+
addWatchListener: function(watchExpression, listener) {
var watcher = this.watchListeners[watchExpression];
if (!watcher) {
@@ -187,7 +187,7 @@ Scope.prototype = {
}
watcher.listeners.push(listener);
},
-
+
fireWatchers: function() {
var self = this;
var fired = false;
@@ -203,4 +203,4 @@ Scope.prototype = {
});
return fired;
}
-};
\ No newline at end of file
+};
--
cgit v1.2.3
From f9f181a33e10bb698ff437bb3939f544ca92e39f Mon Sep 17 00:00:00 2001
From: Adam Abrons
Date: Mon, 15 Mar 2010 15:02:52 -0700
Subject: copy response into resource on save. update jstestdriver
---
src/Resource.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Resource.js b/src/Resource.js
index c0c6d220..bed3def6 100644
--- a/src/Resource.js
+++ b/src/Resource.js
@@ -107,7 +107,11 @@ ResourceFactory.prototype = {
default:
throw "Expected between 1-3 arguments [params, data, callback], got " + arguments.length + " arguments."
}
- Resource[name](params, this, callback);
+ var self = this;
+ Resource[name](params, this, function(response){
+ copy(response, self);
+ callback(self);
+ });
};
}
});
--
cgit v1.2.3
From 79b743e52feb2c57ba0ae42d6d2742bc2189b22f Mon Sep 17 00:00:00 2001
From: Adam Abrons
Date: Mon, 15 Mar 2010 15:57:12 -0700
Subject: resources, with bind()
---
src/Resource.js | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/Resource.js b/src/Resource.js
index bed3def6..c0c7934c 100644
--- a/src/Resource.js
+++ b/src/Resource.js
@@ -43,14 +43,14 @@ ResourceFactory.DEFAULT_ACTIONS = {
};
ResourceFactory.prototype = {
- route: function(url, idPaths, actions){
+ route: function(url, paramDefaults, actions){
var self = this;
var route = new Route(url);
actions = $.extend({}, ResourceFactory.DEFAULT_ACTIONS, actions);
- function extractIds(data){
+ function extractParams(data){
var ids = {};
- foreach(idPaths, function(path, id){
- ids[id] = Scope.getter(data, path);
+ foreach(paramDefaults, function(value, key){
+ ids[key] = value.charAt && value.charAt(0) == '@' ? Scope.getter(data, value.substr(1)) : value;
});
return ids;
}
@@ -83,7 +83,7 @@ ResourceFactory.prototype = {
}
var value = action.isArray ? [] : new Resource(data);
- self.xhr.method(action.method, route.url($.extend({}, action.params || {}, extractIds(data), params)), data, function(response) {
+ self.xhr.method(action.method, route.url($.extend({}, action.params || {}, extractParams(data), params)), data, function(response) {
if (action.isArray) {
foreach(response, function(item){
value.push(new Resource(item));
@@ -96,6 +96,10 @@ ResourceFactory.prototype = {
return value;
};
+ Resource.bind = function(additionalParamDefaults){
+ return self.route(url, $.extend({}, paramDefaults, additionalParamDefaults), actions);
+ };
+
if (!isGet) {
Resource.prototype['$' + name] = function(a1, a2){
var params = {};
--
cgit v1.2.3
From 39c6c5975bedf6e1610f7328a088acda9ab3406a Mon Sep 17 00:00:00 2001
From: Adam Abrons
Date: Mon, 15 Mar 2010 17:02:54 -0700
Subject: get scenarios running again - open Runner.html in a browser to run
them
---
src/scenario/Runner.js | 171 +++++++++++++++++++++++++++++++++++++++++++++
src/scenario/Steps.js | 57 +++++++++++++++
src/scenario/_namespace.js | 6 ++
src/scenario/bootstrap.js | 47 +++++++++++++
src/test/Runner.js | 162 ------------------------------------------
src/test/Steps.js | 57 ---------------
src/test/_namespace.js | 5 --
7 files changed, 281 insertions(+), 224 deletions(-)
create mode 100644 src/scenario/Runner.js
create mode 100644 src/scenario/Steps.js
create mode 100644 src/scenario/_namespace.js
create mode 100644 src/scenario/bootstrap.js
delete mode 100644 src/test/Runner.js
delete mode 100644 src/test/Steps.js
delete mode 100644 src/test/_namespace.js
(limited to 'src')
diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
new file mode 100644
index 00000000..7caddc98
--- /dev/null
+++ b/src/scenario/Runner.js
@@ -0,0 +1,171 @@
+var scenario = angular.scenario;
+scenario.SuiteRunner = function(scenarios, body) {
+ this.scenarios = scenarios;
+ this.body = body;
+};
+
+scenario.SuiteRunner.prototype = {
+ run:function(){
+ this.setUpUI();
+ this.runScenarios();
+ },
+
+
+ setUpUI:function(){
+ this.body.html(
+ '
' +
+ '.' +
+ '.' +
+ '.' +
'').find(".run");
current.log = current.scenario.append('').find(".log");
current.run.find(".name").text(name);
@@ -79,7 +81,7 @@ nglr.test.Runner.prototype = {
log.text(buf.join(" "));
this.current.log.append(log);
this.console.scrollTop(this.console[0].scrollHeight);
- if (level == "error")
+ if (level == "error")
this.current.error = buf.join(" ");
}
};
@@ -114,16 +116,16 @@ nglr.test.Scenario.prototype = {
else if (step.Then) fn = angular.test.THEN[step.Then];
return fn || function (){
throw "ERROR: Need Given/When/Then got: " + nglr.toJson(step);
- };
+ };
},
context: function(runner) {
var frame = runner.frame;
var window = frame[0].contentWindow;
var document;
- if (window.jQuery)
+ if (window.jQuery)
document = window.jQuery(window.document);
var context = {
- frame:frame,
+ frame:frame,
window:window,
log:_.bind(runner.log, runner, "info"),
document:document,
--
cgit v1.2.3
From eb9e66f4804cf417ce142e5515b039db73d31144 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sat, 9 Jan 2010 13:21:24 -0800
Subject: cleanup
---
src/Loader.js | 1 +
1 file changed, 1 insertion(+)
(limited to 'src')
diff --git a/src/Loader.js b/src/Loader.js
index f7482d24..5240944c 100644
--- a/src/Loader.js
+++ b/src/Loader.js
@@ -402,3 +402,4 @@ window['angularFactory'] = function(config) {
compile:compile
};
};
+
--
cgit v1.2.3
From 88eca572fdc7f68a7f384b612052c49de00df433 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sat, 9 Jan 2010 13:43:16 -0800
Subject: change bootstrap to angular.compile
---
src/Loader.js | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
(limited to 'src')
diff --git a/src/Loader.js b/src/Loader.js
index 5240944c..eae6e4f5 100644
--- a/src/Loader.js
+++ b/src/Loader.js
@@ -387,19 +387,15 @@ nglr.UrlWatcher.prototype.getUrl = function() {
return window.location.href;
};
-window['angularFactory'] = function(config) {
+angular['compile'] = function(root, config) {
+ config = config || {};
var defaults = {
server: ""
};
//todo: don't load stylesheet by default
//todo: don't start watcher
- function compile(root){
- var loader = new nglr.Loader(root, jQuery("head"), _(defaults).extend(config));
- loader.load();
- return jQuery(root).scope();
- };
- return {
- compile:compile
- };
+ var loader = new nglr.Loader(root, jQuery("head"), _(defaults).extend(config));
+ loader.load();
+ return jQuery(root).scope();
};
--
cgit v1.2.3
From 9b9a0dadcce82ae42ac09ad396d647739af20a06 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sat, 9 Jan 2010 15:02:43 -0800
Subject: removed nglr namespace
---
src/API.js | 8 +-
src/Binder.js | 106 +++----
src/ControlBar.js | 22 +-
src/DataStore.js | 72 ++---
src/Filters.js | 8 +-
src/JSON.js | 20 +-
src/Loader.js | 145 ++++-----
src/Model.js | 26 +-
src/Parser.js | 116 +++----
src/Scope.js | 62 ++--
src/Server.js | 32 +-
src/Users.js | 8 +-
src/Validators.js | 2 +-
src/Widgets.js | 244 +++++++--------
src/Widgets.js.orig | 764 -----------------------------------------------
src/XSitePost.js | 100 -------
src/angular-bootstrap.js | 3 +-
src/angular.prefix | 2 +
src/angular.suffix | 1 +
src/test/Runner.js | 26 +-
src/test/Steps.js | 2 +-
21 files changed, 455 insertions(+), 1314 deletions(-)
delete mode 100644 src/Widgets.js.orig
delete mode 100644 src/XSitePost.js
create mode 100644 src/angular.prefix
create mode 100644 src/angular.suffix
(limited to 'src')
diff --git a/src/API.js b/src/API.js
index c51fe01d..6fb6e8fc 100644
--- a/src/API.js
+++ b/src/API.js
@@ -66,7 +66,7 @@ angular.Array = {
}
return true;
};
- var getter = nglr.Scope.getter;
+ var getter = Scope.getter;
var search = function(obj, text){
if (text.charAt(0) === '!') {
return !search(obj, text.substr(1));
@@ -147,7 +147,7 @@ angular.Array = {
},
orderBy:function(array, expression, descend) {
function reverse(comp, descending) {
- return nglr.toBoolean(descending) ?
+ return toBoolean(descending) ?
function(a,b){return comp(b,a);} : comp;
}
function compare(v1, v2){
@@ -224,7 +224,7 @@ angular.Array = {
value = {};
array[index] = value;
}
- nglr.merge(mergeValue, value);
+ merge(mergeValue, value);
return array;
}
};
@@ -281,7 +281,7 @@ angular.Function = {
if (_.isFunction(expression)){
return expression;
} else if (expression){
- var scope = new nglr.Scope();
+ var scope = new Scope();
return function($) {
scope.state = $;
return scope.eval(expression);
diff --git a/src/Binder.js b/src/Binder.js
index 8b4d27fb..3589cb88 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -1,5 +1,5 @@
// Copyright (C) 2009 BRAT Tech LLC
-nglr.Binder = function(doc, widgetFactory, urlWatcher, config) {
+Binder = function(doc, widgetFactory, urlWatcher, config) {
this.doc = doc;
this.urlWatcher = urlWatcher;
this.anchor = {};
@@ -8,7 +8,7 @@ nglr.Binder = function(doc, widgetFactory, urlWatcher, config) {
this.updateListeners = [];
};
-nglr.Binder.parseBindings = function(string) {
+Binder.parseBindings = function(string) {
var results = [];
var lastIndex = 0;
var index;
@@ -28,18 +28,18 @@ nglr.Binder.parseBindings = function(string) {
return results.length === 0 ? [ string ] : results;
};
-nglr.Binder.hasBinding = function(string) {
- var bindings = nglr.Binder.parseBindings(string);
- return bindings.length > 1 || nglr.Binder.binding(bindings[0]) !== null;
+Binder.hasBinding = function(string) {
+ var bindings = Binder.parseBindings(string);
+ return bindings.length > 1 || Binder.binding(bindings[0]) !== null;
};
-nglr.Binder.binding = function(string) {
+Binder.binding = function(string) {
var binding = string.replace(/\n/gm, ' ').match(/^\{\{(.*)\}\}$/);
return binding ? binding[1] : null;
};
-nglr.Binder.prototype.parseQueryString = function(query) {
+Binder.prototype.parseQueryString = function(query) {
var params = {};
query.replace(/(?:^|&)([^&=]*)=?([^&]*)/g,
function (match, left, right) {
@@ -48,7 +48,7 @@ nglr.Binder.prototype.parseQueryString = function(query) {
return params;
};
-nglr.Binder.prototype.parseAnchor = function(url) {
+Binder.prototype.parseAnchor = function(url) {
var self = this;
url = url || this.urlWatcher.getUrl();
@@ -65,13 +65,13 @@ nglr.Binder.prototype.parseAnchor = function(url) {
});
};
-nglr.Binder.prototype.onUrlChange = function (url) {
+Binder.prototype.onUrlChange = function (url) {
console.log("URL change detected", url);
this.parseAnchor(url);
this.updateView();
};
-nglr.Binder.prototype.updateAnchor = function() {
+Binder.prototype.updateAnchor = function() {
var url = this.urlWatcher.getUrl();
var anchorIndex = url.indexOf('#');
if (anchorIndex > -1)
@@ -93,7 +93,7 @@ nglr.Binder.prototype.updateAnchor = function() {
return url;
};
-nglr.Binder.prototype.updateView = function() {
+Binder.prototype.updateView = function() {
var start = new Date().getTime();
var scope = jQuery(this.doc).scope();
scope.set("$invalidWidgets", []);
@@ -103,7 +103,7 @@ nglr.Binder.prototype.updateView = function() {
_.each(this.updateListeners, function(fn) {fn();});
};
-nglr.Binder.prototype.docFindWithSelf = function(exp){
+Binder.prototype.docFindWithSelf = function(exp){
var doc = jQuery(this.doc);
var selection = doc.find(exp);
if (doc.is(exp)){
@@ -112,31 +112,31 @@ nglr.Binder.prototype.docFindWithSelf = function(exp){
return selection;
};
-nglr.Binder.prototype.executeInit = function() {
+Binder.prototype.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) {
- nglr.alert("EVAL ERROR:\n" + jThis.attr('ng-init') + '\n' + nglr.toJson(e, true));
+ alert("EVAL ERROR:\n" + jThis.attr('ng-init') + '\n' + toJson(e, true));
}
});
};
-nglr.Binder.prototype.entity = function (scope) {
+Binder.prototype.entity = function (scope) {
this.docFindWithSelf("[ng-entity]").attr("ng-watch", function() {
try {
var jNode = jQuery(this);
var decl = scope.entity(jNode.attr("ng-entity"));
return decl + (jNode.attr('ng-watch') || "");
} catch (e) {
- nglr.alert(e);
+ alert(e);
}
});
};
-nglr.Binder.prototype.compile = function() {
+Binder.prototype.compile = function() {
var jNode = jQuery(this.doc);
var self = this;
if (this.config.autoSubmit) {
@@ -153,37 +153,37 @@ nglr.Binder.prototype.compile = function() {
jNode.removeClass("ng-exception");
} catch (e) {
jNode.addClass("ng-exception");
- jNode.attr('ng-error', nglr.toJson(e, true));
+ jNode.attr('ng-error', toJson(e, true));
}
self.updateView();
return false;
});
};
-nglr.Binder.prototype.translateBinding = function(node, parentPath, factories) {
+Binder.prototype.translateBinding = function(node, parentPath, factories) {
var path = parentPath.concat();
var offset = path.pop();
- var parts = nglr.Binder.parseBindings(node.nodeValue);
- if (parts.length > 1 || nglr.Binder.binding(parts[0])) {
+ var parts = Binder.parseBindings(node.nodeValue);
+ if (parts.length > 1 || Binder.binding(parts[0])) {
var parent = node.parentNode;
- if (nglr.isLeafNode(parent)) {
+ if (isLeafNode(parent)) {
parent.setAttribute('ng-bind-template', node.nodeValue);
factories.push({path:path, fn:function(node, scope, prefix) {
- return new nglr.BindUpdater(node, node.getAttribute('ng-bind-template'));
+ return new BindUpdater(node, node.getAttribute('ng-bind-template'));
}});
} else {
for (var i = 0; i < parts.length; i++) {
var part = parts[i];
- var binding = nglr.Binder.binding(part);
+ 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:nglr.Binder.prototype.ng_bind});
+ factories.push({path:path.concat(offset + i), fn:Binder.prototype.ng_bind});
}
- } else if (nglr.msie && part.charAt(0) == ' ') {
+ } else if (msie && part.charAt(0) == ' ') {
newNode = document.createElement("span");
newNode.innerHTML = ' ' + part.substring(1);
} else {
@@ -196,7 +196,7 @@ nglr.Binder.prototype.translateBinding = function(node, parentPath, factories) {
}
};
-nglr.Binder.prototype.precompile = function(root) {
+Binder.prototype.precompile = function(root) {
var factories = [];
this.precompileNode(root, [], factories);
return function (template, scope, prefix) {
@@ -211,13 +211,13 @@ nglr.Binder.prototype.precompile = function(root) {
try {
scope.addWidget(factory.fn(node, scope, prefix));
} catch (e) {
- nglr.alert(e);
+ alert(e);
}
}
};
};
-nglr.Binder.prototype.precompileNode = function(node, path, factories) {
+Binder.prototype.precompileNode = function(node, path, factories) {
var nodeType = node.nodeType;
if (nodeType == Node.TEXT_NODE) {
this.translateBinding(node, path, factories);
@@ -234,19 +234,19 @@ nglr.Binder.prototype.precompileNode = function(node, path, factories) {
if (attributes) {
var bindings = node.getAttribute('ng-bind-attr');
node.removeAttribute('ng-bind-attr');
- bindings = bindings ? nglr.fromJson(bindings) : {};
+ 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 = nglr.msie && attrName == 'href' ?
+ var attrValue = msie && attrName == 'href' ?
decodeURI(node.getAttribute(attrName, 2)) : attr.value;
- if (nglr.Binder.hasBinding(attrValue)) {
+ if (Binder.hasBinding(attrValue)) {
bindings[attrName] = attrValue;
}
}
- var json = nglr.toJson(bindings);
+ var json = toJson(bindings);
if (json.length > 2) {
node.setAttribute("ng-bind-attr", json);
}
@@ -270,7 +270,7 @@ nglr.Binder.prototype.precompileNode = function(node, path, factories) {
return clone;
};
factories.push({path:path, fn:function(node, scope, prefix) {
- return new nglr.RepeaterUpdater(jQuery(node), repeaterExpression, template, prefix);
+ return new RepeaterUpdater(jQuery(node), repeaterExpression, template, prefix);
}});
return;
}
@@ -309,42 +309,42 @@ nglr.Binder.prototype.precompileNode = function(node, path, factories) {
}
};
-nglr.Binder.prototype.ng_eval = function(node) {
- return new nglr.EvalUpdater(node, node.getAttribute('ng-eval'));
+Binder.prototype.ng_eval = function(node) {
+ return new EvalUpdater(node, node.getAttribute('ng-eval'));
};
-nglr.Binder.prototype.ng_bind = function(node) {
- return new nglr.BindUpdater(node, "{{" + node.getAttribute('ng-bind') + "}}");
+Binder.prototype.ng_bind = function(node) {
+ return new BindUpdater(node, "{{" + node.getAttribute('ng-bind') + "}}");
};
-nglr.Binder.prototype.ng_bind_attr = function(node) {
- return new nglr.BindAttrUpdater(node, nglr.fromJson(node.getAttribute('ng-bind-attr')));
+Binder.prototype.ng_bind_attr = function(node) {
+ return new BindAttrUpdater(node, fromJson(node.getAttribute('ng-bind-attr')));
};
-nglr.Binder.prototype.ng_hide = function(node) {
- return new nglr.HideUpdater(node, node.getAttribute('ng-hide'));
+Binder.prototype.ng_hide = function(node) {
+ return new HideUpdater(node, node.getAttribute('ng-hide'));
};
-nglr.Binder.prototype.ng_show = function(node) {
- return new nglr.ShowUpdater(node, node.getAttribute('ng-show'));
+Binder.prototype.ng_show = function(node) {
+ return new ShowUpdater(node, node.getAttribute('ng-show'));
};
-nglr.Binder.prototype.ng_class = function(node) {
- return new nglr.ClassUpdater(node, node.getAttribute('ng-class'));
+Binder.prototype.ng_class = function(node) {
+ return new ClassUpdater(node, node.getAttribute('ng-class'));
};
-nglr.Binder.prototype.ng_class_even = function(node) {
- return new nglr.ClassEvenUpdater(node, node.getAttribute('ng-class-even'));
+Binder.prototype.ng_class_even = function(node) {
+ return new ClassEvenUpdater(node, node.getAttribute('ng-class-even'));
};
-nglr.Binder.prototype.ng_class_odd = function(node) {
- return new nglr.ClassOddUpdater(node, node.getAttribute('ng-class-odd'));
+Binder.prototype.ng_class_odd = function(node) {
+ return new ClassOddUpdater(node, node.getAttribute('ng-class-odd'));
};
-nglr.Binder.prototype.ng_style = function(node) {
- return new nglr.StyleUpdater(node, node.getAttribute('ng-style'));
+Binder.prototype.ng_style = function(node) {
+ return new StyleUpdater(node, node.getAttribute('ng-style'));
};
-nglr.Binder.prototype.ng_watch = function(node, scope) {
+Binder.prototype.ng_watch = function(node, scope) {
scope.watch(node.getAttribute('ng-watch'));
};
diff --git a/src/ControlBar.js b/src/ControlBar.js
index 3e1f0b57..b66a1464 100644
--- a/src/ControlBar.js
+++ b/src/ControlBar.js
@@ -1,16 +1,16 @@
// Copyright (C) 2008,2009 BRAT Tech LLC
-nglr.ControlBar = function (document, serverUrl) {
+ControlBar = function (document, serverUrl) {
this.document = document;
this.serverUrl = serverUrl;
this.window = window;
this.callbacks = [];
};
-nglr.ControlBar.prototype.bind = function () {
+ControlBar.prototype.bind = function () {
};
-nglr.ControlBar.HTML =
+ControlBar.HTML =
'' +
- '' +
- '' +
- '' +
- '' +
- '');
-};
-
-nglr.FileController.prototype._on_cancel = function() {
-};
-
-nglr.FileController.prototype._on_complete = function() {
-};
-
-nglr.FileController.prototype._on_httpStatus = function(status) {
- nglr.alert("httpStatus:" + this.scopeName + " status:" + status);
-};
-
-nglr.FileController.prototype._on_ioError = function() {
- nglr.alert("ioError:" + this.scopeName);
-};
-
-nglr.FileController.prototype._on_open = function() {
- nglr.alert("open:" + this.scopeName);
-};
-
-nglr.FileController.prototype._on_progress = function(bytesLoaded, bytesTotal) {
-};
-
-nglr.FileController.prototype._on_securityError = function() {
- nglr.alert("securityError:" + this.scopeName);
-};
-
-nglr.FileController.prototype._on_uploadCompleteData = function(data) {
- this.value = nglr.fromJson(data);
- this.value.url = this.attachmentBase + '/' + this.value.id + '/' + this.value.text;
- this.view.find("input").attr('checked', true);
- var scope = this.view.scope();
- this.updateModel(scope);
- scope.get('$binder').updateView();
-};
-
-nglr.FileController.prototype._on_select = function(name, size, type) {
- this.name = name;
- this.view.find("a").text(name).attr('href', name);
- this.view.find("span").text(filters.bytes(size));
- this.upload();
-};
-
-nglr.FileController.prototype.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;
- }
-};
-
-nglr.FileController.prototype.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.name);
- this.view.find("span").text(filters.bytes(this.value.size));
- }
- this.view.find("input").attr('checked', !!modelValue);
-};
-
-nglr.FileController.prototype.upload = function() {
- if (this.name) {
- this.uploader.uploadFile(this.uploadUrl);
- }
-};
-
-
-///////////////////////
-// NullController
-///////////////////////
-nglr.NullController = function(view) {this.view = view;};
-nglr.NullController.prototype.updateModel = function() { return true; };
-nglr.NullController.prototype.updateView = function() { };
-nglr.NullController.instance = new nglr.NullController();
-
-
-///////////////////////
-// ButtonController
-///////////////////////
-nglr.ButtonController = function(view) {this.view = view;};
-nglr.ButtonController.prototype.updateModel = function(scope) { return true; };
-nglr.ButtonController.prototype.updateView = function(scope) {};
-
-///////////////////////
-// TextController
-///////////////////////
-nglr.TextController = function(view, exp) {
- this.view = view;
- 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 = view.value;
- var widget = view.getAttribute('ng-widget');
- if (widget === 'datepicker') {
- jQuery(view).datepicker();
- }
-};
-
-nglr.TextController.prototype.updateModel = function(scope) {
- var value = this.view.value;
- if (this.lastValue === value) {
- return false;
- } else {
- scope.set(this.exp, value);
- this.lastValue = value;
- return true;
- }
-};
-
-nglr.TextController.prototype.updateView = function(scope) {
- var view = this.view;
- var value = scope.get(this.exp);
- if (typeof value === "undefined") {
- value = this.initialValue;
- scope.set(this.exp, value);
- }
- value = value ? value : '';
- if (this.lastValue != value) {
- view.value = value;
- this.lastValue = value;
- }
- var isValidationError = false;
- view.removeAttribute('ng-error');
- if (this.required) {
- isValidationError = !(value && value.length > 0);
- }
- var errorText = isValidationError ? "Required Value" : null;
- if (!isValidationError && this.validator && value) {
- errorText = scope.validate(this.validator, value);
- isValidationError = !!errorText;
- }
- if (this.lastErrorText !== errorText) {
- this.lastErrorText = isValidationError;
- if (errorText !== null) {
- view.setAttribute('ng-error', errorText);
- scope.markInvalid(this);
- }
- jQuery(view).toggleClass('ng-validation-error', isValidationError);
- }
-};
-
-///////////////////////
-// CheckboxController
-///////////////////////
-nglr.CheckboxController = function(view, exp) {
- this.view = view;
- this.exp = exp;
- this.lastValue = undefined;
- this.initialValue = view.checked ? view.value : "";
-};
-
-nglr.CheckboxController.prototype.updateModel = function(scope) {
- var input = this.view;
- var value = input.checked ? input.value : '';
- if (this.lastValue === value) {
- return false;
- } else {
- scope.setEval(this.exp, value);
- this.lastValue = value;
- return true;
- }
-};
-
-nglr.CheckboxController.prototype.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 = input.value == (''+value);
-};
-
-///////////////////////
-// SelectController
-///////////////////////
-nglr.SelectController = function(view, exp) {
- this.view = view;
- this.exp = exp;
- this.lastValue = undefined;
- this.initialValue = view.value;
-};
-
-nglr.SelectController.prototype.updateModel = function(scope) {
- var input = this.view;
- if (input.selectedIndex < 0) {
- scope.set(this.exp, null);
- } else {
- var value = this.view.value;
- if (this.lastValue === value) {
- return false;
- } else {
- scope.set(this.exp, value);
- this.lastValue = value;
- return true;
- }
- }
-};
-
-nglr.SelectController.prototype.updateView = function(scope) {
- var input = this.view;
- var value = scope.get(this.exp);
- if (typeof value === 'undefined') {
- value = this.initialValue;
- scope.set(this.exp, value);
- }
- if (value !== this.lastValue) {
- input.value = value ? value : "";
- this.lastValue = value;
- }
-};
-
-///////////////////////
-// MultiSelectController
-///////////////////////
-nglr.MultiSelectController = function(view, exp) {
- this.view = view;
- this.exp = exp;
- this.lastValue = undefined;
- this.initialValue = this.selected();
-};
-
-nglr.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;
-};
-
-nglr.MultiSelectController.prototype.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.set(this.exp, value);
- this.lastValue = value;
- return true;
- }
-};
-
-nglr.MultiSelectController.prototype.updateView = function(scope) {
- var input = this.view;
- var selected = scope.get(this.exp);
- if (typeof selected === "undefined") {
- selected = this.initialValue;
- scope.set(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 = selected.contains(option.value);
- }
- this.lastValue = selected;
- }
-};
-
-///////////////////////
-// RadioController
-///////////////////////
-nglr.RadioController = function(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;
-};
-
-nglr.RadioController.prototype.updateModel = function(scope) {
- var input = this.view;
- if (this.lastChecked) {
- return false;
- } else {
- input.checked = true;
- this.lastValue = scope.set(this.exp, this.inputValue);
- this.lastChecked = true;
- return true;
- }
-};
-
-nglr.RadioController.prototype.updateView = function(scope) {
- var input = this.view;
- var value = scope.get(this.exp);
- if (this.initialValue && typeof value === "undefined") {
- value = this.initialValue;
- scope.set(this.exp, value);
- }
- if (this.lastValue != value) {
- this.lastChecked = input.checked = this.inputValue == (''+value);
- this.lastValue = value;
- }
-};
-
-///////////////////////
-//ElementController
-///////////////////////
-nglr.BindUpdater = function(view, exp) {
- this.view = view;
- this.exp = exp.parseBindings();
- this.hasError = false;
- this.scopeSelf = {element:view};
-};
-
-nglr.BindUpdater.toText = function(obj) {
- var e = nglr.escapeHtml;
- switch(typeof obj) {
- case "string":
- case "boolean":
- case "number":
- return e(obj);
- case "function":
- return nglr.BindUpdater.toText(obj());
- case "object":
- if (nglr.isNode(obj)) {
- return nglr.outerHTML(obj);
- } else if (obj && obj.TAG === filters.Meta.TAG) {
- switch(typeof obj.html) {
- case "string":
- case "number":
- return obj.html;
- case "function":
- return 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(nglr.toJson(obj, true));
- default:
- return "";
- }
-};
-
-nglr.BindUpdater.prototype.updateModel = function(scope) {};
-nglr.BindUpdater.prototype.updateView = function(scope) {
- var html = [];
- var parts = this.exp;
- var length = parts.length;
- for(var i=0; i iteratorLength; --r) {
- var unneeded = this.children.pop();
- unneeded.element.removeNode();
- }
- // 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
-//////////////////////////////////
-
-nglr.PopUp = function(doc) {
- this.doc = doc;
-};
-
-nglr.PopUp.OUT_EVENT = "mouseleave mouseout click dblclick keypress keyup";
-
-nglr.PopUp.prototype.bind = function () {
- var self = this;
- this.doc.find('.ng-validation-error,.ng-exception').
- live("mouseover", nglr.PopUp.onOver);
-};
-
-nglr.PopUp.onOver = function(e) {
- nglr.PopUp.onOut();
- var jNode = jQuery(this);
- jNode.bind(nglr.PopUp.OUT_EVENT, nglr.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(
- "
'});
- }
- return null;
-};
-
-angular.filter.lowercase = function (obj) {
- var text = angular.filter.Meta.get(obj);
- return text ? ("" + text).toLowerCase() : text;
-};
-
-angular.filter.uppercase = function (obj) {
- var text = angular.filter.Meta.get(obj);
- return text ? ("" + text).toUpperCase() : text;
-};
-
-angular.filter.linecount = function (obj) {
- var text = angular.filter.Meta.get(obj);
- if (text==='' || !text) return 1;
- return text.split(/\n|\f/).length;
-};
-
-angular.filter['if'] = function (result, expression) {
- return expression ? result : undefined;
-};
-
-angular.filter.unless = function (result, expression) {
- return expression ? undefined : result;
-};
-
-angular.filter.googleChartApi = function(type, data, width, height) {
- data = data || {};
- var api = angular.filter.googleChartApi;
- var chart = {
- cht:type,
- chco:api.collect(data, 'color'),
- chtt:api.title(data),
- chdl:api.collect(data, 'label'),
- chd:api.values(data),
- chf:'bg,s,FFFFFF00'
- };
- if (_.isArray(data.xLabels)) {
- chart.chxt='x';
- chart.chxl='0:|' + data.xLabels.join('|');
- }
- return angular.filter.googleChartApi.encode(chart, width, height);
-};
-
-angular.filter.googleChartApi.values = function(data){
- var seriesValues = [];
- _.each(data.series||[], function(serie){
- var values = [];
- _.each(serie.values||[], function(value){
- values.push(value);
- });
- seriesValues.push(values.join(','));
- });
- var values = seriesValues.join('|');
- return values === "" ? null : "t:" + values;
-};
-
-angular.filter.googleChartApi.title = function(data){
- var titles = [];
- var title = data.title || [];
- _.each(_.isArray(title)?title:[title], function(text){
- titles.push(encodeURIComponent(text));
- });
- return titles.join('|');
-};
-
-angular.filter.googleChartApi.collect = function(data, key){
- var outterValues = [];
- var count = 0;
- _.each(data.series||[], function(serie){
- var innerValues = [];
- var value = serie[key] || [];
- _.each(_.isArray(value)?value:[value], function(color){
- innerValues.push(encodeURIComponent(color));
- count++;
+ return text;
+ },
+
+ 'date': function(amount) {
+ },
+
+ 'json': function(object) {
+ jQuery(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 (regexp.test(tNo)) {
+ var text = carrier.name + ": " + trackingNo;
+ var url = carrier.url + trackingNo;
+ returnValue = new angularFilter.Meta({
+ text:text,
+ url:url,
+ html: '' + text + '',
+ trackingNo:trackingNo});
+ _.breakLoop();
+ }
+ });
+ if (returnValue) _.breakLoop();
});
- outterValues.push(innerValues.join('|'));
- });
- return count?outterValues.join(','):null;
-};
-
-angular.filter.googleChartApi.encode= function(params, width, height) {
- width = width || 200;
- height = height || width;
- var url = "http://chart.apis.google.com/chart?";
- var urlParam = [];
- params.chs = width + "x" + height;
- for ( var key in params) {
- var value = params[key];
- if (value) {
- urlParam.push(key + "=" + value);
+ if (returnValue)
+ return returnValue;
+ else if (trackingNo)
+ return noMatch || new angularFilter.Meta({text:trackingNo + " is not recognized"});
+ else
+ return null;
+ };})(),
+
+ 'link': function(obj, title) {
+ var text = title || angularFilter.Meta.get(obj);
+ var url = angularFilter.Meta.get(obj, "url") || angularFilter.Meta.get(obj);
+ if (url) {
+ if (angular.validator.email(url) === null) {
+ url = "mailto:" + url;
+ }
+ var html = '' + text + '';
+ return new angularFilter.Meta({text:text, url:url, html:html});
}
- }
- urlParam.sort();
- url += urlParam.join("&");
- return new angular.filter.Meta({url:url, text:value,
- html:'
'});
-};
-
-angular.filter.qrcode = function(value, width, height) {
- return angular.filter.googleChartApi.encode({cht:'qr', chl:encodeURIComponent(value)}, width, height);
-};
-angular.filter.chart = {
- pie:function(data, width, height) {
- return angular.filter.googleChartApi('p', data, width, height);
+ return obj;
},
- pie3d:function(data, width, height) {
- return angular.filter.googleChartApi('p3', data, width, height);
+
+
+ '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 = "";
+ if (width) {
+ style = ' style="max-width: ' + width +
+ 'px; max-height: ' + (height || width) + 'px;"';
+ }
+ return new angularFilter.Meta({url:obj.url, text:obj.url,
+ html:''});
+ }
+ return null;
},
- pieConcentric:function(data, width, height) {
- return angular.filter.googleChartApi('pc', data, width, height);
+
+ 'lowercase': function (obj) {
+ var text = angularFilter.Meta.get(obj);
+ return text ? ("" + text).toLowerCase() : text;
},
- barHorizontalStacked:function(data, width, height) {
- return angular.filter.googleChartApi('bhs', data, width, height);
+
+ 'uppercase': function (obj) {
+ var text = angularFilter.Meta.get(obj);
+ return text ? ("" + text).toUpperCase() : text;
},
- barHorizontalGrouped:function(data, width, height) {
- return angular.filter.googleChartApi('bhg', data, width, height);
+
+ 'linecount': function (obj) {
+ var text = angularFilter.Meta.get(obj);
+ if (text==='' || !text) return 1;
+ return text.split(/\n|\f/).length;
},
- barVerticalStacked:function(data, width, height) {
- return angular.filter.googleChartApi('bvs', data, width, height);
+
+ 'if': function (result, expression) {
+ return expression ? result : undefined;
},
- barVerticalGrouped:function(data, width, height) {
- return angular.filter.googleChartApi('bvg', data, width, height);
+
+ 'unless': function (result, expression) {
+ return expression ? undefined : result;
},
- line:function(data, width, height) {
- return angular.filter.googleChartApi('lc', data, width, height);
+
+ '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('|');
+ },
+
+ '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;
+ },
+
+ 'encode': function(params, width, height) {
+ width = width || 200;
+ height = height || width;
+ var url = "http://chart.apis.google.com/chart?";
+ var urlParam = [];
+ params.chs = width + "x" + height;
+ foreach(params, function(value, key){
+ if (value) {
+ urlParam.push(key + "=" + value);
+ }
+ });
+ urlParam.sort();
+ url += urlParam.join("&");
+ return new angularFilter.Meta({url:url,
+ html:''});
+ }
+ }
+ ),
+
+
+ 'qrcode': function(value, width, height) {
+ return angularFilterGoogleChartApi['encode']({cht:'qr', chl:encodeURIComponent(value)}, width, height);
},
- sparkline:function(data, width, height) {
- return angular.filter.googleChartApi('ls', data, 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);
+ }
},
- scatter:function(data, width, height) {
- return angular.filter.googleChartApi('s', data, width, height);
+
+ 'html': function(html){
+ return new angularFilter.Meta({html:html});
}
-};
+}, function(v,k){angularFilter[k] = v;});
-angular.filter.html = function(html){
- return new angular.filter.Meta({html:html});
-};
+angularFilterGoogleChartApi = angularFilter['googleChartApi'];
diff --git a/src/JSON.js b/src/JSON.js
index 238ed489..14fce1fb 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -17,7 +17,7 @@ fromJson = function(json) {
parser.assertAllConsumed();
return expression();
} catch (e) {
- console.error("fromJson error: ", json, e);
+ error("fromJson error: ", json, e);
throw e;
}
};
diff --git a/src/Loader.js b/src/Loader.js
index 19840567..104dfec8 100644
--- a/src/Loader.js
+++ b/src/Loader.js
@@ -3,8 +3,7 @@
// IE compatibility
if (typeof document.getAttribute == 'undefined')
- document.getAttribute = function() {
- };
+ document.getAttribute = function() {};
if (typeof Node == 'undefined') {
Node = {
ELEMENT_NODE : 1,
@@ -22,25 +21,26 @@ if (typeof Node == 'undefined') {
};
}
-var callbacks = {};
-var jQuery = window['jQuery'];
-var msie = jQuery['browser']['msie'];
-
-if (!window.angular){ angular = {}; window['angular'] = angular; }
-if (!angular.validator) angular.validator = {};
-if (!angular.filter) angular.filter = {};
-if (!window.console)
- window.console = {
- log:function() {},
- error:function() {}
- };
-if (!angular.alert) {
- angular.alert = function(){console.log(arguments); window.alert.apply(window, arguments); };
-}
-
-var consoleNode;
-
-consoleLog = function(level, objs) {
+function noop() {}
+if (!window['console']) window['console']={'log':noop, 'error':noop};
+
+var consoleNode,
+ foreach = _.each,
+ extend = _.extend,
+ jQuery = window['jQuery'],
+ msie = jQuery['browser']['msie'],
+ log = function(){window['console']['log'].apply(this, arguments);},
+ error = function(){window['console']['error'].apply(this, arguments);},
+ angular = window['angular'] || (window['angular'] = {}),
+ angularValidator = angular['validator'] || (angular['validator'] = {}),
+ angularFilter = angular['filter'] || (angular['filter'] = {}),
+ angularCallbacks = angular['callbacks'] || (angular['callbacks'] = {}),
+ angularAlert = angular['alert'] || (angular['alert'] = function(){
+ log(arguments); window.alert.apply(window, arguments);
+ });
+
+
+function consoleLog(level, objs) {
var log = document.createElement("div");
log.className = level;
var msg = "";
@@ -52,17 +52,17 @@ consoleLog = function(level, objs) {
}
log.appendChild(document.createTextNode(msg));
consoleNode.appendChild(log);
-};
+}
-isNode = function(inp) {
+function isNode(inp) {
return inp &&
inp.tagName &&
inp.nodeName &&
inp.ownerDocument &&
inp.removeAttribute;
-};
+}
-isLeafNode = function(node) {
+function isLeafNode (node) {
switch (node.nodeName) {
case "OPTION":
case "PRE":
@@ -71,11 +71,9 @@ isLeafNode = function(node) {
default:
return false;
}
-};
+}
-noop = function() {
-};
-setHtml = function(node, html) {
+function setHtml(node, html) {
if (isLeafNode(node)) {
if (msie) {
node.innerText = html;
@@ -85,25 +83,25 @@ setHtml = function(node, html) {
} else {
node.innerHTML = html;
}
-};
+}
-escapeHtml = function(html) {
+function escapeHtml(html) {
if (!html || !html.replace)
return html;
return html.
replace(/&/g, '&').
replace(//g, '>');
-};
+}
-escapeAttr = function(html) {
+function escapeAttr(html) {
if (!html || !html.replace)
return html;
return html.replace(//g, '>').replace(/\"/g,
'"');
-};
+}
-bind = function(_this, _function) {
+function bind(_this, _function) {
if (!_this)
throw "Missing this";
if (!_.isFunction(_function))
@@ -111,9 +109,9 @@ bind = function(_this, _function) {
return function() {
return _function.apply(_this, arguments);
};
-};
+}
-shiftBind = function(_this, _function) {
+function shiftBind(_this, _function) {
return function() {
var args = [ this ];
for ( var i = 0; i < arguments.length; i++) {
@@ -121,28 +119,28 @@ shiftBind = function(_this, _function) {
}
return _function.apply(_this, args);
};
-};
+}
-outerHTML = function(node) {
+function outerHTML(node) {
var temp = document.createElement('div');
temp.appendChild(node);
var outerHTML = temp.innerHTML;
temp.removeChild(node);
return outerHTML;
-};
+}
-trim = function(str) {
+function trim(str) {
return str.replace(/^ */, '').replace(/ *$/, '');
-};
+}
-toBoolean = function(value) {
+function toBoolean(value) {
var v = ("" + value).toLowerCase();
if (v == 'f' || v == '0' || v == 'false' || v == 'no')
value = false;
return !!value;
-};
+}
-merge = function(src, dst) {
+function merge(src, dst) {
for ( var key in src) {
var value = dst[key];
var type = typeof value;
@@ -153,182 +151,184 @@ merge = function(src, dst) {
merge(src[key], value);
}
}
-};
+}
// ////////////////////////////
// Loader
// ////////////////////////////
-Loader = function(document, head, config) {
+function Loader(document, head, config) {
this.document = jQuery(document);
this.head = jQuery(head);
this.config = config;
this.location = window.location;
-};
-
-Loader.prototype.load = function() {
- this.configureLogging();
- this.loadCss('/stylesheets/jquery-ui/smoothness/jquery-ui-1.7.1.css');
- this.loadCss('/stylesheets/css');
- console.log("Server: " + this.config.server);
- this.configureJQueryPlugins();
- this.computeConfiguration();
- this.bindHtml();
-};
-
-Loader.prototype.configureJQueryPlugins = function() {
- console.log('Loader.configureJQueryPlugins()');
- jQuery['fn']['scope'] = function() {
- var element = this;
- while (element && element.get(0)) {
- var scope = element.data("scope");
- if (scope)
- return scope;
- element = element.parent();
- }
- return null;
- };
- jQuery['fn']['controller'] = function() {
- return this.data('controller') || NullController.instance;
- };
-};
-
-Loader.prototype.uid = function() {
- return "" + new Date().getTime();
-};
-
-Loader.prototype.computeConfiguration = function() {
- var config = this.config;
- if (!config.database) {
- var match = config.server.match(/https?:\/\/([\w]*)/);
- config.database = match ? match[1] : "$MEMORY";
- }
-};
-
-Loader.prototype.bindHtml = function() {
- console.log('Loader.bindHtml()');
- var watcher = new UrlWatcher(this.location);
- var document = this.document;
- var widgetFactory = new WidgetFactory(this.config.server, this.config.database);
- var binder = new Binder(document[0], widgetFactory, watcher, this.config);
- widgetFactory.onChangeListener = shiftBind(binder, binder.updateModel);
- var controlBar = new ControlBar(document.find('body'), this.config.server);
- var onUpdate = function(){binder.updateView();};
- var server = this.config.database=="$MEMORY" ?
- new FrameServer(this.window) :
- new Server(this.config.server, jQuery.getScript);
- server = new VisualServer(server, new Status(jQuery(document.body)), onUpdate);
- var users = new Users(server, controlBar);
- var databasePath = '/data/' + this.config.database;
- var post = function(request, callback){
- server.request("POST", databasePath, request, callback);
- };
- var datastore = new DataStore(post, users, binder.anchor);
- binder.updateListeners.push(function(){datastore.flush();});
- var scope = new Scope( {
- '$anchor' : binder.anchor,
- '$binder' : binder,
- '$config' : this.config,
- '$console' : window.console,
- '$datastore' : datastore,
- '$save' : function(callback) {
- datastore.saveScope(scope.state, callback, binder.anchor);
- },
- '$window' : window,
- '$uid' : this.uid,
- '$users' : users
- }, "ROOT");
-
- document.data('scope', scope);
- console.log('$binder.entity()');
- binder.entity(scope);
-
- console.log('$binder.compile()');
- binder.compile();
-
- console.log('ControlBar.bind()');
- controlBar.bind();
-
- console.log('$users.fetchCurrentUser()');
- function fetchCurrentUser() {
- users.fetchCurrentUser(function(u) {
- if (!u && document.find("[ng-auth=eager]").length) {
- users.login();
- }
- });
- }
- fetchCurrentUser();
-
- console.log('PopUp.bind()');
- new PopUp(document).bind();
-
- console.log('$binder.parseAnchor()');
- binder.parseAnchor();
-
- console.log('$binder.executeInit()');
- binder.executeInit();
-
- console.log('$binder.updateView()');
- binder.updateView();
-
- watcher.listener = bind(binder, binder.onUrlChange, watcher);
- watcher.onUpdate = function(){alert("update");};
- watcher.watch();
- document.find("body").show();
- console.log('ready()');
-};
+}
-Loader.prototype.visualPost = function(delegate) {
- var status = new Status(jQuery(document.body));
- return function(request, delegateCallback) {
- status.beginRequest(request);
- var callback = function() {
- status.endRequest();
- try {
- delegateCallback.apply(this, arguments);
- } catch (e) {
- alert(toJson(e));
+Loader.prototype = {
+ load: function() {
+ this.configureLogging();
+ this.loadCss('/stylesheets/jquery-ui/smoothness/jquery-ui-1.7.1.css');
+ this.loadCss('/stylesheets/css');
+ log("Server: " + this.config.server);
+ this.configureJQueryPlugins();
+ this.computeConfiguration();
+ this.bindHtml();
+ },
+
+ configureJQueryPlugins: function() {
+ log('Loader.configureJQueryPlugins()');
+ jQuery['fn']['scope'] = function() {
+ var element = this;
+ while (element && element.get(0)) {
+ var scope = element.data("scope");
+ if (scope)
+ return scope;
+ element = element.parent();
}
+ return null;
};
- delegate(request, callback);
- };
-};
-
-Loader.prototype.configureLogging = function() {
- var url = window.location.href + '#';
- url = url.split('#')[1];
- var config = {
- debug : null
- };
- var configs = url.split('&');
- for ( var i = 0; i < configs.length; i++) {
- var part = (configs[i] + '=').split('=');
- config[part[0]] = part[1];
- }
- if (config.debug == 'console') {
- consoleNode = document.createElement("div");
- consoleNode.id = 'ng-console';
- document.getElementsByTagName('body')[0].appendChild(consoleNode);
- console.log = function() {
- consoleLog('ng-console-info', arguments);
+ jQuery['fn']['controller'] = function() {
+ return this.data('controller') || NullController.instance;
+ };
+ },
+
+ uid: function() {
+ return "" + new Date().getTime();
+ },
+
+ computeConfiguration: function() {
+ var config = this.config;
+ if (!config.database) {
+ var match = config.server.match(/https?:\/\/([\w]*)/);
+ config.database = match ? match[1] : "$MEMORY";
+ }
+ },
+
+ bindHtml: function() {
+ log('Loader.bindHtml()');
+ var watcher = new UrlWatcher(this.location);
+ var document = this.document;
+ var widgetFactory = new WidgetFactory(this.config.server, this.config.database);
+ var binder = new Binder(document[0], widgetFactory, watcher, this.config);
+ widgetFactory.onChangeListener = shiftBind(binder, binder.updateModel);
+ var controlBar = new ControlBar(document.find('body'), this.config.server);
+ var onUpdate = function(){binder.updateView();};
+ var server = this.config.database=="$MEMORY" ?
+ new FrameServer(this.window) :
+ new Server(this.config.server, jQuery.getScript);
+ server = new VisualServer(server, new Status(jQuery(document.body)), onUpdate);
+ var users = new Users(server, controlBar);
+ var databasePath = '/data/' + this.config.database;
+ var post = function(request, callback){
+ server.request("POST", databasePath, request, callback);
+ };
+ var datastore = new DataStore(post, users, binder.anchor);
+ binder.updateListeners.push(function(){datastore.flush();});
+ var scope = new Scope( {
+ '$anchor' : binder.anchor,
+ '$binder' : binder,
+ '$config' : this.config,
+ '$console' : window.console,
+ '$datastore' : datastore,
+ '$save' : function(callback) {
+ datastore.saveScope(scope.state, callback, binder.anchor);
+ },
+ '$window' : window,
+ '$uid' : this.uid,
+ '$users' : users
+ }, "ROOT");
+
+ document.data('scope', scope);
+ log('$binder.entity()');
+ binder.entity(scope);
+
+ log('$binder.compile()');
+ binder.compile();
+
+ log('ControlBar.bind()');
+ controlBar.bind();
+
+ log('$users.fetchCurrentUser()');
+ function fetchCurrentUser() {
+ users.fetchCurrentUser(function(u) {
+ if (!u && document.find("[ng-auth=eager]").length) {
+ users.login();
+ }
+ });
+ }
+ fetchCurrentUser();
+
+ log('PopUp.bind()');
+ new PopUp(document).bind();
+
+ log('$binder.parseAnchor()');
+ binder.parseAnchor();
+
+ log('$binder.executeInit()');
+ binder.executeInit();
+
+ log('$binder.updateView()');
+ binder.updateView();
+
+ watcher.listener = bind(binder, binder.onUrlChange, watcher);
+ watcher.onUpdate = function(){alert("update");};
+ watcher.watch();
+ document.find("body").show();
+ log('ready()');
+ },
+
+ visualPost: function(delegate) {
+ var status = new Status(jQuery(document.body));
+ return function(request, delegateCallback) {
+ status.beginRequest(request);
+ var callback = function() {
+ status.endRequest();
+ try {
+ delegateCallback.apply(this, arguments);
+ } catch (e) {
+ alert(toJson(e));
+ }
+ };
+ delegate(request, callback);
};
- console.error = function() {
- consoleLog('ng-console-error', arguments);
+ },
+
+ configureLogging: function() {
+ var url = window.location.href + '#';
+ url = url.split('#')[1];
+ var config = {
+ debug : null
};
+ var configs = url.split('&');
+ for ( var i = 0; i < configs.length; i++) {
+ var part = (configs[i] + '=').split('=');
+ config[part[0]] = part[1];
+ }
+ if (config.debug == 'console') {
+ consoleNode = document.createElement("div");
+ consoleNode.id = 'ng-console';
+ document.getElementsByTagName('body')[0].appendChild(consoleNode);
+ log = function() {
+ consoleLog('ng-console-info', arguments);
+ };
+ console.error = function() {
+ consoleLog('ng-console-error', arguments);
+ };
+ }
+ },
+
+ loadCss: function(css) {
+ var cssTag = document.createElement('link');
+ cssTag.rel = "stylesheet";
+ cssTag.type = "text/css";
+ if (!css.match(/^http:/))
+ css = this.config.server + css;
+ cssTag.href = css;
+ this.head[0].appendChild(cssTag);
}
};
-Loader.prototype.loadCss = function(css) {
- var cssTag = document.createElement('link');
- cssTag.rel = "stylesheet";
- cssTag.type = "text/css";
- if (!css.match(/^http:/))
- css = this.config.server + css;
- cssTag.href = css;
- this.head[0].appendChild(cssTag);
-};
-
-UrlWatcher = function(location) {
+function UrlWatcher(location) {
this.location = location;
this.delay = 25;
this.setTimeout = function(fn, delay) {
@@ -338,49 +338,51 @@ UrlWatcher = function(location) {
return url;
};
this.expectedUrl = location.href;
-};
+}
-UrlWatcher.prototype.watch = function() {
- var self = this;
- var pull = function() {
- if (self.expectedUrl !== self.location.href) {
- var notify = self.location.hash.match(/^#\$iframe_notify=(.*)$/);
- if (notify) {
- if (!self.expectedUrl.match(/#/)) {
- self.expectedUrl += "#";
- }
- self.location.href = self.expectedUrl;
- var id = '_iframe_notify_' + notify[1];
- var notifyFn = callbacks[id];
- delete callbacks[id];
- try {
- (notifyFn||noop)();
- } catch (e) {
- alert(e);
+UrlWatcher.prototype = {
+ watch: function() {
+ var self = this;
+ var pull = function() {
+ if (self.expectedUrl !== self.location.href) {
+ var notify = self.location.hash.match(/^#\$iframe_notify=(.*)$/);
+ if (notify) {
+ if (!self.expectedUrl.match(/#/)) {
+ self.expectedUrl += "#";
+ }
+ self.location.href = self.expectedUrl;
+ var id = '_iframe_notify_' + notify[1];
+ var notifyFn = angularCallbacks[id];
+ delete angularCallbacks[id];
+ try {
+ (notifyFn||noop)();
+ } catch (e) {
+ alert(e);
+ }
+ } else {
+ self.listener(self.location.href);
+ self.expectedUrl = self.location.href;
}
- } else {
- self.listener(self.location.href);
- self.expectedUrl = self.location.href;
}
- }
- self.setTimeout(pull, self.delay);
- };
- pull();
-};
-
-UrlWatcher.prototype.setUrl = function(url) {
- var existingURL = window.location.href;
- if (!existingURL.match(/#/))
- existingURL += '#';
- if (existingURL != url)
- window.location.href = url;
- this.existingURL = url;
-};
-
-UrlWatcher.prototype.getUrl = function() {
- return window.location.href;
+ self.setTimeout(pull, self.delay);
+ };
+ pull();
+ },
+
+ setUrl: function(url) {
+ var existingURL = window.location.href;
+ if (!existingURL.match(/#/))
+ existingURL += '#';
+ if (existingURL != url)
+ window.location.href = url;
+ this.existingURL = url;
+ },
+
+ getUrl: function() {
+ return window.location.href;
+ }
};
-
+
angular['compile'] = function(root, config) {
config = config || {};
var defaults = {
@@ -397,5 +399,4 @@ angular['compile'] = function(root, config) {
'set':function(){return scope.set.apply(scope, arguments);},
'get':function(){return scope.get.apply(scope, arguments);}
};
-};
-
+};
\ No newline at end of file
diff --git a/src/Scope.js b/src/Scope.js
index dff3bfbd..f4b34c3c 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -124,7 +124,7 @@ Scope.prototype.evalWidget = function(widget, expression, context, onSuccess, on
}
return true;
} catch (e){
- console.error('Eval Widget Error:', e);
+ error('Eval Widget Error:', e);
var jsonError = toJson(e, true);
widget.hasError = true;
jQuery(widget.view).
@@ -184,10 +184,10 @@ Scope.prototype.addWatchListener = function(watchExpression, listener) {
Scope.prototype.fireWatchers = function() {
var self = this;
var fired = false;
- jQuery.each(this.watchListeners, function(name, watcher) {
+ foreach(this.watchListeners, function(watcher) {
var value = self.eval(watcher.expression);
if (value !== watcher.lastValue) {
- jQuery.each(watcher.listeners, function(i, listener){
+ foreach(watcher.listeners, function(listener){
listener(value, watcher.lastValue);
fired = true;
});
diff --git a/src/Server.js b/src/Server.js
index d00f893b..8f682038 100644
--- a/src/Server.js
+++ b/src/Server.js
@@ -14,7 +14,7 @@ Server.prototype.base64url = function(txt) {
Server.prototype.request = function(method, url, request, callback) {
var requestId = this.uuid + (this.nextId++);
- callbacks[requestId] = function(response) {
+ angularCallbacks[requestId] = function(response) {
delete angular[requestId];
callback(200, response);
};
diff --git a/src/Validators.js b/src/Validators.js
index 7cfaa2b4..eb8cff59 100644
--- a/src/Validators.js
+++ b/src/Validators.js
@@ -1,80 +1,82 @@
// Copyright (C) 2009 BRAT Tech LLC
-angular.validator.regexp = function(value, regexp, msg) {
- if (!value.match(regexp)) {
- return msg ||
- "Value does not match expected format " + regexp + ".";
- } else {
- return null;
- }
-};
-
-angular.validator.number = function(value, min, max) {
- var num = 1 * value;
- if (num == value) {
- if (typeof min != 'undefined' && num < min) {
- return "Value can not be less than " + min + ".";
+foreach({
+ 'regexp': function(value, regexp, msg) {
+ if (!value.match(regexp)) {
+ return msg ||
+ "Value does not match expected format " + regexp + ".";
+ } else {
+ return null;
}
- if (typeof min != 'undefined' && num > max) {
- return "Value can not be greater than " + max + ".";
+ },
+
+ 'number': function(value, min, max) {
+ var num = 1 * value;
+ if (num == value) {
+ if (typeof min != 'undefined' && num < min) {
+ return "Value can not be less than " + min + ".";
+ }
+ if (typeof min != 'undefined' && num > max) {
+ return "Value can not be greater than " + max + ".";
+ }
+ return null;
+ } else {
+ return "Value is not a number.";
+ }
+ },
+
+ 'integer': function(value, min, max) {
+ var number = angularValidator['number'](value, min, max);
+ if (number === null && value != Math.round(value)) {
+ return "Value is not a whole number.";
+ }
+ return number;
+ },
+
+ 'date': function(value, min, max) {
+ if (value.match(/^\d\d?\/\d\d?\/\d\d\d\d$/)) {
+ return null;
+ }
+ return "Value is not a date. (Expecting format: 12/31/2009).";
+ },
+
+ 'ssn': function(value) {
+ if (value.match(/^\d\d\d-\d\d-\d\d\d\d$/)) {
+ return null;
+ }
+ return "SSN needs to be in 999-99-9999 format.";
+ },
+
+ 'email': function(value) {
+ if (value.match(/^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$/)) {
+ return null;
+ }
+ return "Email needs to be in username@host.com format.";
+ },
+
+ 'phone': function(value) {
+ if (value.match(/^1\(\d\d\d\)\d\d\d-\d\d\d\d$/)) {
+ return null;
+ }
+ if (value.match(/^\+\d{2,3} (\(\d{1,5}\))?[\d ]+\d$/)) {
+ return null;
+ }
+ return "Phone number needs to be in 1(987)654-3210 format in North America or +999 (123) 45678 906 internationaly.";
+ },
+
+ 'url': function(value) {
+ if (value.match(/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/)) {
+ return null;
+ }
+ return "URL needs to be in http://server[:port]/path format.";
+ },
+
+ 'json': function(value) {
+ try {
+ fromJson(value);
+ return null;
+ } catch (e) {
+ return e.toString();
}
- return null;
- } else {
- return "Value is not a number.";
- }
-};
-
-angular.validator.integer = function(value, min, max) {
- var number = angular.validator.number(value, min, max);
- if (number === null && value != Math.round(value)) {
- return "Value is not a whole number.";
- }
- return number;
-};
-
-angular.validator.date = function(value, min, max) {
- if (value.match(/^\d\d?\/\d\d?\/\d\d\d\d$/)) {
- return null;
- }
- return "Value is not a date. (Expecting format: 12/31/2009).";
-};
-
-angular.validator.ssn = function(value) {
- if (value.match(/^\d\d\d-\d\d-\d\d\d\d$/)) {
- return null;
- }
- return "SSN needs to be in 999-99-9999 format.";
-};
-
-angular.validator.email = function(value) {
- if (value.match(/^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$/)) {
- return null;
- }
- return "Email needs to be in username@host.com format.";
-};
-
-angular.validator.phone = function(value) {
- if (value.match(/^1\(\d\d\d\)\d\d\d-\d\d\d\d$/)) {
- return null;
- }
- if (value.match(/^\+\d{2,3} (\(\d{1,5}\))?[\d ]+\d$/)) {
- return null;
- }
- return "Phone number needs to be in 1(987)654-3210 format in North America or +999 (123) 45678 906 internationaly.";
-};
-
-angular.validator.url = function(value) {
- if (value.match(/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/)) {
- return null;
- }
- return "URL needs to be in http://server[:port]/path format.";
-};
-
-angular.validator.json = function(value) {
- try {
- fromJson(value);
- return null;
- } catch (e) {
- return e.toString();
}
-};
+}, function(v,k) {angularValidator[k] = v;});
diff --git a/src/Widgets.js b/src/Widgets.js
index 4e4facf8..5dcb84c4 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -525,7 +525,7 @@ BindAttrUpdater.prototype.updateView = function(scope) {
attrValues.push(value);
} catch (e) {
this.hasError = true;
- console.error('BindAttrUpdater', e);
+ error('BindAttrUpdater', e);
var jsonError = toJson(e, true);
attrValues.push('[' + jsonError + ']');
jNode.
@@ -657,7 +657,7 @@ RepeaterUpdater.prototype.updateView = function(scope) {
var keyExp = this.keyExp;
var valueExp = this.valueExp;
var i = 0;
- jQuery.each(iterator, function(key, value){
+ foreach(iterator, function(value, key){
if (i < childrenLength) {
// reuse children
child = self.children[i];
diff --git a/src/angular.prefix b/src/angular.prefix
index 522c17bf..dbd4959a 100644
--- a/src/angular.prefix
+++ b/src/angular.prefix
@@ -1,2 +1 @@
-
-(function(window, document){
\ No newline at end of file
+(function(window, document){
--
cgit v1.2.3
From 6d5471c9bea9671dec7900a7bc548aea8ddd5a3e Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 11 Jan 2010 17:32:33 -0800
Subject: all files converted to prototype= {}
---
src/Binder.js | 595 ++++++++++-----------
src/ControlBar.js | 106 ++--
src/DataStore.js | 604 +++++++++++-----------
src/Filters.js | 2 -
src/JSON.js | 10 +-
src/Loader.js | 4 -
src/Model.js | 82 +--
src/Parser.js | 1292 +++++++++++++++++++++++-----------------------
src/Scope.js | 295 ++++++-----
src/Server.js | 44 +-
src/Users.js | 11 +-
src/Validators.js | 2 -
src/Widgets.js | 972 +++++++++++++++++-----------------
src/angular-bootstrap.js | 25 +-
src/angular.prefix | 23 +
15 files changed, 2068 insertions(+), 1999 deletions(-)
(limited to 'src')
diff --git a/src/Binder.js b/src/Binder.js
index 4c5299ed..36cb6ec3 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -1,12 +1,11 @@
-// Copyright (C) 2009 BRAT Tech LLC
-Binder = function(doc, widgetFactory, urlWatcher, config) {
+function Binder(doc, widgetFactory, urlWatcher, config) {
this.doc = doc;
this.urlWatcher = urlWatcher;
this.anchor = {};
this.widgetFactory = widgetFactory;
this.config = config || {};
this.updateListeners = [];
-};
+}
Binder.parseBindings = function(string) {
var results = [];
@@ -39,312 +38,314 @@ Binder.binding = function(string) {
};
-Binder.prototype.parseQueryString = function(query) {
- var params = {};
- query.replace(/(?:^|&)([^&=]*)=?([^&]*)/g,
- function (match, left, right) {
- if (left) params[decodeURIComponent(left)] = decodeURIComponent(right);
- });
- return params;
-};
-
-Binder.prototype.parseAnchor = function(url) {
- var self = this;
- url = url || this.urlWatcher.getUrl();
-
- 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;
- });
-};
-
-Binder.prototype.onUrlChange = function (url) {
- log("URL change detected", url);
- this.parseAnchor(url);
- this.updateView();
-};
-
-Binder.prototype.updateAnchor = function() {
- var url = this.urlWatcher.getUrl();
- 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.urlWatcher.setUrl(url);
- return url;
-};
-
-Binder.prototype.updateView = function() {
- var start = new Date().getTime();
- var scope = jQuery(this.doc).scope();
- scope.set("$invalidWidgets", []);
- scope.updateView();
- var end = new Date().getTime();
- this.updateAnchor();
- _.each(this.updateListeners, function(fn) {fn();});
-};
-
-Binder.prototype.docFindWithSelf = function(exp){
- var doc = jQuery(this.doc);
- var selection = doc.find(exp);
- if (doc.is(exp)){
- selection = selection.andSelf();
- }
- return selection;
-};
-
-Binder.prototype.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));
+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(url) {
+ var self = this;
+ url = url || this.urlWatcher.getUrl();
+
+ 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 (url) {
+ log("URL change detected", url);
+ this.parseAnchor(url);
+ this.updateView();
+ },
+
+ updateAnchor: function() {
+ var url = this.urlWatcher.getUrl();
+ 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 = '&';
+ }
}
- });
-};
-
-Binder.prototype.entity = function (scope) {
- this.docFindWithSelf("[ng-entity]").attr("ng-watch", function() {
- try {
- var jNode = jQuery(this);
- var decl = scope.entity(jNode.attr("ng-entity"));
- return decl + (jNode.attr('ng-watch') || "");
- } catch (e) {
- alert(e);
+ this.urlWatcher.setUrl(url);
+ return url;
+ },
+
+ updateView: function() {
+ var start = new Date().getTime();
+ var scope = jQuery(this.doc).scope();
+ scope.set("$invalidWidgets", []);
+ scope.updateView();
+ var end = new Date().getTime();
+ this.updateAnchor();
+ _.each(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();
}
- });
-};
-
-Binder.prototype.compile = function() {
- var jNode = jQuery(this.doc);
- var self = this;
- 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);
- try {
- jNode.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));
+ 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) {
+ this.docFindWithSelf("[ng-entity]").attr("ng-watch", function() {
+ try {
+ var jNode = jQuery(this);
+ var decl = scope.entity(jNode.attr("ng-entity"));
+ return decl + (jNode.attr('ng-watch') || "");
+ } catch (e) {
+ alert(e);
+ }
+ });
+ },
+
+ compile: function() {
+ var jNode = jQuery(this.doc);
+ var self = this;
+ 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}}"}');
}
- self.updateView();
- return false;
- });
-};
-
-Binder.prototype.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:Binder.prototype.ng_bind});
+ this.precompile(this.doc)(this.doc, jNode.scope(), "");
+ this.docFindWithSelf("a[ng-action]").live('click', function (event) {
+ var jNode = jQuery(this);
+ try {
+ jNode.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));
+ }
+ self.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 = ' ' + part.substring(1);
+ } else {
+ newNode = document.createTextNode(part);
}
- } else if (msie && part.charAt(0) == ' ') {
- newNode = document.createElement("span");
- newNode.innerHTML = ' ' + part.substring(1);
- } else {
- newNode = document.createTextNode(part);
+ parent.insertBefore(newNode, node);
}
- parent.insertBefore(newNode, node);
}
+ parent.removeChild(node);
}
- parent.removeChild(node);
- }
-};
-
-Binder.prototype.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]];
+ },
+
+ 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);
+ }
}
- 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);
}
}
- };
-};
-
-Binder.prototype.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;
+
+ 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;
}
- var json = toJson(bindings);
- if (json.length > 2) {
- node.setAttribute("ng-bind-attr", json);
+
+ 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 (!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);
- var template = function(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('').append(jQuery(node).clone()).html();
- if (!html.match(/.*<\/\s*option\s*>/gi)) {
- node.value = node.text;
+ if (nodeName == 'OPTION') {
+ var html = jQuery('').append(jQuery(node).clone()).html();
+ if (!html.match(/.*<\/\s*option\s*>/gi)) {
+ 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'));
}
-
- var children = node.childNodes;
- for (var k = 0; k < children.length; k++) {
- this.precompileNode(children[k], path.concat(k), factories);
- }
-};
-
-Binder.prototype.ng_eval = function(node) {
- return new EvalUpdater(node, node.getAttribute('ng-eval'));
-};
-
-Binder.prototype.ng_bind = function(node) {
- return new BindUpdater(node, "{{" + node.getAttribute('ng-bind') + "}}");
-};
-
-Binder.prototype.ng_bind_attr = function(node) {
- return new BindAttrUpdater(node, fromJson(node.getAttribute('ng-bind-attr')));
-};
-
-Binder.prototype.ng_hide = function(node) {
- return new HideUpdater(node, node.getAttribute('ng-hide'));
-};
-
-Binder.prototype.ng_show = function(node) {
- return new ShowUpdater(node, node.getAttribute('ng-show'));
-};
-
-Binder.prototype.ng_class = function(node) {
- return new ClassUpdater(node, node.getAttribute('ng-class'));
-};
-
-Binder.prototype.ng_class_even = function(node) {
- return new ClassEvenUpdater(node, node.getAttribute('ng-class-even'));
-};
-
-Binder.prototype.ng_class_odd = function(node) {
- return new ClassOddUpdater(node, node.getAttribute('ng-class-odd'));
-};
-
-Binder.prototype.ng_style = function(node) {
- return new StyleUpdater(node, node.getAttribute('ng-style'));
-};
-
-Binder.prototype.ng_watch = function(node, scope) {
- scope.watch(node.getAttribute('ng-watch'));
-};
+};
\ No newline at end of file
diff --git a/src/ControlBar.js b/src/ControlBar.js
index fb8147d5..53c87199 100644
--- a/src/ControlBar.js
+++ b/src/ControlBar.js
@@ -1,15 +1,10 @@
-// Copyright (C) 2008,2009 BRAT Tech LLC
-
-ControlBar = function (document, serverUrl) {
+function ControlBar(document, serverUrl) {
this.document = document;
this.serverUrl = serverUrl;
this.window = window;
this.callbacks = [];
};
-ControlBar.prototype.bind = function () {
-};
-
ControlBar.HTML =
'
';
-ControlBar.prototype.login = function (loginSubmitFn) {
- this.callbacks.push(loginSubmitFn);
- if (this.callbacks.length == 1) {
- this.doTemplate("/user_session/new.mini?return_url=" + encodeURIComponent(this.urlWithoutAnchor()));
- }
-};
-
-ControlBar.prototype.logout = function (loginSubmitFn) {
- this.callbacks.push(loginSubmitFn);
- if (this.callbacks.length == 1) {
- this.doTemplate("/user_session/do_destroy.mini");
- }
-};
-
-ControlBar.prototype.urlWithoutAnchor = function (path) {
- return this.window.location.href.split("#")[0];
-};
-
-ControlBar.prototype.doTemplate = function (path) {
- var self = this;
- var id = new Date().getTime();
- var url = this.urlWithoutAnchor();
- url += "#$iframe_notify=" + id;
- var iframeHeight = 330;
- var loginView = jQuery('');
- this.document.append(loginView);
- loginView.dialog({
- height:iframeHeight + 33, width:500,
- resizable: false, modal:true,
- title: 'Authentication: <angular/>'
- });
- callbacks["_iframe_notify_" + id] = function() {
- loginView.dialog("destroy");
- loginView.remove();
- foreach(self.callbacks, function(callback){
- callback();
- });
- self.callbacks = [];
- };
-};
-
ControlBar.FORBIDEN =
'' +
'' +
'
';
-nglr.ControlBar.prototype.login = function (loginSubmitFn) {
+ControlBar.prototype.login = function (loginSubmitFn) {
this.callbacks.push(loginSubmitFn);
if (this.callbacks.length == 1) {
this.doTemplate("/user_session/new.mini?return_url=" + encodeURIComponent(this.urlWithoutAnchor()));
}
};
-nglr.ControlBar.prototype.logout = function (loginSubmitFn) {
+ControlBar.prototype.logout = function (loginSubmitFn) {
this.callbacks.push(loginSubmitFn);
if (this.callbacks.length == 1) {
this.doTemplate("/user_session/do_destroy.mini");
}
};
-nglr.ControlBar.prototype.urlWithoutAnchor = function (path) {
+ControlBar.prototype.urlWithoutAnchor = function (path) {
return this.window.location.href.split("#")[0];
};
-nglr.ControlBar.prototype.doTemplate = function (path) {
+ControlBar.prototype.doTemplate = function (path) {
var self = this;
var id = new Date().getTime();
var url = this.urlWithoutAnchor();
@@ -49,7 +49,7 @@ nglr.ControlBar.prototype.doTemplate = function (path) {
resizable: false, modal:true,
title: 'Authentication: <angular/>'
});
- nglr["_iframe_notify_" + id] = function() {
+ callbacks["_iframe_notify_" + id] = function() {
loginView.dialog("destroy");
loginView.remove();
jQuery.each(self.callbacks, function(i, callback){
@@ -59,13 +59,13 @@ nglr.ControlBar.prototype.doTemplate = function (path) {
};
};
-nglr.ControlBar.FORBIDEN =
+ControlBar.FORBIDEN =
'' +
@@ -18,25 +18,25 @@ nglr.ControlBar.HTML =
'
' +
'' +
'Sorry, you do not have permission for this!'+
'
';
-nglr.ControlBar.prototype.notAuthorized = function () {
+ControlBar.prototype.notAuthorized = function () {
if (this.forbidenView) return;
- this.forbidenView = jQuery(nglr.ControlBar.FORBIDEN);
+ this.forbidenView = jQuery(ControlBar.FORBIDEN);
this.forbidenView.dialog({bgiframe:true, height:70, modal:true});
};
diff --git a/src/DataStore.js b/src/DataStore.js
index 97ab92ff..bdf882a0 100644
--- a/src/DataStore.js
+++ b/src/DataStore.js
@@ -1,6 +1,6 @@
// Copyright (C) 2009 BRAT Tech LLC
-nglr.DataStore = function(post, users, anchor) {
+DataStore = function(post, users, anchor) {
this.post = post;
this.users = users;
this._cache = {$collections:[]};
@@ -8,14 +8,14 @@ nglr.DataStore = function(post, users, anchor) {
this.bulkRequest = [];
};
-nglr.DataStore.prototype.cache = function(document) {
- if (document.constructor != nglr.Model) {
- throw "Parameter must be an instance of Entity! " + nglr.toJson(document);
+DataStore.prototype.cache = function(document) {
+ if (document.constructor != Model) {
+ throw "Parameter must be an instance of Entity! " + toJson(document);
}
var key = document.$entity + '/' + document.$id;
var cachedDocument = this._cache[key];
if (cachedDocument) {
- nglr.Model.copyDirectFields(document, cachedDocument);
+ Model.copyDirectFields(document, cachedDocument);
} else {
this._cache[key] = document;
cachedDocument = document;
@@ -23,7 +23,7 @@ nglr.DataStore.prototype.cache = function(document) {
return cachedDocument;
};
-nglr.DataStore.prototype.load = function(instance, id, callback, failure) {
+DataStore.prototype.load = function(instance, id, callback, failure) {
if (id && id !== '*') {
var self = this;
this._jsonRequest(["GET", instance.$entity + "/" + id], function(response) {
@@ -31,13 +31,13 @@ nglr.DataStore.prototype.load = function(instance, id, callback, failure) {
instance.$migrate();
var clone = instance.$$entity(instance);
self.cache(clone);
- (callback||nglr.noop)(instance);
+ (callback||noop)(instance);
}, failure);
}
return instance;
};
-nglr.DataStore.prototype.loadMany = function(entity, ids, callback) {
+DataStore.prototype.loadMany = function(entity, ids, callback) {
var self=this;
var list = [];
var callbackCount = 0;
@@ -45,26 +45,26 @@ nglr.DataStore.prototype.loadMany = function(entity, ids, callback) {
list.push(self.load(entity(), id, function(){
callbackCount++;
if (callbackCount == ids.length) {
- (callback||nglr.noop)(list);
+ (callback||noop)(list);
}
}));
});
return list;
}
-nglr.DataStore.prototype.loadOrCreate = function(instance, id, callback) {
+DataStore.prototype.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||nglr.noop)(instance);
+ (callback||noop)(instance);
} else {
throw response;
}
});
};
-nglr.DataStore.prototype.loadAll = function(entity, callback) {
+DataStore.prototype.loadAll = function(entity, callback) {
var self = this;
var list = [];
list.$$accept = function(doc){
@@ -78,12 +78,12 @@ nglr.DataStore.prototype.loadAll = function(entity, callback) {
document.$loadFrom(rows[i]);
list.push(self.cache(document));
}
- (callback||nglr.noop)(list);
+ (callback||noop)(list);
});
return list;
};
-nglr.DataStore.prototype.save = function(document, callback) {
+DataStore.prototype.save = function(document, callback) {
var self = this;
var data = {};
document.$saveTo(data);
@@ -103,7 +103,7 @@ nglr.DataStore.prototype.save = function(document, callback) {
});
};
-nglr.DataStore.prototype.remove = function(document, callback) {
+DataStore.prototype.remove = function(document, callback) {
var self = this;
var data = {};
document.$saveTo(data);
@@ -117,11 +117,11 @@ nglr.DataStore.prototype.remove = function(document, callback) {
}
}
});
- (callback||nglr.noop)(response);
+ (callback||noop)(response);
});
};
-nglr.DataStore.prototype._jsonRequest = function(request, callback, failure) {
+DataStore.prototype._jsonRequest = function(request, callback, failure) {
request.$$callback = callback;
request.$$failure = failure||function(response){
throw response;
@@ -129,7 +129,7 @@ nglr.DataStore.prototype._jsonRequest = function(request, callback, failure) {
this.bulkRequest.push(request);
};
-nglr.DataStore.prototype.flush = function() {
+DataStore.prototype.flush = function() {
if (this.bulkRequest.length === 0) return;
var self = this;
var bulkRequest = this.bulkRequest;
@@ -142,7 +142,7 @@ nglr.DataStore.prototype.flush = function() {
self.post(bulkRequest, callback);
});
} else if(bulkResponse.$status_code) {
- nglr.alert(nglr.toJson(bulkResponse));
+ alert(toJson(bulkResponse));
} else {
for ( var i = 0; i < bulkResponse.length; i++) {
var response = bulkResponse[i];
@@ -163,7 +163,7 @@ nglr.DataStore.prototype.flush = function() {
this.post(bulkRequest, callback);
};
-nglr.DataStore.prototype.saveScope = function(scope, callback) {
+DataStore.prototype.saveScope = function(scope, callback) {
var saveCounter = 1;
function onSaveDone() {
saveCounter--;
@@ -172,7 +172,7 @@ nglr.DataStore.prototype.saveScope = function(scope, callback) {
}
for(var key in scope) {
var item = scope[key];
- if (item && item.$save == nglr.Model.prototype.$save) {
+ if (item && item.$save == Model.prototype.$save) {
saveCounter++;
item.$save(onSaveDone);
}
@@ -180,7 +180,7 @@ nglr.DataStore.prototype.saveScope = function(scope, callback) {
onSaveDone();
};
-nglr.DataStore.prototype.query = function(type, query, arg, callback){
+DataStore.prototype.query = function(type, query, arg, callback){
var self = this;
var queryList = [];
queryList.$$accept = function(doc){
@@ -200,7 +200,7 @@ nglr.DataStore.prototype.query = function(type, query, arg, callback){
return queryList;
};
-nglr.DataStore.prototype.entities = function(callback) {
+DataStore.prototype.entities = function(callback) {
var entities = [];
var self = this;
this._jsonRequest(["GET", "$entities"], function(response) {
@@ -213,7 +213,7 @@ nglr.DataStore.prototype.entities = function(callback) {
return entities;
};
-nglr.DataStore.prototype.documentCountsByUser = function(){
+DataStore.prototype.documentCountsByUser = function(){
var counts = {};
var self = this;
self.post([["GET", "$users"]], function(code, response){
@@ -224,7 +224,7 @@ nglr.DataStore.prototype.documentCountsByUser = function(){
return counts;
};
-nglr.DataStore.prototype.userDocumentIdsByEntity = function(user){
+DataStore.prototype.userDocumentIdsByEntity = function(user){
var ids = {};
var self = this;
self.post([["GET", "$users/" + user]], function(code, response){
@@ -235,19 +235,19 @@ nglr.DataStore.prototype.userDocumentIdsByEntity = function(user){
return ids;
};
-nglr.DataStore.NullEntity = function(){};
-nglr.DataStore.NullEntity.all = function(){return [];};
-nglr.DataStore.NullEntity.query = function(){return [];};
-nglr.DataStore.NullEntity.load = function(){return {};};
-nglr.DataStore.NullEntity.title = undefined;
+DataStore.NullEntity = function(){};
+DataStore.NullEntity.all = function(){return [];};
+DataStore.NullEntity.query = function(){return [];};
+DataStore.NullEntity.load = function(){return {};};
+DataStore.NullEntity.title = undefined;
-nglr.DataStore.prototype.entity = function(name, defaults){
+DataStore.prototype.entity = function(name, defaults){
if (!name) {
- return nglr.DataStore.NullEntity;
+ return DataStore.NullEntity;
}
var self = this;
var entity = function(initialState){
- return new nglr.Model(entity, initialState);
+ return new Model(entity, initialState);
};
// entity.name does not work as name seems to be reserved for functions
entity.title = name;
@@ -275,7 +275,7 @@ nglr.DataStore.prototype.entity = function(name, defaults){
return entity;
};
-nglr.DataStore.prototype.join = function(join){
+DataStore.prototype.join = function(join){
var fn = function(){
throw "Joined entities can not be instantiated into a document.";
};
@@ -312,7 +312,7 @@ nglr.DataStore.prototype.join = function(join){
var row = {};
joinedResult.push(row);
row[baseName] = doc;
- var id = nglr.Scope.getter(row, nextJoinOn);
+ var id = Scope.getter(row, nextJoinOn);
joinIds[id] = id;
});
nextJoin.join.loadMany(_.toArray(joinIds), function(result){
@@ -321,7 +321,7 @@ nglr.DataStore.prototype.join = function(join){
byId[doc.$id] = doc;
});
_(joinedResult).each(function(row){
- var id = nglr.Scope.getter(row, nextJoinOn);
+ var id = Scope.getter(row, nextJoinOn);
row[nextJoinName] = byId[id];
});
});
diff --git a/src/Filters.js b/src/Filters.js
index f75f3603..dd4217be 100644
--- a/src/Filters.js
+++ b/src/Filters.js
@@ -60,11 +60,11 @@ angular.filter.date = function(amount) {
angular.filter.json = function(object) {
jQuery(this.element).addClass("ng-monospace");
- return nglr.toJson(object, true);
+ return toJson(object, true);
};
angular.filter.trackPackage = function(trackingNo, noMatch) {
- trackingNo = nglr.trim(trackingNo);
+ trackingNo = trim(trackingNo);
var tNo = trackingNo.replace(/ /g, '');
var MATCHERS = angular.filter.trackPackage.MATCHERS;
for ( var i = 0; i < MATCHERS.length; i++) {
@@ -77,7 +77,7 @@ angular.filter.trackPackage = function(trackingNo, noMatch) {
return new angular.filter.Meta({
text:text,
url:url,
- html: '' + text + '',
+ html: '' + text + '',
trackingNo:trackingNo});
}
}
@@ -115,7 +115,7 @@ angular.filter.link = function(obj, title) {
if (angular.validator.email(url) === null) {
url = "mailto:" + url;
}
- var html = '' + text + '';
+ var html = '' + text + '';
return new angular.filter.Meta({text:text, url:url, html:html});
}
return obj;
diff --git a/src/JSON.js b/src/JSON.js
index 2b6393bf..84c9a857 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -1,18 +1,18 @@
-nglr.array = [].constructor;
+array = [].constructor;
-nglr.toJson = function(obj, pretty){
+toJson = function(obj, pretty){
var buf = [];
- nglr.toJsonArray(buf, obj, pretty ? "\n " : null);
+ toJsonArray(buf, obj, pretty ? "\n " : null);
return buf.join('');
};
-nglr.toPrettyJson = function(obj) {
- return nglr.toJson(obj, true);
+toPrettyJson = function(obj) {
+ return toJson(obj, true);
};
-nglr.fromJson = function(json) {
+fromJson = function(json) {
try {
- var parser = new nglr.Parser(json, true);
+ var parser = new Parser(json, true);
var expression = parser.primary();
parser.assertAllConsumed();
return expression();
@@ -23,7 +23,7 @@ nglr.fromJson = function(json) {
};
-nglr.toJsonArray = function(buf, obj, pretty){
+toJsonArray = function(buf, obj, pretty){
var type = typeof obj;
if (obj === null) {
buf.push("null");
@@ -50,7 +50,7 @@ nglr.toJsonArray = function(buf, obj, pretty){
if (typeof item == 'function' || typeof item == 'undefined') {
buf.push("null");
} else {
- nglr.toJsonArray(buf, item, pretty);
+ toJsonArray(buf, item, pretty);
}
sep = true;
}
@@ -80,7 +80,7 @@ nglr.toJsonArray = function(buf, obj, pretty){
}
buf.push(angular.String.quote(key));
buf.push(":");
- nglr.toJsonArray(buf, value, childPretty);
+ toJsonArray(buf, value, childPretty);
comma = true;
}
} catch (e) {
diff --git a/src/Loader.js b/src/Loader.js
index eae6e4f5..dfaa355a 100644
--- a/src/Loader.js
+++ b/src/Loader.js
@@ -22,34 +22,37 @@ if (typeof Node == 'undefined') {
};
}
-if (_.isUndefined(window.nglr)) nglr = {};
-if (_.isUndefined(window.angular)) angular = {};
-if (_.isUndefined(angular.validator)) angular.validator = {};
-if (_.isUndefined(angular.filter)) angular.filter = {};
-if (_.isUndefined(window.console))
+var callbacks = {};
+
+if (!window.angular){ angular = {}; window['angular'] = angular; }
+if (!angular.validator) angular.validator = {};
+if (!angular.filter) angular.filter = {};
+if (!window.console)
window.console = {
log:function() {},
error:function() {}
};
-if (_.isUndefined(nglr.alert)) {
- nglr.alert = function(){console.log(arguments); window.alert.apply(window, arguments); };
+if (_.isUndefined(alert)) {
+ alert = function(){console.log(arguments); window.alert.apply(window, arguments); };
}
-nglr.consoleLog = function(level, objs) {
+var consoleNode;
+
+consoleLog = function(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 : nglr.toJson(obj));
+ msg += sep + (typeof obj == 'string' ? obj : toJson(obj));
sep = " ";
}
log.appendChild(document.createTextNode(msg));
- nglr.consoleNode.appendChild(log);
+ consoleNode.appendChild(log);
};
-nglr.isNode = function(inp) {
+isNode = function(inp) {
return inp &&
inp.tagName &&
inp.nodeName &&
@@ -57,7 +60,7 @@ nglr.isNode = function(inp) {
inp.removeAttribute;
};
-nglr.isLeafNode = function(node) {
+isLeafNode = function(node) {
switch (node.nodeName) {
case "OPTION":
case "PRE":
@@ -68,11 +71,11 @@ nglr.isLeafNode = function(node) {
}
};
-nglr.noop = function() {
+noop = function() {
};
-nglr.setHtml = function(node, html) {
- if (nglr.isLeafNode(node)) {
- if (nglr.msie) {
+setHtml = function(node, html) {
+ if (isLeafNode(node)) {
+ if (msie) {
node.innerText = html;
} else {
node.textContent = html;
@@ -82,7 +85,7 @@ nglr.setHtml = function(node, html) {
}
};
-nglr.escapeHtml = function(html) {
+escapeHtml = function(html) {
if (!html || !html.replace)
return html;
return html.
@@ -91,14 +94,14 @@ nglr.escapeHtml = function(html) {
replace(/>/g, '>');
};
-nglr.escapeAttr = function(html) {
+escapeAttr = function(html) {
if (!html || !html.replace)
return html;
return html.replace(//g, '>').replace(/\"/g,
'"');
};
-nglr.bind = function(_this, _function) {
+bind = function(_this, _function) {
if (!_this)
throw "Missing this";
if (!_.isFunction(_function))
@@ -108,7 +111,7 @@ nglr.bind = function(_this, _function) {
};
};
-nglr.shiftBind = function(_this, _function) {
+shiftBind = function(_this, _function) {
return function() {
var args = [ this ];
for ( var i = 0; i < arguments.length; i++) {
@@ -118,7 +121,7 @@ nglr.shiftBind = function(_this, _function) {
};
};
-nglr.outerHTML = function(node) {
+outerHTML = function(node) {
var temp = document.createElement('div');
temp.appendChild(node);
var outerHTML = temp.innerHTML;
@@ -126,26 +129,26 @@ nglr.outerHTML = function(node) {
return outerHTML;
};
-nglr.trim = function(str) {
+trim = function(str) {
return str.replace(/^ */, '').replace(/ *$/, '');
};
-nglr.toBoolean = function(value) {
+toBoolean = function(value) {
var v = ("" + value).toLowerCase();
if (v == 'f' || v == '0' || v == 'false' || v == 'no')
value = false;
return !!value;
};
-nglr.merge = function(src, dst) {
+merge = function(src, dst) {
for ( var key in src) {
var value = dst[key];
var type = typeof value;
if (type == 'undefined') {
- dst[key] = nglr.fromJson(nglr.toJson(src[key]));
- } else if (type == 'object' && value.constructor != nglr.array &&
+ dst[key] = fromJson(toJson(src[key]));
+ } else if (type == 'object' && value.constructor != array &&
key.substring(0, 1) != "$") {
- nglr.merge(src[key], value);
+ merge(src[key], value);
}
}
};
@@ -154,25 +157,25 @@ nglr.merge = function(src, dst) {
// Loader
// ////////////////////////////
-nglr.Loader = function(document, head, config) {
+Loader = function(document, head, config) {
this.document = jQuery(document);
this.head = jQuery(head);
this.config = config;
this.location = window.location;
};
-nglr.Loader.prototype.load = function() {
+Loader.prototype.load = function() {
this.configureLogging();
this.loadCss('/stylesheets/jquery-ui/smoothness/jquery-ui-1.7.1.css');
- this.loadCss('/stylesheets/nglr.css');
+ this.loadCss('/stylesheets/css');
console.log("Server: " + this.config.server);
- nglr.msie = jQuery.browser.msie;
+ msie = jQuery.browser.msie;
this.configureJQueryPlugins();
this.computeConfiguration();
this.bindHtml();
};
-nglr.Loader.prototype.configureJQueryPlugins = function() {
+Loader.prototype.configureJQueryPlugins = function() {
console.log('Loader.configureJQueryPlugins()');
jQuery.fn.removeNode = function() {
var node = this.get(0);
@@ -189,15 +192,15 @@ nglr.Loader.prototype.configureJQueryPlugins = function() {
return null;
};
jQuery.fn.controller = function() {
- return this.data('controller') || nglr.NullController.instance;
+ return this.data('controller') || NullController.instance;
};
};
-nglr.Loader.prototype.uid = function() {
+Loader.prototype.uid = function() {
return "" + new Date().getTime();
};
-nglr.Loader.prototype.computeConfiguration = function() {
+Loader.prototype.computeConfiguration = function() {
var config = this.config;
if (!config.database) {
var match = config.server.match(/https?:\/\/([\w]*)/);
@@ -205,27 +208,27 @@ nglr.Loader.prototype.computeConfiguration = function() {
}
};
-nglr.Loader.prototype.bindHtml = function() {
+Loader.prototype.bindHtml = function() {
console.log('Loader.bindHtml()');
- var watcher = new nglr.UrlWatcher(this.location);
+ var watcher = new UrlWatcher(this.location);
var document = this.document;
- var widgetFactory = new nglr.WidgetFactory(this.config.server, this.config.database);
- var binder = new nglr.Binder(document[0], widgetFactory, watcher, this.config);
- widgetFactory.onChangeListener = nglr.shiftBind(binder, binder.updateModel);
- var controlBar = new nglr.ControlBar(document.find('body'), this.config.server);
+ var widgetFactory = new WidgetFactory(this.config.server, this.config.database);
+ var binder = new Binder(document[0], widgetFactory, watcher, this.config);
+ widgetFactory.onChangeListener = shiftBind(binder, binder.updateModel);
+ var controlBar = new ControlBar(document.find('body'), this.config.server);
var onUpdate = function(){binder.updateView();};
var server = this.config.database=="$MEMORY" ?
- new nglr.FrameServer(this.window) :
- new nglr.Server(this.config.server, jQuery.getScript);
- server = new nglr.VisualServer(server, new nglr.Status(jQuery(document.body)), onUpdate);
- var users = new nglr.Users(server, controlBar);
+ new FrameServer(this.window) :
+ new Server(this.config.server, jQuery.getScript);
+ server = new VisualServer(server, new Status(jQuery(document.body)), onUpdate);
+ var users = new Users(server, controlBar);
var databasePath = '/data/' + this.config.database;
var post = function(request, callback){
server.request("POST", databasePath, request, callback);
};
- var datastore = new nglr.DataStore(post, users, binder.anchor);
+ var datastore = new DataStore(post, users, binder.anchor);
binder.updateListeners.push(function(){datastore.flush();});
- var scope = new nglr.Scope( {
+ var scope = new Scope( {
$anchor : binder.anchor,
$binder : binder,
$config : this.config,
@@ -241,7 +244,7 @@ nglr.Loader.prototype.bindHtml = function() {
jQuery.each(["get", "set", "eval", "addWatchListener", "updateView"],
function(i, method){
- angular[method] = nglr.bind(scope, scope[method]);
+ angular[method] = bind(scope, scope[method]);
});
document.data('scope', scope);
@@ -265,7 +268,7 @@ nglr.Loader.prototype.bindHtml = function() {
fetchCurrentUser();
console.log('PopUp.bind()');
- new nglr.PopUp(document).bind();
+ new PopUp(document).bind();
console.log('$binder.parseAnchor()');
binder.parseAnchor();
@@ -276,16 +279,16 @@ nglr.Loader.prototype.bindHtml = function() {
console.log('$binder.updateView()');
binder.updateView();
- watcher.listener = nglr.bind(binder, binder.onUrlChange, watcher);
- watcher.onUpdate = function(){nglr.alert("update");};
+ watcher.listener = bind(binder, binder.onUrlChange, watcher);
+ watcher.onUpdate = function(){alert("update");};
watcher.watch();
document.find("body").show();
console.log('ready()');
};
-nglr.Loader.prototype.visualPost = function(delegate) {
- var status = new nglr.Status(jQuery(document.body));
+Loader.prototype.visualPost = function(delegate) {
+ var status = new Status(jQuery(document.body));
return function(request, delegateCallback) {
status.beginRequest(request);
var callback = function() {
@@ -293,14 +296,14 @@ nglr.Loader.prototype.visualPost = function(delegate) {
try {
delegateCallback.apply(this, arguments);
} catch (e) {
- nglr.alert(nglr.toJson(e));
+ alert(toJson(e));
}
};
delegate(request, callback);
};
};
-nglr.Loader.prototype.configureLogging = function() {
+Loader.prototype.configureLogging = function() {
var url = window.location.href + '#';
url = url.split('#')[1];
var config = {
@@ -312,19 +315,19 @@ nglr.Loader.prototype.configureLogging = function() {
config[part[0]] = part[1];
}
if (config.debug == 'console') {
- nglr.consoleNode = document.createElement("div");
- nglr.consoleNode.id = 'ng-console';
- document.getElementsByTagName('body')[0].appendChild(nglr.consoleNode);
+ consoleNode = document.createElement("div");
+ consoleNode.id = 'ng-console';
+ document.getElementsByTagName('body')[0].appendChild(consoleNode);
console.log = function() {
- nglr.consoleLog('ng-console-info', arguments);
+ consoleLog('ng-console-info', arguments);
};
console.error = function() {
- nglr.consoleLog('ng-console-error', arguments);
+ consoleLog('ng-console-error', arguments);
};
}
};
-nglr.Loader.prototype.loadCss = function(css) {
+Loader.prototype.loadCss = function(css) {
var cssTag = document.createElement('link');
cssTag.rel = "stylesheet";
cssTag.type = "text/css";
@@ -334,7 +337,7 @@ nglr.Loader.prototype.loadCss = function(css) {
this.head[0].appendChild(cssTag);
};
-nglr.UrlWatcher = function(location) {
+UrlWatcher = function(location) {
this.location = location;
this.delay = 25;
this.setTimeout = function(fn, delay) {
@@ -346,7 +349,7 @@ nglr.UrlWatcher = function(location) {
this.expectedUrl = location.href;
};
-nglr.UrlWatcher.prototype.watch = function() {
+UrlWatcher.prototype.watch = function() {
var self = this;
var pull = function() {
if (self.expectedUrl !== self.location.href) {
@@ -357,12 +360,12 @@ nglr.UrlWatcher.prototype.watch = function() {
}
self.location.href = self.expectedUrl;
var id = '_iframe_notify_' + notify[1];
- var notifyFn = nglr[id];
- delete nglr[id];
+ var notifyFn = callbacks[id];
+ delete callbacks[id];
try {
- (notifyFn||nglr.noop)();
+ (notifyFn||noop)();
} catch (e) {
- nglr.alert(e);
+ alert(e);
}
} else {
self.listener(self.location.href);
@@ -374,16 +377,16 @@ nglr.UrlWatcher.prototype.watch = function() {
pull();
};
-nglr.UrlWatcher.prototype.setUrl = function(url) {
+UrlWatcher.prototype.setUrl = function(url) {
var existingURL = window.location.href;
if (!existingURL.match(/#/))
existingURL += '#';
if (existingURL != url)
window.location.href = url;
- self.existingURL = url;
+ this.existingURL = url;
};
-nglr.UrlWatcher.prototype.getUrl = function() {
+UrlWatcher.prototype.getUrl = function() {
return window.location.href;
};
@@ -394,7 +397,7 @@ angular['compile'] = function(root, config) {
};
//todo: don't load stylesheet by default
//todo: don't start watcher
- var loader = new nglr.Loader(root, jQuery("head"), _(defaults).extend(config));
+ var loader = new Loader(root, jQuery("head"), _(defaults).extend(config));
loader.load();
return jQuery(root).scope();
};
diff --git a/src/Model.js b/src/Model.js
index 5e48251f..35f6a1c1 100644
--- a/src/Model.js
+++ b/src/Model.js
@@ -3,14 +3,14 @@
// Single $ is special and does not get searched
// Double $$ is special an is client only (does not get sent to server)
-nglr.Model = function(entity, initial) {
+Model = function(entity, initial) {
this.$$entity = entity;
this.$loadFrom(initial||{});
this.$entity = entity.title;
this.$migrate();
};
-nglr.Model.copyDirectFields = function(src, dst) {
+Model.copyDirectFields = function(src, dst) {
if (src === dst || !src || !dst) return;
var isDataField = function(src, dst, field) {
return (field.substring(0,2) !== '$$') &&
@@ -27,39 +27,39 @@ nglr.Model.copyDirectFields = function(src, dst) {
}
};
-nglr.Model.prototype.$migrate = function() {
- nglr.merge(this.$$entity.defaults, this);
+Model.prototype.$migrate = function() {
+ merge(this.$$entity.defaults, this);
return this;
};
-nglr.Model.prototype.$merge = function(other) {
- nglr.merge(other, this);
+Model.prototype.$merge = function(other) {
+ merge(other, this);
return this;
};
-nglr.Model.prototype.$save = function(callback) {
+Model.prototype.$save = function(callback) {
this.$$entity.datastore.save(this, callback === true ? undefined : callback);
if (callback === true) this.$$entity.datastore.flush();
return this;
};
-nglr.Model.prototype.$delete = function(callback) {
+Model.prototype.$delete = function(callback) {
this.$$entity.datastore.remove(this, callback === true ? undefined : callback);
if (callback === true) this.$$entity.datastore.flush();
return this;
};
-nglr.Model.prototype.$loadById = function(id, callback) {
+Model.prototype.$loadById = function(id, callback) {
this.$$entity.datastore.load(this, id, callback);
return this;
};
-nglr.Model.prototype.$loadFrom = function(other) {
- nglr.Model.copyDirectFields(other, this);
+Model.prototype.$loadFrom = function(other) {
+ Model.copyDirectFields(other, this);
return this;
};
-nglr.Model.prototype.$saveTo = function(other) {
- nglr.Model.copyDirectFields(this, other);
+Model.prototype.$saveTo = function(other) {
+ Model.copyDirectFields(this, other);
return this;
};
diff --git a/src/Parser.js b/src/Parser.js
index 3d72bebf..b23215be 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -1,4 +1,4 @@
-nglr.Lexer = function(text, parsStrings){
+Lexer = function(text, parsStrings){
this.text = text;
// UTC dates have 20 characters, we send them through parser
this.dateParseLength = parsStrings ? 20 : -1;
@@ -6,7 +6,7 @@ nglr.Lexer = function(text, parsStrings){
this.index = 0;
};
-nglr.Lexer.OPERATORS = {
+Lexer.OPERATORS = {
'null':function(self){return null;},
'true':function(self){return true;},
'false':function(self){return false;},
@@ -31,7 +31,7 @@ nglr.Lexer.OPERATORS = {
'!':function(self, a){return !a;}
};
-nglr.Lexer.prototype.peek = function() {
+Lexer.prototype.peek = function() {
if (this.index + 1 < this.text.length) {
return this.text.charAt(this.index + 1);
} else {
@@ -39,9 +39,9 @@ nglr.Lexer.prototype.peek = function() {
}
};
-nglr.Lexer.prototype.parse = function() {
+Lexer.prototype.parse = function() {
var tokens = this.tokens;
- var OPERATORS = nglr.Lexer.OPERATORS;
+ var OPERATORS = Lexer.OPERATORS;
var canStartRegExp = true;
while (this.index < this.text.length) {
var ch = this.text.charAt(this.index);
@@ -102,22 +102,22 @@ nglr.Lexer.prototype.parse = function() {
return tokens;
};
-nglr.Lexer.prototype.isNumber = function(ch) {
+Lexer.prototype.isNumber = function(ch) {
return '0' <= ch && ch <= '9';
};
-nglr.Lexer.prototype.isWhitespace = function(ch) {
+Lexer.prototype.isWhitespace = function(ch) {
return ch == ' ' || ch == '\r' || ch == '\t' ||
ch == '\n' || ch == '\v';
};
-nglr.Lexer.prototype.isIdent = function(ch) {
+Lexer.prototype.isIdent = function(ch) {
return 'a' <= ch && ch <= 'z' ||
'A' <= ch && ch <= 'Z' ||
'_' == ch || ch == '$';
};
-nglr.Lexer.prototype.readNumber = function() {
+Lexer.prototype.readNumber = function() {
var number = "";
var start = this.index;
while (this.index < this.text.length) {
@@ -134,7 +134,7 @@ nglr.Lexer.prototype.readNumber = function() {
fn:function(){return number;}});
};
-nglr.Lexer.prototype.readIdent = function() {
+Lexer.prototype.readIdent = function() {
var ident = "";
var start = this.index;
while (this.index < this.text.length) {
@@ -146,7 +146,7 @@ nglr.Lexer.prototype.readIdent = function() {
}
this.index++;
}
- var fn = nglr.Lexer.OPERATORS[ident];
+ var fn = Lexer.OPERATORS[ident];
if (!fn) {
fn = function(self){
return self.scope.get(ident);
@@ -155,8 +155,8 @@ nglr.Lexer.prototype.readIdent = function() {
}
this.tokens.push({index:start, text:ident, fn:fn});
};
-nglr.Lexer.ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'};
-nglr.Lexer.prototype.readString = function(quote) {
+Lexer.ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'};
+Lexer.prototype.readString = function(quote) {
var start = this.index;
var dateParseLength = this.dateParseLength;
this.index++;
@@ -170,7 +170,7 @@ nglr.Lexer.prototype.readString = function(quote) {
this.index += 4;
string += String.fromCharCode(parseInt(hex, 16));
} else {
- var rep = nglr.Lexer.ESCAPE[ch];
+ var rep = Lexer.ESCAPE[ch];
if (rep) {
string += rep;
} else {
@@ -198,7 +198,7 @@ nglr.Lexer.prototype.readString = function(quote) {
(start+1) + "' in expression '" + this.text + "'.";
};
-nglr.Lexer.prototype.readRegexp = function(quote) {
+Lexer.prototype.readRegexp = function(quote) {
var start = this.index;
this.index++;
var regexp = "";
@@ -233,30 +233,30 @@ nglr.Lexer.prototype.readRegexp = function(quote) {
};
-nglr.Parser = function(text, parseStrings){
+Parser = function(text, parseStrings){
this.text = text;
- this.tokens = new nglr.Lexer(text, parseStrings).parse();
+ this.tokens = new Lexer(text, parseStrings).parse();
this.index = 0;
};
-nglr.Parser.ZERO = function(){
+Parser.ZERO = function(){
return 0;
};
-nglr.Parser.prototype.error = function(msg, token) {
+Parser.prototype.error = function(msg, token) {
throw "Token '" + token.text +
"' is " + msg + " at column='" +
(token.index + 1) + "' of expression '" +
this.text + "' starting at '" + this.text.substring(token.index) + "'.";
};
-nglr.Parser.prototype.peekToken = function() {
+Parser.prototype.peekToken = function() {
if (this.tokens.length === 0)
throw "Unexpected end of expression: " + this.text;
return this.tokens[0];
};
-nglr.Parser.prototype.peek = function(e1, e2, e3, e4) {
+Parser.prototype.peek = function(e1, e2, e3, e4) {
var tokens = this.tokens;
if (tokens.length > 0) {
var token = tokens[0];
@@ -269,7 +269,7 @@ nglr.Parser.prototype.peek = function(e1, e2, e3, e4) {
return false;
};
-nglr.Parser.prototype.expect = function(e1, e2, e3, e4){
+Parser.prototype.expect = function(e1, e2, e3, e4){
var token = this.peek(e1, e2, e3, e4);
if (token) {
this.tokens.shift();
@@ -279,7 +279,7 @@ nglr.Parser.prototype.expect = function(e1, e2, e3, e4){
return false;
};
-nglr.Parser.prototype.consume = function(e1){
+Parser.prototype.consume = function(e1){
if (!this.expect(e1)) {
var token = this.peek();
throw "Expecting '" + e1 + "' at column '" +
@@ -289,32 +289,32 @@ nglr.Parser.prototype.consume = function(e1){
}
};
-nglr.Parser.prototype._unary = function(fn, parse) {
+Parser.prototype._unary = function(fn, parse) {
var right = parse.apply(this);
return function(self) {
return fn(self, right(self));
};
};
-nglr.Parser.prototype._binary = function(left, fn, parse) {
+Parser.prototype._binary = function(left, fn, parse) {
var right = parse.apply(this);
return function(self) {
return fn(self, left(self), right(self));
};
};
-nglr.Parser.prototype.hasTokens = function () {
+Parser.prototype.hasTokens = function () {
return this.tokens.length > 0;
};
-nglr.Parser.prototype.assertAllConsumed = function(){
+Parser.prototype.assertAllConsumed = function(){
if (this.tokens.length !== 0) {
throw "Did not understand '" + this.text.substring(this.tokens[0].index) +
"' while evaluating '" + this.text + "'.";
}
};
-nglr.Parser.prototype.statements = function(){
+Parser.prototype.statements = function(){
var statements = [];
while(true) {
if (this.tokens.length > 0 && !this.peek('}', ')', ';', ']'))
@@ -333,7 +333,7 @@ nglr.Parser.prototype.statements = function(){
}
};
-nglr.Parser.prototype.filterChain = function(){
+Parser.prototype.filterChain = function(){
var left = this.expression();
var token;
while(true) {
@@ -345,15 +345,15 @@ nglr.Parser.prototype.filterChain = function(){
}
};
-nglr.Parser.prototype.filter = function(){
+Parser.prototype.filter = function(){
return this._pipeFunction(angular.filter);
};
-nglr.Parser.prototype.validator = function(){
+Parser.prototype.validator = function(){
return this._pipeFunction(angular.validator);
};
-nglr.Parser.prototype._pipeFunction = function(fnScope){
+Parser.prototype._pipeFunction = function(fnScope){
var fn = this.functionIdent(fnScope);
var argsFn = [];
var token;
@@ -375,11 +375,11 @@ nglr.Parser.prototype._pipeFunction = function(fnScope){
}
};
-nglr.Parser.prototype.expression = function(){
+Parser.prototype.expression = function(){
return this.throwStmt();
};
-nglr.Parser.prototype.throwStmt = function(){
+Parser.prototype.throwStmt = function(){
if (this.expect('throw')) {
var throwExp = this.assignment();
return function (self) {
@@ -390,7 +390,7 @@ nglr.Parser.prototype.throwStmt = function(){
}
};
-nglr.Parser.prototype.assignment = function(){
+Parser.prototype.assignment = function(){
var left = this.logicalOR();
var token;
if (token = this.expect('=')) {
@@ -406,7 +406,7 @@ nglr.Parser.prototype.assignment = function(){
}
};
-nglr.Parser.prototype.logicalOR = function(){
+Parser.prototype.logicalOR = function(){
var left = this.logicalAND();
var token;
while(true) {
@@ -418,7 +418,7 @@ nglr.Parser.prototype.logicalOR = function(){
}
};
-nglr.Parser.prototype.logicalAND = function(){
+Parser.prototype.logicalAND = function(){
var left = this.negated();
var token;
while(true) {
@@ -430,7 +430,7 @@ nglr.Parser.prototype.logicalAND = function(){
}
};
-nglr.Parser.prototype.negated = function(){
+Parser.prototype.negated = function(){
var token;
if (token = this.expect('!')) {
return this._unary(token.fn, this.equality);
@@ -439,7 +439,7 @@ nglr.Parser.prototype.negated = function(){
}
};
-nglr.Parser.prototype.equality = function(){
+Parser.prototype.equality = function(){
var left = this.relational();
var token;
while(true) {
@@ -451,7 +451,7 @@ nglr.Parser.prototype.equality = function(){
}
};
-nglr.Parser.prototype.relational = function(){
+Parser.prototype.relational = function(){
var left = this.additive();
var token;
while(true) {
@@ -463,7 +463,7 @@ nglr.Parser.prototype.relational = function(){
}
};
-nglr.Parser.prototype.additive = function(){
+Parser.prototype.additive = function(){
var left = this.multiplicative();
var token;
while(token = this.expect('+','-')) {
@@ -472,7 +472,7 @@ nglr.Parser.prototype.additive = function(){
return left;
};
-nglr.Parser.prototype.multiplicative = function(){
+Parser.prototype.multiplicative = function(){
var left = this.unary();
var token;
while(token = this.expect('*','/','%')) {
@@ -481,18 +481,18 @@ nglr.Parser.prototype.multiplicative = function(){
return left;
};
-nglr.Parser.prototype.unary = function(){
+Parser.prototype.unary = function(){
var token;
if (this.expect('+')) {
return this.primary();
} else if (token = this.expect('-')) {
- return this._binary(nglr.Parser.ZERO, token.fn, this.multiplicative);
+ return this._binary(Parser.ZERO, token.fn, this.multiplicative);
} else {
return this.primary();
}
};
-nglr.Parser.prototype.functionIdent = function(fnScope) {
+Parser.prototype.functionIdent = function(fnScope) {
var token = this.expect();
var element = token.text.split('.');
var instance = fnScope;
@@ -509,7 +509,7 @@ nglr.Parser.prototype.functionIdent = function(fnScope) {
return instance;
};
-nglr.Parser.prototype.primary = function() {
+Parser.prototype.primary = function() {
var primary;
if (this.expect('(')) {
var expression = this.filterChain();
@@ -545,7 +545,7 @@ nglr.Parser.prototype.primary = function() {
return primary;
};
-nglr.Parser.prototype.closure = function(hasArgs) {
+Parser.prototype.closure = function(hasArgs) {
var args = [];
if (hasArgs) {
if (!this.expect(')')) {
@@ -561,7 +561,7 @@ nglr.Parser.prototype.closure = function(hasArgs) {
this.consume("}");
return function(self){
return function($){
- var scope = new nglr.Scope(self.scope.state);
+ var scope = new Scope(self.scope.state);
scope.set('$', $);
for ( var i = 0; i < args.length; i++) {
scope.set(args[i], arguments[i]);
@@ -571,16 +571,16 @@ nglr.Parser.prototype.closure = function(hasArgs) {
};
};
-nglr.Parser.prototype.fieldAccess = function(object) {
+Parser.prototype.fieldAccess = function(object) {
var field = this.expect().text;
var fn = function (self){
- return nglr.Scope.getter(object(self), field);
+ return Scope.getter(object(self), field);
};
fn.isAssignable = field;
return fn;
};
-nglr.Parser.prototype.objectIndex = function(obj) {
+Parser.prototype.objectIndex = function(obj) {
var indexFn = this.expression();
this.consume(']');
if (this.expect('=')) {
@@ -597,7 +597,7 @@ nglr.Parser.prototype.objectIndex = function(obj) {
}
};
-nglr.Parser.prototype.functionCall = function(fn) {
+Parser.prototype.functionCall = function(fn) {
var argsFn = [];
if (this.peekToken().text != ')') {
do {
@@ -620,7 +620,7 @@ nglr.Parser.prototype.functionCall = function(fn) {
};
// This is used with json array declaration
-nglr.Parser.prototype.arrayDeclaration = function () {
+Parser.prototype.arrayDeclaration = function () {
var elementFns = [];
if (this.peekToken().text != ']') {
do {
@@ -637,7 +637,7 @@ nglr.Parser.prototype.arrayDeclaration = function () {
};
};
-nglr.Parser.prototype.object = function () {
+Parser.prototype.object = function () {
var keyValues = [];
if (this.peekToken().text != '}') {
do {
@@ -659,7 +659,7 @@ nglr.Parser.prototype.object = function () {
};
};
-nglr.Parser.prototype.entityDeclaration = function () {
+Parser.prototype.entityDeclaration = function () {
var decl = [];
while(this.hasTokens()) {
decl.push(this.entityDecl());
@@ -676,7 +676,7 @@ nglr.Parser.prototype.entityDeclaration = function () {
};
};
-nglr.Parser.prototype.entityDecl = function () {
+Parser.prototype.entityDecl = function () {
var entity = this.expect().text;
var instance;
var defaults;
@@ -705,7 +705,7 @@ nglr.Parser.prototype.entityDecl = function () {
};
};
-nglr.Parser.prototype.watch = function () {
+Parser.prototype.watch = function () {
var decl = [];
while(this.hasTokens()) {
decl.push(this.watchDecl());
@@ -722,7 +722,7 @@ nglr.Parser.prototype.watch = function () {
};
};
-nglr.Parser.prototype.watchDecl = function () {
+Parser.prototype.watchDecl = function () {
var anchorName = this.expect().text;
this.consume(":");
var expression;
diff --git a/src/Scope.js b/src/Scope.js
index 45dd15a4..e3634cee 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -1,6 +1,6 @@
// Copyright (C) 2009 BRAT Tech LLC
-nglr.Scope = function(initialState, name) {
+Scope = function(initialState, name) {
this.widgets = [];
this.watchListeners = {};
this.name = name;
@@ -14,9 +14,9 @@ nglr.Scope = function(initialState, name) {
}
};
-nglr.Scope.expressionCache = {};
+Scope.expressionCache = {};
-nglr.Scope.prototype.updateView = function() {
+Scope.prototype.updateView = function() {
var self = this;
this.fireWatchers();
_.each(this.widgets, function(widget){
@@ -26,21 +26,21 @@ nglr.Scope.prototype.updateView = function() {
});
};
-nglr.Scope.prototype.addWidget = function(controller) {
+Scope.prototype.addWidget = function(controller) {
if (controller) this.widgets.push(controller);
};
-nglr.Scope.prototype.isProperty = function(exp) {
+Scope.prototype.isProperty = function(exp) {
for ( var i = 0; i < exp.length; i++) {
var ch = exp.charAt(i);
- if (ch!='.' && !nglr.Lexer.prototype.isIdent(ch)) {
+ if (ch!='.' && !Lexer.prototype.isIdent(ch)) {
return false;
}
}
return true;
};
-nglr.Scope.getter = function(instance, path) {
+Scope.getter = function(instance, path) {
if (!path) return instance;
var element = path.split('.');
var key;
@@ -65,16 +65,16 @@ nglr.Scope.getter = function(instance, path) {
}
}
if (typeof instance === 'function' && !instance.$$factory) {
- return nglr.bind(lastInstance, instance);
+ return bind(lastInstance, instance);
}
return instance;
};
-nglr.Scope.prototype.get = function(path) {
- return nglr.Scope.getter(this.state, path);
+Scope.prototype.get = function(path) {
+ return Scope.getter(this.state, path);
};
-nglr.Scope.prototype.set = function(path, value) {
+Scope.prototype.set = function(path, value) {
var element = path.split('.');
var instance = this.state;
for ( var i = 0; element.length > 1; i++) {
@@ -90,17 +90,17 @@ nglr.Scope.prototype.set = function(path, value) {
return value;
};
-nglr.Scope.prototype.setEval = function(expressionText, value) {
- this.eval(expressionText + "=" + nglr.toJson(value));
+Scope.prototype.setEval = function(expressionText, value) {
+ this.eval(expressionText + "=" + toJson(value));
};
-nglr.Scope.prototype.eval = function(expressionText, context) {
- var expression = nglr.Scope.expressionCache[expressionText];
+Scope.prototype.eval = function(expressionText, context) {
+ var expression = Scope.expressionCache[expressionText];
if (!expression) {
- var parser = new nglr.Parser(expressionText);
+ var parser = new Parser(expressionText);
expression = parser.statements();
parser.assertAllConsumed();
- nglr.Scope.expressionCache[expressionText] = expression;
+ Scope.expressionCache[expressionText] = expression;
}
context = context || {};
context.scope = this;
@@ -110,7 +110,7 @@ nglr.Scope.prototype.eval = function(expressionText, context) {
//TODO: Refactor. This function needs to be an execution closure for widgets
// move to widgets
// remove expression, just have inner closure.
-nglr.Scope.prototype.evalWidget = function(widget, expression, context, onSuccess, onFailure) {
+Scope.prototype.evalWidget = function(widget, expression, context, onSuccess, onFailure) {
try {
var value = this.eval(expression, context);
if (widget.hasError) {
@@ -125,7 +125,7 @@ nglr.Scope.prototype.evalWidget = function(widget, expression, context, onSucces
return true;
} catch (e){
console.error('Eval Widget Error:', e);
- var jsonError = nglr.toJson(e, true);
+ var jsonError = toJson(e, true);
widget.hasError = true;
jQuery(widget.view).
addClass('ng-exception').
@@ -137,42 +137,42 @@ nglr.Scope.prototype.evalWidget = function(widget, expression, context, onSucces
}
};
-nglr.Scope.prototype.validate = function(expressionText, value) {
- var expression = nglr.Scope.expressionCache[expressionText];
+Scope.prototype.validate = function(expressionText, value) {
+ var expression = Scope.expressionCache[expressionText];
if (!expression) {
- expression = new nglr.Parser(expressionText).validator();
- nglr.Scope.expressionCache[expressionText] = expression;
+ expression = new Parser(expressionText).validator();
+ Scope.expressionCache[expressionText] = expression;
}
var self = {scope:this};
return expression(self)(self, value);
};
-nglr.Scope.prototype.entity = function(entityDeclaration) {
- var expression = new nglr.Parser(entityDeclaration).entityDeclaration();
+Scope.prototype.entity = function(entityDeclaration) {
+ var expression = new Parser(entityDeclaration).entityDeclaration();
return expression({scope:this});
};
-nglr.Scope.prototype.markInvalid = function(widget) {
+Scope.prototype.markInvalid = function(widget) {
this.state.$invalidWidgets.push(widget);
};
-nglr.Scope.prototype.watch = function(declaration) {
+Scope.prototype.watch = function(declaration) {
var self = this;
- new nglr.Parser(declaration).watch()({
+ 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) {
- nglr.alert(e);
+ alert(e);
}
});
}
});
};
-nglr.Scope.prototype.addWatchListener = function(watchExpression, listener) {
+Scope.prototype.addWatchListener = function(watchExpression, listener) {
var watcher = this.watchListeners[watchExpression];
if (!watcher) {
watcher = {listeners:[], expression:watchExpression};
@@ -181,7 +181,7 @@ nglr.Scope.prototype.addWatchListener = function(watchExpression, listener) {
watcher.listeners.push(listener);
};
-nglr.Scope.prototype.fireWatchers = function() {
+Scope.prototype.fireWatchers = function() {
var self = this;
var fired = false;
jQuery.each(this.watchListeners, function(name, watcher) {
diff --git a/src/Server.js b/src/Server.js
index 94b0cc10..d00f893b 100644
--- a/src/Server.js
+++ b/src/Server.js
@@ -1,6 +1,6 @@
// Copyright (C) 2008,2009 BRAT Tech LLC
-nglr.Server = function(url, getScript) {
+Server = function(url, getScript) {
this.url = url;
this.nextId = 0;
this.getScript = getScript;
@@ -8,51 +8,51 @@ nglr.Server = function(url, getScript) {
this.maxSize = 1800;
};
-nglr.Server.prototype.base64url = function(txt) {
+Server.prototype.base64url = function(txt) {
return Base64.encode(txt);
};
-nglr.Server.prototype.request = function(method, url, request, callback) {
+Server.prototype.request = function(method, url, request, callback) {
var requestId = this.uuid + (this.nextId++);
- nglr[requestId] = function(response) {
- delete nglr[requestId];
+ callbacks[requestId] = function(response) {
+ delete angular[requestId];
callback(200, response);
};
var payload = {u:url, m:method, p:request};
- payload = this.base64url(nglr.toJson(payload));
+ payload = this.base64url(toJson(payload));
var totalPockets = Math.ceil(payload.length / this.maxSize);
var baseUrl = this.url + "/$/" + requestId + "/" + totalPockets + "/";
for ( var pocketNo = 0; pocketNo < totalPockets; pocketNo++) {
var pocket = payload.substr(pocketNo * this.maxSize, this.maxSize);
- this.getScript(baseUrl + (pocketNo+1) + "?h=" + pocket, nglr.noop);
+ this.getScript(baseUrl + (pocketNo+1) + "?h=" + pocket, noop);
}
};
-nglr.FrameServer = function(frame) {
+FrameServer = function(frame) {
this.frame = frame;
};
-nglr.FrameServer.PREFIX = "$DATASET:";
+FrameServer.PREFIX = "$DATASET:";
-nglr.FrameServer.prototype = {
+FrameServer.prototype = {
read:function(){
- this.data = nglr.fromJson(this.frame.name.substr(nglr.FrameServer.PREFIX.length));
+ this.data = fromJson(this.frame.name.substr(FrameServer.PREFIX.length));
},
write:function(){
- this.frame.name = nglr.FrameServer.PREFIX + nglr.toJson(this.data);
+ this.frame.name = FrameServer.PREFIX + toJson(this.data);
},
request: function(method, url, request, callback) {
- //alert(method + " " + url + " " + nglr.toJson(request) + " " + nglr.toJson(callback));
+ //alert(method + " " + url + " " + toJson(request) + " " + toJson(callback));
}
};
-nglr.VisualServer = function(delegate, status, update) {
+VisualServer = function(delegate, status, update) {
this.delegate = delegate;
this.update = update;
this.status = status;
};
-nglr.VisualServer.prototype = {
+VisualServer.prototype = {
request:function(method, url, request, callback) {
var self = this;
this.status.beginRequest(request);
@@ -61,7 +61,7 @@ nglr.VisualServer.prototype = {
try {
callback.apply(this, arguments);
} catch (e) {
- nglr.alert(nglr.toJson(e));
+ alert(toJson(e));
}
self.update();
});
diff --git a/src/Users.js b/src/Users.js
index c0c15848..d10b96df 100644
--- a/src/Users.js
+++ b/src/Users.js
@@ -1,10 +1,10 @@
// Copyright (C) 2008,2009 BRAT Tech LLC
-nglr.Users = function(server, controlBar) {
+Users = function(server, controlBar) {
this.server = server;
this.controlBar = controlBar;
};
-nglr.Users.prototype = {
+Users.prototype = {
fetchCurrentUser:function(callback) {
var self = this;
this.server.request("GET", "/account.json", {}, function(code, response){
@@ -17,7 +17,7 @@ nglr.Users.prototype = {
var self = this;
this.controlBar.logout(function(){
delete self.current;
- (callback||nglr.noop)();
+ (callback||noop)();
});
},
@@ -25,7 +25,7 @@ nglr.Users.prototype = {
var self = this;
this.controlBar.login(function(){
self.fetchCurrentUser(function(){
- (callback||nglr.noop)();
+ (callback||noop)();
});
});
},
diff --git a/src/Validators.js b/src/Validators.js
index 94cb1d52..7cfaa2b4 100644
--- a/src/Validators.js
+++ b/src/Validators.js
@@ -72,7 +72,7 @@ angular.validator.url = function(value) {
angular.validator.json = function(value) {
try {
- nglr.fromJson(value);
+ fromJson(value);
return null;
} catch (e) {
return e.toString();
diff --git a/src/Widgets.js b/src/Widgets.js
index de74533a..3a0f2845 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -1,7 +1,7 @@
// Copyright (C) 2009 BRAT Tech LLC
-nglr.WidgetFactory = function(serverUrl, database) {
+WidgetFactory = function(serverUrl, database) {
this.nextUploadId = 0;
this.serverUrl = serverUrl;
this.database = database;
@@ -9,7 +9,7 @@ nglr.WidgetFactory = function(serverUrl, database) {
this.onChangeListener = function(){};
};
-nglr.WidgetFactory.prototype.createController = function(input, scope) {
+WidgetFactory.prototype.createController = function(input, scope) {
var controller;
var type = input.attr('type').toLowerCase();
var exp = input.attr('name');
@@ -17,22 +17,22 @@ nglr.WidgetFactory.prototype.createController = function(input, scope) {
var event = "change";
var bubbleEvent = true;
if (type == 'button' || type == 'submit' || type == 'reset' || type == 'image') {
- controller = new nglr.ButtonController(input[0], exp);
+ controller = new ButtonController(input[0], exp);
event = "click";
bubbleEvent = false;
} else if (type == 'text' || type == 'textarea' || type == 'hidden' || type == 'password') {
- controller = new nglr.TextController(input[0], exp);
+ controller = new TextController(input[0], exp);
event = "keyup change";
} else if (type == 'checkbox') {
- controller = new nglr.CheckboxController(input[0], exp);
+ controller = new CheckboxController(input[0], exp);
event = "click";
} else if (type == 'radio') {
- controller = new nglr.RadioController(input[0], exp);
+ controller = new RadioController(input[0], exp);
event="click";
} else if (type == 'select-one') {
- controller = new nglr.SelectController(input[0], exp);
+ controller = new SelectController(input[0], exp);
} else if (type == 'select-multiple') {
- controller = new nglr.MultiSelectController(input[0], exp);
+ controller = new MultiSelectController(input[0], exp);
} else if (type == 'file') {
controller = this.createFileController(input, exp);
} else {
@@ -54,9 +54,9 @@ nglr.WidgetFactory.prototype.createController = function(input, scope) {
return controller;
};
-nglr.WidgetFactory.prototype.createFileController = function(fileInput) {
+WidgetFactory.prototype.createFileController = function(fileInput) {
var uploadId = '__uploadWidget_' + (this.nextUploadId++);
- var view = nglr.FileController.template(uploadId);
+ var view = FileController.template(uploadId);
fileInput.after(view);
var att = {
data:this.serverUrl + "/admin/ServerAPI.swf",
@@ -67,13 +67,13 @@ nglr.WidgetFactory.prototype.createFileController = function(fileInput) {
allowScriptAccess:"always"};
var swfNode = this.createSWF(att, par, uploadId);
fileInput.remove();
- var cntl = new nglr.FileController(view, fileInput[0].name, swfNode, this.serverUrl + "/data/" + this.database);
+ var cntl = new FileController(view, fileInput[0].name, swfNode, this.serverUrl + "/data/" + this.database);
jQuery(swfNode).data('controller', cntl);
return cntl;
};
-nglr.WidgetFactory.prototype.createTextWidget = function(textInput) {
- var controller = new nglr.TextController(textInput);
+WidgetFactory.prototype.createTextWidget = function(textInput) {
+ var controller = new TextController(textInput);
controller.onChange(this.onChangeListener);
return controller;
};
@@ -82,7 +82,7 @@ nglr.WidgetFactory.prototype.createTextWidget = function(textInput) {
// FileController
///////////////////////
-nglr.FileController = function(view, scopeName, uploader, databaseUrl) {
+FileController = function(view, scopeName, uploader, databaseUrl) {
this.view = view;
this.uploader = uploader;
this.scopeName = scopeName;
@@ -91,13 +91,13 @@ nglr.FileController = function(view, scopeName, uploader, databaseUrl) {
this.lastValue = undefined;
};
-nglr.FileController.dispatchEvent = function(id, event, args) {
+FileController.dispatchEvent = function(id, event, args) {
var object = document.getElementById(id);
var controller = jQuery(object).data("controller");
- nglr.FileController.prototype['_on_' + event].apply(controller, args);
+ FileController.prototype['_on_' + event].apply(controller, args);
};
-nglr.FileController.template = function(id) {
+FileController.template = function(id) {
return jQuery('');
};
-nglr.FileController.prototype._on_cancel = function() {
+FileController.prototype._on_cancel = function() {
};
-nglr.FileController.prototype._on_complete = function() {
+FileController.prototype._on_complete = function() {
};
-nglr.FileController.prototype._on_httpStatus = function(status) {
- nglr.alert("httpStatus:" + this.scopeName + " status:" + status);
+FileController.prototype._on_httpStatus = function(status) {
+ alert("httpStatus:" + this.scopeName + " status:" + status);
};
-nglr.FileController.prototype._on_ioError = function() {
- nglr.alert("ioError:" + this.scopeName);
+FileController.prototype._on_ioError = function() {
+ alert("ioError:" + this.scopeName);
};
-nglr.FileController.prototype._on_open = function() {
- nglr.alert("open:" + this.scopeName);
+FileController.prototype._on_open = function() {
+ alert("open:" + this.scopeName);
};
-nglr.FileController.prototype._on_progress = function(bytesLoaded, bytesTotal) {
+FileController.prototype._on_progress = function(bytesLoaded, bytesTotal) {
};
-nglr.FileController.prototype._on_securityError = function() {
- nglr.alert("securityError:" + this.scopeName);
+FileController.prototype._on_securityError = function() {
+ alert("securityError:" + this.scopeName);
};
-nglr.FileController.prototype._on_uploadCompleteData = function(data) {
- var value = nglr.fromJson(data);
+FileController.prototype._on_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();
@@ -142,14 +142,14 @@ nglr.FileController.prototype._on_uploadCompleteData = function(data) {
scope.get('$binder').updateView();
};
-nglr.FileController.prototype._on_select = function(name, size, type) {
+FileController.prototype._on_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();
};
-nglr.FileController.prototype.updateModel = function(scope) {
+FileController.prototype.updateModel = function(scope) {
var isChecked = this.view.find("input").attr('checked');
var value = isChecked ? this.value : null;
if (this.lastValue === value) {
@@ -160,7 +160,7 @@ nglr.FileController.prototype.updateModel = function(scope) {
}
};
-nglr.FileController.prototype.updateView = function(scope) {
+FileController.prototype.updateView = function(scope) {
var modelValue = scope.get(this.scopeName);
if (modelValue && this.value !== modelValue) {
this.value = modelValue;
@@ -172,7 +172,7 @@ nglr.FileController.prototype.updateView = function(scope) {
this.view.find("input").attr('checked', !!modelValue);
};
-nglr.FileController.prototype.upload = function() {
+FileController.prototype.upload = function() {
if (this.name) {
this.uploader.uploadFile(this.attachmentsPath);
}
@@ -182,23 +182,23 @@ nglr.FileController.prototype.upload = function() {
///////////////////////
// NullController
///////////////////////
-nglr.NullController = function(view) {this.view = view;};
-nglr.NullController.prototype.updateModel = function() { return true; };
-nglr.NullController.prototype.updateView = function() { };
-nglr.NullController.instance = new nglr.NullController();
+NullController = function(view) {this.view = view;};
+NullController.prototype.updateModel = function() { return true; };
+NullController.prototype.updateView = function() { };
+NullController.instance = new NullController();
///////////////////////
// ButtonController
///////////////////////
-nglr.ButtonController = function(view) {this.view = view;};
-nglr.ButtonController.prototype.updateModel = function(scope) { return true; };
-nglr.ButtonController.prototype.updateView = function(scope) {};
+ButtonController = function(view) {this.view = view;};
+ButtonController.prototype.updateModel = function(scope) { return true; };
+ButtonController.prototype.updateView = function(scope) {};
///////////////////////
// TextController
///////////////////////
-nglr.TextController = function(view, exp) {
+TextController = function(view, exp) {
this.view = view;
this.exp = exp;
this.validator = view.getAttribute('ng-validate');
@@ -212,7 +212,7 @@ nglr.TextController = function(view, exp) {
}
};
-nglr.TextController.prototype.updateModel = function(scope) {
+TextController.prototype.updateModel = function(scope) {
var value = this.view.value;
if (this.lastValue === value) {
return false;
@@ -223,7 +223,7 @@ nglr.TextController.prototype.updateModel = function(scope) {
}
};
-nglr.TextController.prototype.updateView = function(scope) {
+TextController.prototype.updateView = function(scope) {
var view = this.view;
var value = scope.get(this.exp);
if (typeof value === "undefined") {
@@ -258,14 +258,14 @@ nglr.TextController.prototype.updateView = function(scope) {
///////////////////////
// CheckboxController
///////////////////////
-nglr.CheckboxController = function(view, exp) {
+CheckboxController = function(view, exp) {
this.view = view;
this.exp = exp;
this.lastValue = undefined;
this.initialValue = view.checked ? view.value : "";
};
-nglr.CheckboxController.prototype.updateModel = function(scope) {
+CheckboxController.prototype.updateModel = function(scope) {
var input = this.view;
var value = input.checked ? input.value : '';
if (this.lastValue === value) {
@@ -277,7 +277,7 @@ nglr.CheckboxController.prototype.updateModel = function(scope) {
}
};
-nglr.CheckboxController.prototype.updateView = function(scope) {
+CheckboxController.prototype.updateView = function(scope) {
var input = this.view;
var value = scope.eval(this.exp);
if (typeof value === "undefined") {
@@ -290,14 +290,14 @@ nglr.CheckboxController.prototype.updateView = function(scope) {
///////////////////////
// SelectController
///////////////////////
-nglr.SelectController = function(view, exp) {
+SelectController = function(view, exp) {
this.view = view;
this.exp = exp;
this.lastValue = undefined;
this.initialValue = view.value;
};
-nglr.SelectController.prototype.updateModel = function(scope) {
+SelectController.prototype.updateModel = function(scope) {
var input = this.view;
if (input.selectedIndex < 0) {
scope.setEval(this.exp, null);
@@ -313,7 +313,7 @@ nglr.SelectController.prototype.updateModel = function(scope) {
}
};
-nglr.SelectController.prototype.updateView = function(scope) {
+SelectController.prototype.updateView = function(scope) {
var input = this.view;
var value = scope.get(this.exp);
if (typeof value === 'undefined') {
@@ -329,14 +329,14 @@ nglr.SelectController.prototype.updateView = function(scope) {
///////////////////////
// MultiSelectController
///////////////////////
-nglr.MultiSelectController = function(view, exp) {
+MultiSelectController = function(view, exp) {
this.view = view;
this.exp = exp;
this.lastValue = undefined;
this.initialValue = this.selected();
};
-nglr.MultiSelectController.prototype.selected = function () {
+MultiSelectController.prototype.selected = function () {
var value = [];
var options = this.view.options;
for ( var i = 0; i < options.length; i++) {
@@ -348,7 +348,7 @@ nglr.MultiSelectController.prototype.selected = function () {
return value;
};
-nglr.MultiSelectController.prototype.updateModel = function(scope) {
+MultiSelectController.prototype.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) {
@@ -360,7 +360,7 @@ nglr.MultiSelectController.prototype.updateModel = function(scope) {
}
};
-nglr.MultiSelectController.prototype.updateView = function(scope) {
+MultiSelectController.prototype.updateView = function(scope) {
var input = this.view;
var selected = scope.get(this.exp);
if (typeof selected === "undefined") {
@@ -380,7 +380,7 @@ nglr.MultiSelectController.prototype.updateView = function(scope) {
///////////////////////
// RadioController
///////////////////////
-nglr.RadioController = function(view, exp) {
+RadioController = function(view, exp) {
this.view = view;
this.exp = exp;
this.lastChecked = undefined;
@@ -389,7 +389,7 @@ nglr.RadioController = function(view, exp) {
this.initialValue = view.checked ? view.value : null;
};
-nglr.RadioController.prototype.updateModel = function(scope) {
+RadioController.prototype.updateModel = function(scope) {
var input = this.view;
if (this.lastChecked) {
return false;
@@ -401,7 +401,7 @@ nglr.RadioController.prototype.updateModel = function(scope) {
}
};
-nglr.RadioController.prototype.updateView = function(scope) {
+RadioController.prototype.updateView = function(scope) {
var input = this.view;
var value = scope.get(this.exp);
if (this.initialValue && typeof value === "undefined") {
@@ -417,25 +417,25 @@ nglr.RadioController.prototype.updateView = function(scope) {
///////////////////////
//ElementController
///////////////////////
-nglr.BindUpdater = function(view, exp) {
+BindUpdater = function(view, exp) {
this.view = view;
- this.exp = nglr.Binder.parseBindings(exp);
+ this.exp = Binder.parseBindings(exp);
this.hasError = false;
this.scopeSelf = {element:view};
};
-nglr.BindUpdater.toText = function(obj) {
- var e = nglr.escapeHtml;
+BindUpdater.toText = function(obj) {
+ var e = escapeHtml;
switch(typeof obj) {
case "string":
case "boolean":
case "number":
return e(obj);
case "function":
- return nglr.BindUpdater.toText(obj());
+ return BindUpdater.toText(obj());
case "object":
- if (nglr.isNode(obj)) {
- return nglr.outerHTML(obj);
+ if (isNode(obj)) {
+ return outerHTML(obj);
} else if (obj instanceof angular.filter.Meta) {
switch(typeof obj.html) {
case "string":
@@ -444,8 +444,8 @@ nglr.BindUpdater.toText = function(obj) {
case "function":
return obj.html();
case "object":
- if (nglr.isNode(obj.html))
- return nglr.outerHTML(obj.html);
+ if (isNode(obj.html))
+ return outerHTML(obj.html);
default:
break;
}
@@ -461,43 +461,43 @@ nglr.BindUpdater.toText = function(obj) {
}
if (obj === null)
return "";
- return e(nglr.toJson(obj, true));
+ return e(toJson(obj, true));
default:
return "";
}
};
-nglr.BindUpdater.prototype.updateModel = function(scope) {};
-nglr.BindUpdater.prototype.updateView = function(scope) {
+BindUpdater.prototype.updateModel = function(scope) {};
+BindUpdater.prototype.updateView = function(scope) {
var html = [];
var parts = this.exp;
var length = parts.length;
for(var i=0; i" +
- "" +
- "
");
- 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;
-};
-
-nglr.PopUp.onOut = function() {
- jQuery('#ng-callout').
- unbind(nglr.PopUp.OUT_EVENT, nglr.PopUp.onOut).
- remove();
- return true;
-};
-
-//////////////////////////////////
-// Status
-//////////////////////////////////
-
-nglr.Status = function (body) {
- this.body = body;
- this.requestCount = 0;
-};
-nglr.Status.ANGULAR = "<a class='ng-angular-logo' href='http://www.getangular.com'><angular/></a>™";
-
-nglr.Status.prototype.beginRequest = function () {
- if (this.requestCount === 0) {
-<<<<<<< HEAD:public/javascripts/nglr/Widgets.js
- this.dialogView = jQuery('"+title+"
" +
- ""+msg+"
" +
- "Please Wait...
');
-=======
- this.dialogView = jQuery('Please Wait...
');
- this.progressWidget = this.dialogView.find("div");
- this.progressWidget.progressbar({value:0});
->>>>>>> master:public/javascripts/nglr/Widgets.js
- this.dialogView.dialog({bgiframe:true, minHeight:50, modal:true});
- this.maxRequestCount = 0;
- }
- this.requestCount++;
- this.maxRequestCount++;
-};
-
-nglr.Status.prototype.endRequest = function () {
- this.requestCount--;
- if (this.requestCount === 0) {
- this.dialogView.dialog("destroy");
- this.dialogView.remove();
- this.dialogView = null;
- }
-};
diff --git a/src/XSitePost.js b/src/XSitePost.js
deleted file mode 100644
index 7d81e207..00000000
--- a/src/XSitePost.js
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (C) 2008,2009 BRAT Tech LLC
-
-if (typeof nglr == 'undefined') nglr = {};
-
-if (typeof console == 'undefined') console = {};
-if (typeof console.log == 'undefined')
- console.log = function() {};
-if (typeof console.error == 'undefined')
- console.error = function() {};
-
-nglr.XSitePost = function(baseUrl, window, prefix) {
- this.baseUrl = baseUrl;
- this.post = jQuery.post;
- this.window = window;
- this.inQueue = {};
- this.outQueue = [];
- this.maxMsgSize = 100000;
- this.delay = 20;
- this.prefix = prefix;
- this.setTimeout=function(fn, delay){window.setTimeout(fn, delay);};
-};
-
-nglr.XSitePost.prototype.init = function() {
- this.window.name = '';
- this.response('ready', 'null');
-};
-
-nglr.XSitePost.prototype.incomingFragment = function(fragment) {
- var parts = fragment.split(";");
- this.incomingMsg(parts.shift(), 1*parts.shift(), 1*parts.shift(), parts.shift());
-};
-
-nglr.XSitePost.prototype.incomingMsg = function(id, partNo, totalParts, msgPart) {
- var msg = this.inQueue[id];
- if (!msg) {
- msg = {id:id, parts:[], count:0};
- this.inQueue[id] = msg;
- }
- msg.parts[partNo] = msgPart;
- msg.count++;
- if (totalParts === msg.count) {
- delete this.inQueue[id];
- var request = this.decodePost(msg.parts.join(''));
- var self = this;
- this.post(this.baseUrl + request.url, request.params, function(response, status){
- self.response(id, response, status);
- });
- }
-};
-
-nglr.XSitePost.prototype.response = function(id, response, status) {
- var start = 0;
- var end;
- var msg = Base64.encode(response);
- var msgLen = msg.length;
- var total = Math.ceil(msgLen / this.maxMsgSize);
- var part = 0;
- while (start < msgLen) {
- end = Math.min(msgLen, start + this.maxMsgSize);
- this.outQueue.push(id + ':'+part+':'+total+':' + msg.substring(start, end));
- start = end;
- part++;
- }
-};
-
-nglr.XSitePost.prototype.decodePost = function(post) {
- var parts = post.split(':');
- var url = Base64.decode(parts.shift());
- var params = {};
- while(parts.length !== 0) {
- var key = parts.shift();
- var value = Base64.decode(parts.shift());
- params[key] = value;
- }
- return {url:url, params:params};
-};
-
-nglr.XSitePost.prototype.listen = function() {
- console.log("listen()");
- var self = this;
- var window = this.window;
- var outQueue = this.outQueue;
- var setTimeout = this.setTimeout;
- var prefix = this.prefix;
- var prefixLen = prefix.length;
- var prefixRec = prefix + '>';
- var prefixRecLen = prefixRec.length;
- window.name = prefix;
- var pull = function(){
- var value = window.name;
- if (value == prefix && outQueue.length > 0) {
- window.name = prefix + '<' + outQueue.shift();
- } else if (value.substr(0, prefixRecLen) == prefixRec) {
- self.incomingFragment(value.substr(prefixRecLen));
- window.name = prefix;
- }
- setTimeout(pull, self.delay);
- };
- pull();
-};
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index 8ac4f9f3..b13bbf34 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -80,9 +80,8 @@
doc = window.document.getElementById(id);
}
}
- var angular = window.angularFactory(scriptConfig);
if (scriptConfig.autoBind && doc) {
- window.angularScope = angular.compile(doc);
+ window.angularScope = angular.compile(doc, scriptConfig);
}
if (typeof previousOnLoad === 'function') {
try {
diff --git a/src/angular.prefix b/src/angular.prefix
new file mode 100644
index 00000000..522c17bf
--- /dev/null
+++ b/src/angular.prefix
@@ -0,0 +1,2 @@
+
+(function(window, document){
\ No newline at end of file
diff --git a/src/angular.suffix b/src/angular.suffix
new file mode 100644
index 00000000..4b3cc37b
--- /dev/null
+++ b/src/angular.suffix
@@ -0,0 +1 @@
+})(window, document);
\ No newline at end of file
diff --git a/src/test/Runner.js b/src/test/Runner.js
index c7dd431a..5840282e 100644
--- a/src/test/Runner.js
+++ b/src/test/Runner.js
@@ -1,11 +1,11 @@
-if (!nglr.test) nglr.test = {};
+if (typeof test == 'undefined') test = {};
-nglr.test.ScenarioRunner = function(scenarios, body) {
+test.ScenarioRunner = function(scenarios, body) {
this.scenarios = scenarios;
this.body = body;
};
-nglr.test.ScenarioRunner.prototype = {
+test.ScenarioRunner.prototype = {
run:function(){
this.setUpUI();
this.runScenarios();
@@ -25,22 +25,22 @@ nglr.test.ScenarioRunner.prototype = {
});
},
runScenarios:function(){
- var runner = new nglr.test.Runner(this.console, this.testFrame);
+ var runner = new test.Runner(this.console, this.testFrame);
_.stepper(this.scenarios, function(next, scenario, name){
- new nglr.test.Scenario(name, scenario).run(runner, next);
+ new test.Scenario(name, scenario).run(runner, next);
}, function(){
}
);
}
};
-nglr.test.Runner = function(console, frame){
+test.Runner = function(console, frame){
this.console = console;
this.current = null;
this.tests = [];
this.frame = frame;
};
-nglr.test.Runner.prototype = {
+test.Runner.prototype = {
start:function(name){
var current = this.current = {
name:name,
@@ -75,7 +75,7 @@ nglr.test.Runner.prototype = {
var buf = [];
for ( var i = 1; i < arguments.length; i++) {
var arg = arguments[i];
- buf.push(typeof arg == "string" ?arg:nglr.toJson(arg));
+ buf.push(typeof arg == "string" ?arg:toJson(arg));
}
var log = jQuery('');
log.text(buf.join(" "));
@@ -86,11 +86,11 @@ nglr.test.Runner.prototype = {
}
};
-nglr.test.Scenario = function(name, scenario){
+test.Scenario = function(name, scenario){
this.name = name;
this.scenario = scenario;
};
-nglr.test.Scenario.prototype = {
+test.Scenario.prototype = {
run:function(runner, callback) {
var self = this;
_.stepper(this.scenario, function(next, steps, name){
@@ -115,7 +115,7 @@ nglr.test.Scenario.prototype = {
else if (step.When) fn = angular.test.WHEN[step.When];
else if (step.Then) fn = angular.test.THEN[step.Then];
return fn || function (){
- throw "ERROR: Need Given/When/Then got: " + nglr.toJson(step);
+ throw "ERROR: Need Given/When/Then got: " + toJson(step);
};
},
context: function(runner) {
@@ -149,14 +149,14 @@ nglr.test.Scenario.prototype = {
callback();
return;
}
- runner.log("info", nglr.toJson(step));
+ runner.log("info", toJson(step));
var fn = this.verb(step);
var context = this.context(runner);
_.extend(context, step);
try {
(fn.call(context)||function(c){c();})(callback);
} catch (e) {
- runner.log("error", "ERROR: " + nglr.toJson(e));
+ runner.log("error", "ERROR: " + toJson(e));
}
}
};
diff --git a/src/test/Steps.js b/src/test/Steps.js
index af4b84d6..cc9ff549 100644
--- a/src/test/Steps.js
+++ b/src/test/Steps.js
@@ -14,7 +14,7 @@ angular.test.GIVEN = {
};
},
dataset:function(){
- this.frame.name="$DATASET:" + nglr.toJson({dataset:this.dataset});
+ this.frame.name="$DATASET:" + toJson({dataset:this.dataset});
}
};
angular.test.WHEN = {
--
cgit v1.2.3
From 1aba6b53b88c70b61a0cc991b1371739305d117b Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sun, 10 Jan 2010 08:58:57 -0800
Subject: basic calculator works with minified.js, lots of references still
broken
---
src/API.js | 72 +++++++++++++++++++++++++-------------------------
src/DataStore.js | 2 +-
src/Filters.js | 2 +-
src/JSON.js | 6 ++---
src/Loader.js | 47 +++++++++++++++-----------------
src/Parser.js | 8 +++---
src/Scope.js | 2 +-
src/Widgets.js | 16 +++++++----
src/test/Runner.js | 2 +-
src/test/_namespace.js | 10 +++----
10 files changed, 85 insertions(+), 82 deletions(-)
(limited to 'src')
diff --git a/src/API.js b/src/API.js
index 6fb6e8fc..49089da0 100644
--- a/src/API.js
+++ b/src/API.js
@@ -1,5 +1,5 @@
-angular.Global = {
- typeOf:function(obj){
+angular['Global'] = {
+ 'typeOf':function(obj){
var type = typeof obj;
switch(type) {
case "object":
@@ -12,10 +12,10 @@ angular.Global = {
}
};
-angular.Collection = {};
-angular.Object = {};
-angular.Array = {
- includeIf:function(array, value, condition) {
+angular['Collection'] = {};
+angular['Object'] = {};
+angular['Array'] = {
+ 'includeIf':function(array, value, condition) {
var index = _.indexOf(array, value);
if (condition) {
if (index == -1)
@@ -25,8 +25,8 @@ angular.Array = {
}
return array;
},
- sum:function(array, expression) {
- var fn = angular.Function.compile(expression);
+ 'sum':function(array, expression) {
+ var fn = angular['Function']['compile'](expression);
var sum = 0;
for (var i = 0; i < array.length; i++) {
var value = 1 * fn(array[i]);
@@ -36,15 +36,15 @@ angular.Array = {
}
return sum;
},
- remove:function(array, value) {
+ 'remove':function(array, value) {
var index = _.indexOf(array, value);
if (index >=0)
array.splice(index, 1);
return value;
},
- find:function(array, condition, defaultValue) {
+ 'find':function(array, condition, defaultValue) {
if (!condition) return undefined;
- var fn = angular.Function.compile(condition);
+ var fn = angular['Function']['compile'](condition);
_.detect(array, function($){
if (fn($)){
defaultValue = $;
@@ -53,10 +53,10 @@ angular.Array = {
});
return defaultValue;
},
- findById:function(array, id) {
+ 'findById':function(array, id) {
return angular.Array.find(array, function($){return $.$id == id;}, null);
},
- filter:function(array, expression) {
+ 'filter':function(array, expression) {
var predicates = [];
predicates.check = function(value) {
for (var j = 0; j < predicates.length; j++) {
@@ -136,16 +136,16 @@ angular.Array = {
}
return filtered;
},
- add:function(array, value) {
+ 'add':function(array, value) {
array.push(_.isUndefined(value)? {} : value);
return array;
},
- count:function(array, condition) {
+ 'count':function(array, condition) {
if (!condition) return array.length;
- var fn = angular.Function.compile(condition);
+ var fn = angular['Function']['compile'](condition);
return _.reduce(array, 0, function(count, $){return count + (fn($)?1:0);});
},
- orderBy:function(array, expression, descend) {
+ 'orderBy':function(array, expression, descend) {
function reverse(comp, descending) {
return toBoolean(descending) ?
function(a,b){return comp(b,a);} : comp;
@@ -169,7 +169,7 @@ angular.Array = {
descending = $.charAt(0) == '-';
$ = $.substring(1);
}
- var get = $ ? angular.Function.compile($) : _.identity;
+ var get = $ ? angular['Function']['compile']($) : _.identity;
return reverse(function(a,b){
return compare(get(a),get(b));
}, descending);
@@ -183,7 +183,7 @@ angular.Array = {
};
return _.clone(array).sort(reverse(comparator, descend));
},
- orderByToggle:function(predicate, attribute) {
+ 'orderByToggle':function(predicate, attribute) {
var STRIP = /^([+|-])?(.*)/;
var ascending = false;
var index = -1;
@@ -205,7 +205,7 @@ angular.Array = {
predicate.unshift((ascending ? "-" : "+") + attribute);
return predicate;
},
- orderByDirection:function(predicate, attribute, ascend, descend) {
+ 'orderByDirection':function(predicate, attribute, ascend, descend) {
ascend = ascend || 'ng-ascend';
descend = descend || 'ng-descend';
var att = predicate[0] || '';
@@ -218,7 +218,7 @@ angular.Array = {
}
return att == attribute ? (direction ? ascend : descend) : "";
},
- merge:function(array, index, mergeValue) {
+ 'merge':function(array, index, mergeValue) {
var value = array[index];
if (!value) {
value = {};
@@ -228,8 +228,8 @@ angular.Array = {
return array;
}
};
-angular.String = {
- quote:function(string) {
+angular['String'] = {
+ 'quote':function(string) {
return '"' + string.replace(/\\/g, '\\\\').
replace(/"/g, '\\"').
replace(/\n/g, '\\n').
@@ -239,8 +239,8 @@ angular.String = {
replace(/\v/g, '\\v') +
'"';
},
- quoteUnicode:function(string) {
- var str = angular.String.quote(string);
+ 'quoteUnicode':function(string) {
+ var str = angular['String']['quote'](string);
var chars = [];
for ( var i = 0; i < str.length; i++) {
var ch = str.charCodeAt(i);
@@ -253,7 +253,7 @@ angular.String = {
}
return chars.join('');
},
- toDate:function(string){
+ 'toDate':function(string){
var match;
if (typeof string == 'string' &&
(match = string.match(/^(\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)Z$/))){
@@ -265,8 +265,8 @@ angular.String = {
return string;
}
};
-angular.Date = {
- toString:function(date){
+angular['Date'] = {
+ 'toString':function(date){
function pad(n) { return n < 10 ? "0" + n : n; }
return (date.getUTCFullYear()) + '-' +
pad(date.getUTCMonth() + 1) + '-' +
@@ -276,8 +276,8 @@ angular.Date = {
pad(date.getUTCSeconds()) + 'Z';
}
};
-angular.Function = {
- compile:function(expression) {
+angular['Function'] = {
+ 'compile':function(expression) {
if (_.isFunction(expression)){
return expression;
} else if (expression){
@@ -299,20 +299,20 @@ angular.Function = {
dst[name] = _[name];
});
};
- extend(angular.Global, {},
+ extend(angular['Global'], {},
['extend', 'clone','isEqual',
'isElement', 'isArray', 'isFunction', 'isUndefined']);
- extend(angular.Collection, angular.Global,
+ extend(angular['Collection'], angular['Global'],
['each', 'map', 'reduce', 'reduceRight', 'detect',
'select', 'reject', 'all', 'any', 'include',
'invoke', 'pluck', 'max', 'min', 'sortBy',
'sortedIndex', 'toArray', 'size']);
- extend(angular.Array, angular.Collection,
+ extend(angular['Array'], angular['Collection'],
['first', 'last', 'compact', 'flatten', 'without',
'uniq', 'intersect', 'zip', 'indexOf', 'lastIndexOf']);
- extend(angular.Object, angular.Collection,
+ extend(angular['Object'], angular['Collection'],
['keys', 'values']);
- extend(angular.String, angular.Global);
- extend(angular.Function, angular.Global,
+ extend(angular['String'], angular['Global']);
+ extend(angular['Function'], angular['Global'],
['bind', 'bindAll', 'delay', 'defer', 'wrap', 'compose']);
})();
\ No newline at end of file
diff --git a/src/DataStore.js b/src/DataStore.js
index bdf882a0..6eeabb21 100644
--- a/src/DataStore.js
+++ b/src/DataStore.js
@@ -92,7 +92,7 @@ DataStore.prototype.save = function(document, callback) {
var cachedDoc = self.cache(document);
_.each(self._cache.$collections, function(collection){
if (collection.$$accept(document)) {
- angular.Array.includeIf(collection, cachedDoc, true);
+ angular['Array']['includeIf'](collection, cachedDoc, true);
}
});
if (document.$$anchor) {
diff --git a/src/Filters.js b/src/Filters.js
index dd4217be..b3f56e75 100644
--- a/src/Filters.js
+++ b/src/Filters.js
@@ -22,7 +22,7 @@ angular.filter.Meta.get = function(obj, attr){
}
};
-angular.filter.currency = function(amount){
+angular.filter['currency'] = function(amount){
jQuery(this.element).toggleClass('ng-format-negative', amount < 0);
return '$' + angular.filter.number.apply(this, [amount, 2]);
};
diff --git a/src/JSON.js b/src/JSON.js
index 84c9a857..238ed489 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -38,7 +38,7 @@ toJsonArray = function(buf, obj, pretty){
buf.push('' + obj);
}
} else if (type === 'string') {
- return buf.push(angular.String.quoteUnicode(obj));
+ return buf.push(angular['String']['quoteUnicode'](obj));
} else if (type === 'object') {
if (obj instanceof Array) {
buf.push("[");
@@ -56,7 +56,7 @@ toJsonArray = function(buf, obj, pretty){
}
buf.push("]");
} else if (obj instanceof Date) {
- buf.push(angular.String.quoteUnicode(angular.Date.toString(obj)));
+ buf.push(angular['String']['quoteUnicode'](angular['Date']['toString'](obj)));
} else {
buf.push("{");
if (pretty) buf.push(pretty);
@@ -78,7 +78,7 @@ toJsonArray = function(buf, obj, pretty){
buf.push(",");
if (pretty) buf.push(pretty);
}
- buf.push(angular.String.quote(key));
+ buf.push(angular['String']['quote'](key));
buf.push(":");
toJsonArray(buf, value, childPretty);
comma = true;
diff --git a/src/Loader.js b/src/Loader.js
index dfaa355a..19840567 100644
--- a/src/Loader.js
+++ b/src/Loader.js
@@ -23,6 +23,8 @@ if (typeof Node == 'undefined') {
}
var callbacks = {};
+var jQuery = window['jQuery'];
+var msie = jQuery['browser']['msie'];
if (!window.angular){ angular = {}; window['angular'] = angular; }
if (!angular.validator) angular.validator = {};
@@ -32,8 +34,8 @@ if (!window.console)
log:function() {},
error:function() {}
};
-if (_.isUndefined(alert)) {
- alert = function(){console.log(arguments); window.alert.apply(window, arguments); };
+if (!angular.alert) {
+ angular.alert = function(){console.log(arguments); window.alert.apply(window, arguments); };
}
var consoleNode;
@@ -169,7 +171,6 @@ Loader.prototype.load = function() {
this.loadCss('/stylesheets/jquery-ui/smoothness/jquery-ui-1.7.1.css');
this.loadCss('/stylesheets/css');
console.log("Server: " + this.config.server);
- msie = jQuery.browser.msie;
this.configureJQueryPlugins();
this.computeConfiguration();
this.bindHtml();
@@ -177,11 +178,7 @@ Loader.prototype.load = function() {
Loader.prototype.configureJQueryPlugins = function() {
console.log('Loader.configureJQueryPlugins()');
- jQuery.fn.removeNode = function() {
- var node = this.get(0);
- node.parentNode.removeChild(node);
- };
- jQuery.fn.scope = function() {
+ jQuery['fn']['scope'] = function() {
var element = this;
while (element && element.get(0)) {
var scope = element.data("scope");
@@ -191,7 +188,7 @@ Loader.prototype.configureJQueryPlugins = function() {
}
return null;
};
- jQuery.fn.controller = function() {
+ jQuery['fn']['controller'] = function() {
return this.data('controller') || NullController.instance;
};
};
@@ -229,24 +226,19 @@ Loader.prototype.bindHtml = function() {
var datastore = new DataStore(post, users, binder.anchor);
binder.updateListeners.push(function(){datastore.flush();});
var scope = new Scope( {
- $anchor : binder.anchor,
- $binder : binder,
- $config : this.config,
- $console : window.console,
- $datastore : datastore,
- $save : function(callback) {
+ '$anchor' : binder.anchor,
+ '$binder' : binder,
+ '$config' : this.config,
+ '$console' : window.console,
+ '$datastore' : datastore,
+ '$save' : function(callback) {
datastore.saveScope(scope.state, callback, binder.anchor);
},
- $window : window,
- $uid : this.uid,
- $users : users
+ '$window' : window,
+ '$uid' : this.uid,
+ '$users' : users
}, "ROOT");
- jQuery.each(["get", "set", "eval", "addWatchListener", "updateView"],
- function(i, method){
- angular[method] = bind(scope, scope[method]);
- });
-
document.data('scope', scope);
console.log('$binder.entity()');
binder.entity(scope);
@@ -284,7 +276,6 @@ Loader.prototype.bindHtml = function() {
watcher.watch();
document.find("body").show();
console.log('ready()');
-
};
Loader.prototype.visualPost = function(delegate) {
@@ -399,6 +390,12 @@ angular['compile'] = function(root, config) {
//todo: don't start watcher
var loader = new Loader(root, jQuery("head"), _(defaults).extend(config));
loader.load();
- return jQuery(root).scope();
+ var scope = jQuery(root).scope();
+ //TODO: cleanup
+ return {
+ 'updateView':function(){return scope.updateView.apply(scope, arguments);},
+ 'set':function(){return scope.set.apply(scope, arguments);},
+ 'get':function(){return scope.get.apply(scope, arguments);}
+ };
};
diff --git a/src/Parser.js b/src/Parser.js
index b23215be..cdece11e 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -185,7 +185,7 @@ Lexer.prototype.readString = function(quote) {
this.tokens.push({index:start, text:string,
fn:function(){
return (string.length == dateParseLength) ?
- angular.String.toDate(string) : string;
+ angular['String']['toDate'](string) : string;
}});
return;
} else {
@@ -346,11 +346,11 @@ Parser.prototype.filterChain = function(){
};
Parser.prototype.filter = function(){
- return this._pipeFunction(angular.filter);
+ return this._pipeFunction(angular['filter']);
};
Parser.prototype.validator = function(){
- return this._pipeFunction(angular.validator);
+ return this._pipeFunction(angular['validator']);
};
Parser.prototype._pipeFunction = function(fnScope){
@@ -697,7 +697,7 @@ Parser.prototype.entityDecl = function () {
self.scope.set(instance, document);
return "$anchor." + instance + ":{" +
instance + "=" + entity + ".load($anchor." + instance + ");" +
- instance + ".$$anchor=" + angular.String.quote(instance) + ";" +
+ instance + ".$$anchor=" + angular['String']['quote'](instance) + ";" +
"};";
} else {
return "";
diff --git a/src/Scope.js b/src/Scope.js
index e3634cee..dff3bfbd 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -55,7 +55,7 @@ Scope.getter = function(instance, path) {
instance = instance[key];
}
if (_.isUndefined(instance) && key.charAt(0) == '$') {
- var type = angular.Global.typeOf(lastInstance);
+ 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) {
diff --git a/src/Widgets.js b/src/Widgets.js
index 3a0f2845..4e4facf8 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -5,7 +5,13 @@ WidgetFactory = function(serverUrl, database) {
this.nextUploadId = 0;
this.serverUrl = serverUrl;
this.database = database;
- this.createSWF = swfobject.createSWF;
+ if (window.swfobject) {
+ this.createSWF = swfobject.createSWF;
+ } else {
+ this.createSWF = function(){
+ alert("ERROR: swfobject not loaded!");
+ };
+ }
this.onChangeListener = function(){};
};
@@ -145,7 +151,7 @@ FileController.prototype._on_uploadCompleteData = function(data) {
FileController.prototype._on_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.view.find("span").text(angular['filter']['bytes'](size));
this.upload();
};
@@ -167,7 +173,7 @@ FileController.prototype.updateView = function(scope) {
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("span").text(angular['filter']['bytes'](this.value.size));
}
this.view.find("input").attr('checked', !!modelValue);
};
@@ -677,8 +683,8 @@ RepeaterUpdater.prototype.updateView = function(scope) {
});
// shrink children
for ( var r = childrenLength; r > iteratorLength; --r) {
- var unneeded = this.children.pop();
- unneeded.element.removeNode();
+ var unneeded = this.children.pop().element[0];
+ unneeded.parentNode.removeChild(unneeded);
}
// Special case for option in select
if (child && child.element[0].nodeName === "OPTION") {
diff --git a/src/test/Runner.js b/src/test/Runner.js
index 5840282e..c6684951 100644
--- a/src/test/Runner.js
+++ b/src/test/Runner.js
@@ -110,7 +110,7 @@ test.Scenario.prototype = {
},
verb:function(step){
var fn = null;
- if (!step) fn = function (){ throw "Step is null!"; }
+ if (!step) fn = function (){ throw "Step is null!"; };
else if (step.Given) fn = angular.test.GIVEN[step.Given];
else if (step.When) fn = angular.test.WHEN[step.When];
else if (step.Then) fn = angular.test.THEN[step.Then];
diff --git a/src/test/_namespace.js b/src/test/_namespace.js
index 78f430f1..e29ae72a 100644
--- a/src/test/_namespace.js
+++ b/src/test/_namespace.js
@@ -1,5 +1,5 @@
-if (!angular) angular = {};
-if (!angular.test) angular.test = {};
-if (!angular.test.GIVEN) angular.test.GIVEN = {};
-if (!angular.test.WHEN) angular.test.WHEN = {};
-if (!angular.test.THEN) angular.test.THEN = {};
+if (!angular) var angular = window['angular'] = {};
+if (!angular['test']) var angularTest = angular['test'] = {};
+if (!angular['test']['GIVEN']) angularTest['GIVEN'] = {};
+if (!angular['test']['WHEN']) angularTest['WHEN'] = {};
+if (!angular['test']['THEN']) angularTest['THEN'] = {};
--
cgit v1.2.3
From 1a42a3fab99ca02af0476f5a87175c53104aa2e3 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 11 Jan 2010 16:15:12 -0800
Subject: green
---
src/API.js | 77 ++++----
src/Binder.js | 8 +-
src/ControlBar.js | 2 +-
src/DataStore.js | 18 +-
src/Filters.js | 511 +++++++++++++++++++++++++++--------------------------
src/JSON.js | 2 +-
src/Loader.js | 491 +++++++++++++++++++++++++-------------------------
src/Scope.js | 6 +-
src/Server.js | 2 +-
src/Validators.js | 152 ++++++++--------
src/Widgets.js | 4 +-
src/angular.prefix | 3 +-
12 files changed, 647 insertions(+), 629 deletions(-)
(limited to 'src')
diff --git a/src/API.js b/src/API.js
index 49089da0..d795f4c3 100644
--- a/src/API.js
+++ b/src/API.js
@@ -1,9 +1,8 @@
-angular['Global'] = {
+var angularGlobal = {
'typeOf':function(obj){
+ if (obj === null) return "null";
var type = typeof obj;
- switch(type) {
- case "object":
- if (obj === null) return "null";
+ if (type == "object") {
if (obj instanceof Array) return "array";
if (obj instanceof Date) return "date";
if (obj.nodeType == 1) return "element";
@@ -12,9 +11,9 @@ angular['Global'] = {
}
};
-angular['Collection'] = {};
-angular['Object'] = {};
-angular['Array'] = {
+var angularCollection = {};
+var angularObject = {};
+var angularArray = {
'includeIf':function(array, value, condition) {
var index = _.indexOf(array, value);
if (condition) {
@@ -177,7 +176,7 @@ angular['Array'] = {
var comparator = function(o1, o2){
for ( var i = 0; i < expression.length; i++) {
var comp = expression[i](o1, o2);
- if (comp != 0) return comp;
+ if (comp !== 0) return comp;
}
return 0;
};
@@ -197,7 +196,7 @@ angular['Array'] = {
ascending = $.charAt(0) == '+';
index = i;
return true;
- };
+ }
});
if (index >= 0) {
predicate.splice(index, 1);
@@ -228,7 +227,8 @@ angular['Array'] = {
return array;
}
};
-angular['String'] = {
+
+var angularString = {
'quote':function(string) {
return '"' + string.replace(/\\/g, '\\\\').
replace(/"/g, '\\"').
@@ -265,7 +265,8 @@ angular['String'] = {
return string;
}
};
-angular['Date'] = {
+
+var angularDate = {
'toString':function(date){
function pad(n) { return n < 10 ? "0" + n : n; }
return (date.getUTCFullYear()) + '-' +
@@ -276,7 +277,8 @@ angular['Date'] = {
pad(date.getUTCSeconds()) + 'Z';
}
};
-angular['Function'] = {
+
+var angularFunction = {
'compile':function(expression) {
if (_.isFunction(expression)){
return expression;
@@ -292,27 +294,30 @@ angular['Function'] = {
}
};
-(function(){
- function extend(dst, src, names){
- _.extend(dst, src);
- _.each((names||[]), function(name){
- dst[name] = _[name];
- });
- };
- extend(angular['Global'], {},
- ['extend', 'clone','isEqual',
- 'isElement', 'isArray', 'isFunction', 'isUndefined']);
- extend(angular['Collection'], angular['Global'],
- ['each', 'map', 'reduce', 'reduceRight', 'detect',
- 'select', 'reject', 'all', 'any', 'include',
- 'invoke', 'pluck', 'max', 'min', 'sortBy',
- 'sortedIndex', 'toArray', 'size']);
- extend(angular['Array'], angular['Collection'],
- ['first', 'last', 'compact', 'flatten', 'without',
- 'uniq', 'intersect', 'zip', 'indexOf', 'lastIndexOf']);
- extend(angular['Object'], angular['Collection'],
- ['keys', 'values']);
- extend(angular['String'], angular['Global']);
- extend(angular['Function'], angular['Global'],
- ['bind', 'bindAll', 'delay', 'defer', 'wrap', 'compose']);
-})();
\ No newline at end of file
+function defineApi(dst, chain, underscoreNames){
+ var lastChain = _.last(chain);
+ foreach(underscoreNames, function(name){
+ lastChain[name] = _[name];
+ });
+ angular[dst] = angular[dst] || {};
+ foreach(chain, function(parent){
+ extend(angular[dst], parent);
+ });
+}
+defineApi('Global', [angularGlobal],
+ ['extend', 'clone','isEqual',
+ 'isElement', 'isArray', 'isFunction', 'isUndefined']);
+defineApi('Collection', [angularGlobal, angularCollection],
+ ['each', 'map', 'reduce', 'reduceRight', 'detect',
+ 'select', 'reject', 'all', 'any', 'include',
+ 'invoke', 'pluck', 'max', 'min', 'sortBy',
+ 'sortedIndex', 'toArray', 'size']);
+defineApi('Array', [angularGlobal, angularCollection, angularArray],
+ ['first', 'last', 'compact', 'flatten', 'without',
+ 'uniq', 'intersect', 'zip', 'indexOf', 'lastIndexOf']);
+defineApi('Object', [angularGlobal, angularCollection, angularObject],
+ ['keys', 'values']);
+defineApi('String', [angularGlobal, angularString], []);
+defineApi('Date', [angularGlobal, angularDate], []);
+defineApi('Function', [angularGlobal, angularCollection, angularFunction],
+ ['bind', 'bindAll', 'delay', 'defer', 'wrap', 'compose']);
diff --git a/src/Binder.js b/src/Binder.js
index 3589cb88..4c5299ed 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -57,16 +57,16 @@ Binder.prototype.parseAnchor = function(url) {
var anchor = url.substring(anchorIndex + 1);
var anchorQuery = this.parseQueryString(anchor);
- jQuery.each(self.anchor, function(key, newValue) {
+ foreach(self.anchor, function(newValue, key) {
delete self.anchor[key];
});
- jQuery.each(anchorQuery, function(key, newValue) {
+ foreach(anchorQuery, function(newValue, key) {
self.anchor[key] = newValue;
});
};
Binder.prototype.onUrlChange = function (url) {
- console.log("URL change detected", url);
+ log("URL change detected", url);
this.parseAnchor(url);
this.updateView();
};
@@ -252,7 +252,7 @@ Binder.prototype.precompileNode = function(node, path, factories) {
}
}
- if (!node.getAttribute) console.log(node);
+ if (!node.getAttribute) log(node);
var repeaterExpression = node.getAttribute('ng-repeat');
if (repeaterExpression) {
node.removeAttribute('ng-repeat');
diff --git a/src/ControlBar.js b/src/ControlBar.js
index b66a1464..fb8147d5 100644
--- a/src/ControlBar.js
+++ b/src/ControlBar.js
@@ -52,7 +52,7 @@ ControlBar.prototype.doTemplate = function (path) {
callbacks["_iframe_notify_" + id] = function() {
loginView.dialog("destroy");
loginView.remove();
- jQuery.each(self.callbacks, function(i, callback){
+ foreach(self.callbacks, function(callback){
callback();
});
self.callbacks = [];
diff --git a/src/DataStore.js b/src/DataStore.js
index 6eeabb21..f99e5824 100644
--- a/src/DataStore.js
+++ b/src/DataStore.js
@@ -41,7 +41,7 @@ DataStore.prototype.loadMany = function(entity, ids, callback) {
var self=this;
var list = [];
var callbackCount = 0;
- jQuery.each(ids, function(i, id){
+ foreach(ids, function(id){
list.push(self.load(entity(), id, function(){
callbackCount++;
if (callbackCount == ids.length) {
@@ -50,7 +50,7 @@ DataStore.prototype.loadMany = function(entity, ids, callback) {
}));
});
return list;
-}
+};
DataStore.prototype.loadOrCreate = function(instance, id, callback) {
var self=this;
@@ -134,9 +134,9 @@ DataStore.prototype.flush = function() {
var self = this;
var bulkRequest = this.bulkRequest;
this.bulkRequest = [];
- console.log('REQUEST:', bulkRequest);
+ log('REQUEST:', bulkRequest);
function callback(code, bulkResponse){
- console.log('RESPONSE[' + code + ']: ', bulkResponse);
+ log('RESPONSE[' + code + ']: ', bulkResponse);
if(bulkResponse.$status_code == 401) {
self.users.login(function(){
self.post(bulkRequest, callback);
@@ -147,9 +147,9 @@ DataStore.prototype.flush = function() {
for ( var i = 0; i < bulkResponse.length; i++) {
var response = bulkResponse[i];
var request = bulkRequest[i];
- var code = response.$status_code;
- if(code) {
- if(code == 403) {
+ var responseCode = response.$status_code;
+ if(responseCode) {
+ if(responseCode == 403) {
self.users.notAuthorized();
} else {
request.$$failure(response);
@@ -217,7 +217,7 @@ DataStore.prototype.documentCountsByUser = function(){
var counts = {};
var self = this;
self.post([["GET", "$users"]], function(code, response){
- jQuery.each(response[0], function(key, value){
+ foreach(response[0], function(value, key){
counts[key] = value;
});
});
@@ -228,7 +228,7 @@ DataStore.prototype.userDocumentIdsByEntity = function(user){
var ids = {};
var self = this;
self.post([["GET", "$users/" + user]], function(code, response){
- jQuery.each(response[0], function(key, value){
+ foreach(response[0], function(value, key){
ids[key] = value;
});
});
diff --git a/src/Filters.js b/src/Filters.js
index b3f56e75..67fcffa1 100644
--- a/src/Filters.js
+++ b/src/Filters.js
@@ -1,13 +1,13 @@
// Copyright (C) 2009 BRAT Tech LLC
-angular.filter.Meta = function(obj){
+angularFilter.Meta = function(obj){
if (obj) {
for ( var key in obj) {
this[key] = obj[key];
}
}
};
-angular.filter.Meta.get = function(obj, attr){
+angularFilter.Meta.get = function(obj, attr){
attr = attr || 'text';
switch(typeof obj) {
case "string":
@@ -22,269 +22,280 @@ angular.filter.Meta.get = function(obj, attr){
}
};
-angular.filter['currency'] = function(amount){
- jQuery(this.element).toggleClass('ng-format-negative', amount < 0);
- return '$' + angular.filter.number.apply(this, [amount, 2]);
-};
+var angularFilterGoogleChartApi;
-angular.filter.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';
+foreach({
+ 'currency': function(amount){
+ jQuery(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 '';
}
- text += '.' + frc.substring(0, fractionSize);
- }
- return text;
-};
-
-angular.filter.date = function(amount) {
-};
-
-angular.filter.json = function(object) {
- jQuery(this.element).addClass("ng-monospace");
- return toJson(object, true);
-};
-
-angular.filter.trackPackage = function(trackingNo, noMatch) {
- trackingNo = trim(trackingNo);
- var tNo = trackingNo.replace(/ /g, '');
- var MATCHERS = angular.filter.trackPackage.MATCHERS;
- for ( var i = 0; i < MATCHERS.length; i++) {
- var carrier = MATCHERS[i];
- for ( var j = 0; j < carrier.regexp.length; j++) {
- var regexp = carrier.regexp[j];
- if (regexp.test(tNo)) {
- var text = carrier.name + ": " + trackingNo;
- var url = carrier.url + trackingNo;
- return new angular.filter.Meta({
- text:text,
- url:url,
- html: '' + text + '',
- trackingNo:trackingNo});
+ 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 (trackingNo)
- return noMatch ||
- new angular.filter.Meta({text:trackingNo + " is not recognized"});
- else
- return null;
-};
-
-angular.filter.trackPackage.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]}];
-
-angular.filter.link = function(obj, title) {
- var text = title || angular.filter.Meta.get(obj);
- var url = angular.filter.Meta.get(obj, "url") || angular.filter.Meta.get(obj);
- if (url) {
- if (angular.validator.email(url) === null) {
- url = "mailto:" + url;
- }
- var html = '' + text + '';
- return new angular.filter.Meta({text:text, url:url, html:html});
- }
- return obj;
-};
-
-
-angular.filter.bytes = 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 + " " + angular.filter.bytes.SUFFIX[suffix];
-};
-angular.filter.bytes.SUFFIX = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB'];
-
-angular.filter.image = function(obj, width, height) {
- if (obj && obj.url) {
- var style = "";
- if (width) {
- style = ' style="max-width: ' + width +
- 'px; max-height: ' + (height || width) + 'px;"';
+ if (fractionSize > 0) {
+ for (var j = frc.length; j < fractionSize; j++) {
+ frc += '0';
+ }
+ text += '.' + frc.substring(0, fractionSize);
}
- return new angular.filter.Meta({url:obj.url, text:obj.url,
- html:'' +
'' +
@@ -18,54 +13,61 @@ ControlBar.HTML =
'
' +
'' +
'Sorry, you do not have permission for this!'+
'
';
-ControlBar.prototype.notAuthorized = function () {
- if (this.forbidenView) return;
- this.forbidenView = jQuery(ControlBar.FORBIDEN);
- this.forbidenView.dialog({bgiframe:true, height:70, modal:true});
-};
+
+
+ControlBar.prototype = {
+ bind: function () {
+ },
+
+ login: function (loginSubmitFn) {
+ this.callbacks.push(loginSubmitFn);
+ if (this.callbacks.length == 1) {
+ this.doTemplate("/user_session/new.mini?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();
+ url += "#$iframe_notify=" + id;
+ var iframeHeight = 330;
+ var loginView = jQuery('');
+ this.document.append(loginView);
+ loginView.dialog({
+ height:iframeHeight + 33, width:500,
+ resizable: false, modal:true,
+ title: 'Authentication: <angular/>'
+ });
+ callbacks["_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/DataStore.js b/src/DataStore.js
index f99e5824..7952096f 100644
--- a/src/DataStore.js
+++ b/src/DataStore.js
@@ -1,6 +1,4 @@
-// Copyright (C) 2009 BRAT Tech LLC
-
-DataStore = function(post, users, anchor) {
+function DataStore(post, users, anchor) {
this.post = post;
this.users = users;
this._cache = {$collections:[]};
@@ -8,325 +6,329 @@ DataStore = function(post, users, anchor) {
this.bulkRequest = [];
};
-DataStore.prototype.cache = function(document) {
- if (document.constructor != Model) {
- 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;
-};
-
-DataStore.prototype.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;
-};
-
-DataStore.prototype.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;
-};
+DataStore.NullEntity = extend(function(){}, {
+ 'all': function(){return [];},
+ 'query': function(){return [];},
+ 'load': function(){return {};},
+ 'title': undefined
+});
-DataStore.prototype.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);
+DataStore.prototype = {
+ cache: function(document) {
+ if (! document instanceof Model) {
+ 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 {
- throw response;
+ this._cache[key] = document;
+ cachedDocument = document;
}
- });
-};
-
-DataStore.prototype.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));
+ 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);
}
- (callback||noop)(list);
- });
- return list;
-};
-
-DataStore.prototype.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)) {
- angular['Array']['includeIf'](collection, cachedDoc, true);
+ 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;
}
});
- if (document.$$anchor) {
- self.anchor[document.$$anchor] = document.$id;
- }
- if (callback)
- callback(document);
- });
-};
-
-DataStore.prototype.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);
+ },
+
+ 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)) {
+ angular['Array']['includeIf'](collection, cachedDoc, true);
}
+ });
+ if (document.$$anchor) {
+ self.anchor[document.$$anchor] = document.$id;
}
+ if (callback)
+ callback(document);
});
- (callback||noop)(response);
- });
-};
-
-DataStore.prototype._jsonRequest = function(request, callback, failure) {
- request.$$callback = callback;
- request.$$failure = failure||function(response){
- throw response;
- };
- this.bulkRequest.push(request);
-};
-
-DataStore.prototype.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);
+ },
+
+ 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);
+ }
+ }
});
- } 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();
+ (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.$$failure(response);
+ request.$$callback(response);
}
- } else {
- request.$$callback(response);
}
}
}
- }
- this.post(bulkRequest, callback);
-};
-
-DataStore.prototype.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();
-};
-
-DataStore.prototype.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;
- for(var i = 0; i < list.length; i++) {
- var document = new type().$loadFrom(list[i]);
- queryList.push(self.cache(document));
+ this.post(bulkRequest, callback);
+ },
+
+ saveScope: function(scope, callback) {
+ var saveCounter = 1;
+ function onSaveDone() {
+ saveCounter--;
+ if (saveCounter === 0 && callback)
+ callback();
}
- if (callback)
- callback(queryList);
- });
- return queryList;
-};
-
-DataStore.prototype.entities = function(callback) {
- var entities = [];
- var self = this;
- this._jsonRequest(["GET", "$entities"], function(response) {
- for (var entityName in response) {
- entities.push(self.entity(entityName));
+ for(var key in scope) {
+ var item = scope[key];
+ if (item && item.$save == Model.prototype.$save) {
+ saveCounter++;
+ item.$save(onSaveDone);
+ }
}
- entities.sort(function(a,b){return a.title > b.title ? 1 : -1;});
- if (callback) callback(entities);
- });
- return entities;
-};
-
-DataStore.prototype.documentCountsByUser = function(){
- var counts = {};
- var self = this;
- self.post([["GET", "$users"]], function(code, response){
- foreach(response[0], function(value, key){
- counts[key] = value;
+ 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;
+ for(var i = 0; i < list.length; i++) {
+ var document = new type().$loadFrom(list[i]);
+ queryList.push(self.cache(document));
+ }
+ if (callback)
+ callback(queryList);
});
- });
- return counts;
-};
-
-DataStore.prototype.userDocumentIdsByEntity = function(user){
- var ids = {};
- var self = this;
- self.post([["GET", "$users/" + user]], function(code, response){
- foreach(response[0], function(value, key){
- ids[key] = value;
+ return queryList;
+ },
+
+ entities: function(callback) {
+ var entities = [];
+ var self = this;
+ this._jsonRequest(["GET", "$entities"], function(response) {
+ for (var entityName in response) {
+ entities.push(self.entity(entityName));
+ }
+ entities.sort(function(a,b){return a.title > b.title ? 1 : -1;});
+ if (callback) callback(entities);
});
- });
- return ids;
-};
-
-DataStore.NullEntity = function(){};
-DataStore.NullEntity.all = function(){return [];};
-DataStore.NullEntity.query = function(){return [];};
-DataStore.NullEntity.load = function(){return {};};
-DataStore.NullEntity.title = undefined;
-
-DataStore.prototype.entity = function(name, defaults){
- if (!name) {
- return DataStore.NullEntity;
- }
- var self = this;
- var entity = function(initialState){
- return new Model(entity, initialState);
- };
- // entity.name does not work as name seems to be reserved for functions
- entity.title = name;
- entity.$$factory = true;
- entity.datastore = this;
- entity.defaults = defaults || {};
- entity.load = function(id, callback){
- return self.load(entity(), id, callback);
- };
- entity.loadMany = function(ids, callback){
- return self.loadMany(entity, ids, callback);
- };
- entity.loadOrCreate = function(id, callback){
- return self.loadOrCreate(entity(), id, callback);
- };
- entity.all = function(callback){
- return self.loadAll(entity, callback);
- };
- entity.query = function(query, queryArgs, callback){
- return self.query(entity, query, queryArgs, callback);
- };
- entity.properties = function(callback) {
- self._jsonRequest(["GET", name + "/$properties"], callback);
- };
- return entity;
-};
-
-DataStore.prototype.join = function(join){
- var fn = function(){
- 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;
+ return entities;
+ },
+
+ documentCountsByUser: function(){
+ var counts = {};
+ var self = this;
+ self.post([["GET", "$users"]], function(code, response){
+ foreach(response[0], function(value, key){
+ counts[key] = value;
});
- nextJoin.join.loadMany(_.toArray(joinIds), function(result){
- var byId = {};
+ });
+ return counts;
+ },
+
+ userDocumentIdsByEntity: function(user){
+ var ids = {};
+ var self = this;
+ self.post([["GET", "$users/" + user]], function(code, response){
+ foreach(response[0], function(value, key){
+ ids[key] = value;
+ });
+ });
+ 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,
+ '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){
- byId[doc.$id] = doc;
- });
- _(joinedResult).each(function(row){
+ var row = {};
+ joinedResult.push(row);
+ row[baseName] = doc;
var id = Scope.getter(row, nextJoinOn);
- row[nextJoinName] = byId[id];
+ 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;
-};
+ return joinedResult;
+ };
+ return fn;
+ }
+};
\ No newline at end of file
diff --git a/src/Filters.js b/src/Filters.js
index 67fcffa1..666c9f30 100644
--- a/src/Filters.js
+++ b/src/Filters.js
@@ -1,5 +1,3 @@
-// Copyright (C) 2009 BRAT Tech LLC
-
angularFilter.Meta = function(obj){
if (obj) {
for ( var key in obj) {
diff --git a/src/JSON.js b/src/JSON.js
index 14fce1fb..0c842865 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -1,16 +1,16 @@
array = [].constructor;
-toJson = function(obj, pretty){
+function toJson(obj, pretty){
var buf = [];
toJsonArray(buf, obj, pretty ? "\n " : null);
return buf.join('');
};
-toPrettyJson = function(obj) {
+function toPrettyJson(obj) {
return toJson(obj, true);
};
-fromJson = function(json) {
+function fromJson(json) {
try {
var parser = new Parser(json, true);
var expression = parser.primary();
@@ -22,8 +22,10 @@ fromJson = function(json) {
}
};
+angular['toJson'] = toJson;
+angular['fromJson'] = fromJson;
-toJsonArray = function(buf, obj, pretty){
+function toJsonArray(buf, obj, pretty){
var type = typeof obj;
if (obj === null) {
buf.push("null");
diff --git a/src/Loader.js b/src/Loader.js
index 104dfec8..5207defb 100644
--- a/src/Loader.js
+++ b/src/Loader.js
@@ -1,7 +1,3 @@
-// Copyright (C) 2008,2009 BRAT Tech LLC
-
-// IE compatibility
-
if (typeof document.getAttribute == 'undefined')
document.getAttribute = function() {};
if (typeof Node == 'undefined') {
diff --git a/src/Model.js b/src/Model.js
index 35f6a1c1..4a3a1806 100644
--- a/src/Model.js
+++ b/src/Model.js
@@ -1,12 +1,10 @@
-// Copyright (C) 2009 BRAT Tech LLC
-
// Single $ is special and does not get searched
// Double $$ is special an is client only (does not get sent to server)
-Model = function(entity, initial) {
- this.$$entity = entity;
+function Model(entity, initial) {
+ this['$$entity'] = entity;
this.$loadFrom(initial||{});
- this.$entity = entity.title;
+ this.$entity = entity['title'];
this.$migrate();
};
@@ -27,39 +25,41 @@ Model.copyDirectFields = function(src, dst) {
}
};
-Model.prototype.$migrate = function() {
- merge(this.$$entity.defaults, this);
- return this;
-};
-
-Model.prototype.$merge = function(other) {
- merge(other, this);
- return this;
-};
-
-Model.prototype.$save = function(callback) {
- this.$$entity.datastore.save(this, callback === true ? undefined : callback);
- if (callback === true) this.$$entity.datastore.flush();
- return this;
-};
-
-Model.prototype.$delete = function(callback) {
- this.$$entity.datastore.remove(this, callback === true ? undefined : callback);
- if (callback === true) this.$$entity.datastore.flush();
- return this;
-};
-
-Model.prototype.$loadById = function(id, callback) {
- this.$$entity.datastore.load(this, id, callback);
- return this;
-};
-
-Model.prototype.$loadFrom = function(other) {
- Model.copyDirectFields(other, this);
- return this;
-};
-
-Model.prototype.$saveTo = function(other) {
- Model.copyDirectFields(this, other);
- return this;
-};
+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/Parser.js b/src/Parser.js
index cdece11e..333b8413 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -1,4 +1,4 @@
-Lexer = function(text, parsStrings){
+function Lexer(text, parsStrings){
this.text = text;
// UTC dates have 20 characters, we send them through parser
this.dateParseLength = parsStrings ? 20 : -1;
@@ -30,210 +30,214 @@ Lexer.OPERATORS = {
'|':function(self, a,b){return b(self, a);},
'!':function(self, a){return !a;}
};
+Lexer.ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'};
-Lexer.prototype.peek = function() {
- if (this.index + 1 < this.text.length) {
- return this.text.charAt(this.index + 1);
- } else {
- return false;
- }
-};
-
-Lexer.prototype.parse = function() {
- var tokens = this.tokens;
- var OPERATORS = Lexer.OPERATORS;
- var canStartRegExp = true;
- while (this.index < this.text.length) {
- var ch = this.text.charAt(this.index);
- if (ch == '"' || ch == "'") {
- this.readString(ch);
- canStartRegExp = true;
- } else if (ch == '(' || ch == '[') {
- tokens.push({index:this.index, text:ch});
- this.index++;
- } else if (ch == '{' ) {
- var peekCh = this.peek();
- if (peekCh == ':' || peekCh == '(') {
- tokens.push({index:this.index, text:ch + peekCh});
+Lexer.prototype = {
+ peek: function() {
+ if (this.index + 1 < this.text.length) {
+ return this.text.charAt(this.index + 1);
+ } else {
+ return false;
+ }
+ },
+
+ parse: function() {
+ var tokens = this.tokens;
+ var OPERATORS = Lexer.OPERATORS;
+ var canStartRegExp = true;
+ while (this.index < this.text.length) {
+ var ch = this.text.charAt(this.index);
+ if (ch == '"' || ch == "'") {
+ this.readString(ch);
+ canStartRegExp = true;
+ } else if (ch == '(' || ch == '[') {
+ tokens.push({index:this.index, text:ch});
this.index++;
- } else {
+ } else if (ch == '{' ) {
+ var peekCh = this.peek();
+ if (peekCh == ':' || peekCh == '(') {
+ tokens.push({index:this.index, text:ch + peekCh});
+ this.index++;
+ } else {
+ tokens.push({index:this.index, text:ch});
+ }
+ this.index++;
+ canStartRegExp = true;
+ } else if (ch == ')' || ch == ']' || ch == '}' ) {
tokens.push({index:this.index, text:ch});
+ this.index++;
+ canStartRegExp = false;
+ } else if ( ch == ':' || ch == '.' || ch == ',' || ch == ';') {
+ tokens.push({index:this.index, text:ch});
+ this.index++;
+ canStartRegExp = true;
+ } else if ( canStartRegExp && ch == '/' ) {
+ this.readRegexp();
+ canStartRegExp = false;
+ } else if ( this.isNumber(ch) ) {
+ this.readNumber();
+ canStartRegExp = false;
+ } else if (this.isIdent(ch)) {
+ this.readIdent();
+ canStartRegExp = false;
+ } else if (this.isWhitespace(ch)) {
+ this.index++;
+ } else {
+ var ch2 = ch + this.peek();
+ var fn = OPERATORS[ch];
+ var fn2 = OPERATORS[ch2];
+ if (fn2) {
+ tokens.push({index:this.index, text:ch2, fn:fn2});
+ this.index += 2;
+ } else if (fn) {
+ tokens.push({index:this.index, text:ch, fn:fn});
+ this.index += 1;
+ } else {
+ throw "Lexer Error: Unexpected next character [" +
+ this.text.substring(this.index) +
+ "] in expression '" + this.text +
+ "' at column '" + (this.index+1) + "'.";
+ }
+ canStartRegExp = true;
}
- this.index++;
- canStartRegExp = true;
- } else if (ch == ')' || ch == ']' || ch == '}' ) {
- tokens.push({index:this.index, text:ch});
- this.index++;
- canStartRegExp = false;
- } else if ( ch == ':' || ch == '.' || ch == ',' || ch == ';') {
- tokens.push({index:this.index, text:ch});
- this.index++;
- canStartRegExp = true;
- } else if ( canStartRegExp && ch == '/' ) {
- this.readRegexp();
- canStartRegExp = false;
- } else if ( this.isNumber(ch) ) {
- this.readNumber();
- canStartRegExp = false;
- } else if (this.isIdent(ch)) {
- this.readIdent();
- canStartRegExp = false;
- } else if (this.isWhitespace(ch)) {
- this.index++;
- } else {
- var ch2 = ch + this.peek();
- var fn = OPERATORS[ch];
- var fn2 = OPERATORS[ch2];
- if (fn2) {
- tokens.push({index:this.index, text:ch2, fn:fn2});
- this.index += 2;
- } else if (fn) {
- tokens.push({index:this.index, text:ch, fn:fn});
- this.index += 1;
+ }
+ return tokens;
+ },
+
+ isNumber: function(ch) {
+ return '0' <= ch && ch <= '9';
+ },
+
+ isWhitespace: function(ch) {
+ return ch == ' ' || ch == '\r' || ch == '\t' ||
+ ch == '\n' || ch == '\v';
+ },
+
+ isIdent: function(ch) {
+ return 'a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ '_' == ch || ch == '$';
+ },
+
+ readNumber: function() {
+ var number = "";
+ var start = this.index;
+ while (this.index < this.text.length) {
+ var ch = this.text.charAt(this.index);
+ if (ch == '.' || this.isNumber(ch)) {
+ number += ch;
} else {
- throw "Lexer Error: Unexpected next character [" +
- this.text.substring(this.index) +
- "] in expression '" + this.text +
- "' at column '" + (this.index+1) + "'.";
+ break;
}
- canStartRegExp = true;
+ this.index++;
}
- }
- return tokens;
-};
-
-Lexer.prototype.isNumber = function(ch) {
- return '0' <= ch && ch <= '9';
-};
-
-Lexer.prototype.isWhitespace = function(ch) {
- return ch == ' ' || ch == '\r' || ch == '\t' ||
- ch == '\n' || ch == '\v';
-};
-
-Lexer.prototype.isIdent = function(ch) {
- return 'a' <= ch && ch <= 'z' ||
- 'A' <= ch && ch <= 'Z' ||
- '_' == ch || ch == '$';
-};
-
-Lexer.prototype.readNumber = function() {
- var number = "";
- var start = this.index;
- while (this.index < this.text.length) {
- var ch = this.text.charAt(this.index);
- if (ch == '.' || this.isNumber(ch)) {
- number += ch;
- } else {
- break;
+ number = 1 * number;
+ this.tokens.push({index:start, text:number,
+ fn:function(){return number;}});
+ },
+
+ readIdent: function() {
+ var ident = "";
+ var start = this.index;
+ while (this.index < this.text.length) {
+ var ch = this.text.charAt(this.index);
+ if (ch == '.' || this.isIdent(ch) || this.isNumber(ch)) {
+ ident += ch;
+ } else {
+ break;
+ }
+ this.index++;
}
- this.index++;
- }
- number = 1 * number;
- this.tokens.push({index:start, text:number,
- fn:function(){return number;}});
-};
-
-Lexer.prototype.readIdent = function() {
- var ident = "";
- var start = this.index;
- while (this.index < this.text.length) {
- var ch = this.text.charAt(this.index);
- if (ch == '.' || this.isIdent(ch) || this.isNumber(ch)) {
- ident += ch;
- } else {
- break;
+ var fn = Lexer.OPERATORS[ident];
+ if (!fn) {
+ fn = function(self){
+ return self.scope.get(ident);
+ };
+ fn.isAssignable = ident;
}
+ this.tokens.push({index:start, text:ident, fn:fn});
+ },
+
+ readString: function(quote) {
+ var start = this.index;
+ var dateParseLength = this.dateParseLength;
this.index++;
- }
- var fn = Lexer.OPERATORS[ident];
- if (!fn) {
- fn = function(self){
- return self.scope.get(ident);
- };
- fn.isAssignable = ident;
- }
- this.tokens.push({index:start, text:ident, fn:fn});
-};
-Lexer.ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'};
-Lexer.prototype.readString = function(quote) {
- var start = this.index;
- var dateParseLength = this.dateParseLength;
- this.index++;
- var string = "";
- var escape = false;
- while (this.index < this.text.length) {
- var ch = this.text.charAt(this.index);
- if (escape) {
- if (ch == 'u') {
- var hex = this.text.substring(this.index + 1, this.index + 5);
- this.index += 4;
- string += String.fromCharCode(parseInt(hex, 16));
- } else {
- var rep = Lexer.ESCAPE[ch];
- if (rep) {
- string += rep;
+ var string = "";
+ var escape = false;
+ while (this.index < this.text.length) {
+ var ch = this.text.charAt(this.index);
+ if (escape) {
+ if (ch == 'u') {
+ var hex = this.text.substring(this.index + 1, this.index + 5);
+ this.index += 4;
+ string += String.fromCharCode(parseInt(hex, 16));
} else {
- string += ch;
+ var rep = Lexer.ESCAPE[ch];
+ if (rep) {
+ string += rep;
+ } else {
+ string += ch;
+ }
}
+ escape = false;
+ } else if (ch == '\\') {
+ escape = true;
+ } else if (ch == quote) {
+ this.index++;
+ this.tokens.push({index:start, text:string,
+ fn:function(){
+ return (string.length == dateParseLength) ?
+ angular['String']['toDate'](string) : string;
+ }});
+ return;
+ } else {
+ string += ch;
}
- escape = false;
- } else if (ch == '\\') {
- escape = true;
- } else if (ch == quote) {
this.index++;
- this.tokens.push({index:start, text:string,
- fn:function(){
- return (string.length == dateParseLength) ?
- angular['String']['toDate'](string) : string;
- }});
- return;
- } else {
- string += ch;
}
+ throw "Lexer Error: Unterminated quote [" +
+ this.text.substring(start) + "] starting at column '" +
+ (start+1) + "' in expression '" + this.text + "'.";
+ },
+
+ readRegexp: function(quote) {
+ var start = this.index;
this.index++;
- }
- throw "Lexer Error: Unterminated quote [" +
- this.text.substring(start) + "] starting at column '" +
- (start+1) + "' in expression '" + this.text + "'.";
-};
-
-Lexer.prototype.readRegexp = function(quote) {
- var start = this.index;
- this.index++;
- var regexp = "";
- var escape = false;
- while (this.index < this.text.length) {
- var ch = this.text.charAt(this.index);
- if (escape) {
- regexp += ch;
- escape = false;
- } else if (ch === '\\') {
- regexp += ch;
- escape = true;
- } else if (ch === '/') {
- this.index++;
- var flags = "";
- if (this.isIdent(this.text.charAt(this.index))) {
- this.readIdent();
- flags = this.tokens.pop().text;
+ var regexp = "";
+ var escape = false;
+ while (this.index < this.text.length) {
+ var ch = this.text.charAt(this.index);
+ if (escape) {
+ regexp += ch;
+ escape = false;
+ } else if (ch === '\\') {
+ regexp += ch;
+ escape = true;
+ } else if (ch === '/') {
+ this.index++;
+ var flags = "";
+ if (this.isIdent(this.text.charAt(this.index))) {
+ this.readIdent();
+ flags = this.tokens.pop().text;
+ }
+ var compiledRegexp = new RegExp(regexp, flags);
+ this.tokens.push({index:start, text:regexp, flags:flags,
+ fn:function(){return compiledRegexp;}});
+ return;
+ } else {
+ regexp += ch;
}
- var compiledRegexp = new RegExp(regexp, flags);
- this.tokens.push({index:start, text:regexp, flags:flags,
- fn:function(){return compiledRegexp;}});
- return;
- } else {
- regexp += ch;
+ this.index++;
}
- this.index++;
+ throw "Lexer Error: Unterminated RegExp [" +
+ this.text.substring(start) + "] starting at column '" +
+ (start+1) + "' in expression '" + this.text + "'.";
}
- throw "Lexer Error: Unterminated RegExp [" +
- this.text.substring(start) + "] starting at column '" +
- (start+1) + "' in expression '" + this.text + "'.";
};
+/////////////////////////////////////////
-Parser = function(text, parseStrings){
+function Parser(text, parseStrings){
this.text = text;
this.tokens = new Lexer(text, parseStrings).parse();
this.index = 0;
@@ -243,499 +247,501 @@ Parser.ZERO = function(){
return 0;
};
-Parser.prototype.error = function(msg, token) {
- throw "Token '" + token.text +
- "' is " + msg + " at column='" +
- (token.index + 1) + "' of expression '" +
- this.text + "' starting at '" + this.text.substring(token.index) + "'.";
-};
-
-Parser.prototype.peekToken = function() {
- if (this.tokens.length === 0)
- throw "Unexpected end of expression: " + this.text;
- return this.tokens[0];
-};
-
-Parser.prototype.peek = function(e1, e2, e3, e4) {
- var tokens = this.tokens;
- if (tokens.length > 0) {
- var token = tokens[0];
- var t = token.text;
- if (t==e1 || t==e2 || t==e3 || t==e4 ||
- (!e1 && !e2 && !e3 && !e4)) {
+Parser.prototype = {
+ error: function(msg, token) {
+ throw "Token '" + token.text +
+ "' is " + msg + " at column='" +
+ (token.index + 1) + "' of expression '" +
+ this.text + "' starting at '" + this.text.substring(token.index) + "'.";
+ },
+
+ peekToken: function() {
+ if (this.tokens.length === 0)
+ throw "Unexpected end of expression: " + this.text;
+ return this.tokens[0];
+ },
+
+ peek: function(e1, e2, e3, e4) {
+ var tokens = this.tokens;
+ if (tokens.length > 0) {
+ var token = tokens[0];
+ var t = token.text;
+ if (t==e1 || t==e2 || t==e3 || t==e4 ||
+ (!e1 && !e2 && !e3 && !e4)) {
+ return token;
+ }
+ }
+ return false;
+ },
+
+ expect: function(e1, e2, e3, e4){
+ var token = this.peek(e1, e2, e3, e4);
+ if (token) {
+ this.tokens.shift();
+ this.currentToken = token;
return token;
}
- }
- return false;
-};
-
-Parser.prototype.expect = function(e1, e2, e3, e4){
- var token = this.peek(e1, e2, e3, e4);
- if (token) {
- this.tokens.shift();
- this.currentToken = token;
- return token;
- }
- return false;
-};
-
-Parser.prototype.consume = function(e1){
- if (!this.expect(e1)) {
- var token = this.peek();
- throw "Expecting '" + e1 + "' at column '" +
- (token.index+1) + "' in '" +
- this.text + "' got '" +
- this.text.substring(token.index) + "'.";
- }
-};
-
-Parser.prototype._unary = function(fn, parse) {
- var right = parse.apply(this);
- return function(self) {
- return fn(self, right(self));
- };
-};
-
-Parser.prototype._binary = function(left, fn, parse) {
- var right = parse.apply(this);
- return function(self) {
- return fn(self, left(self), right(self));
- };
-};
-
-Parser.prototype.hasTokens = function () {
- return this.tokens.length > 0;
-};
-
-Parser.prototype.assertAllConsumed = function(){
- if (this.tokens.length !== 0) {
- throw "Did not understand '" + this.text.substring(this.tokens[0].index) +
- "' while evaluating '" + this.text + "'.";
- }
-};
-
-Parser.prototype.statements = function(){
- var statements = [];
- while(true) {
- if (this.tokens.length > 0 && !this.peek('}', ')', ';', ']'))
- statements.push(this.filterChain());
- if (!this.expect(';')) {
- return function (self){
- var value;
- for ( var i = 0; i < statements.length; i++) {
- var statement = statements[i];
- if (statement)
- value = statement(self);
- }
- return value;
- };
+ return false;
+ },
+
+ consume: function(e1){
+ if (!this.expect(e1)) {
+ var token = this.peek();
+ throw "Expecting '" + e1 + "' at column '" +
+ (token.index+1) + "' in '" +
+ this.text + "' got '" +
+ this.text.substring(token.index) + "'.";
}
- }
-};
-
-Parser.prototype.filterChain = function(){
- var left = this.expression();
- var token;
- while(true) {
- if ((token = this.expect('|'))) {
- left = this._binary(left, token.fn, this.filter);
- } else {
- return left;
+ },
+
+ _unary: function(fn, parse) {
+ var right = parse.apply(this);
+ return function(self) {
+ return fn(self, right(self));
+ };
+ },
+
+ _binary: function(left, fn, parse) {
+ var right = parse.apply(this);
+ return function(self) {
+ return fn(self, left(self), right(self));
+ };
+ },
+
+ hasTokens: function () {
+ return this.tokens.length > 0;
+ },
+
+ assertAllConsumed: function(){
+ if (this.tokens.length !== 0) {
+ throw "Did not understand '" + this.text.substring(this.tokens[0].index) +
+ "' while evaluating '" + this.text + "'.";
}
- }
-};
-
-Parser.prototype.filter = function(){
- return this._pipeFunction(angular['filter']);
-};
-
-Parser.prototype.validator = function(){
- return this._pipeFunction(angular['validator']);
-};
-
-Parser.prototype._pipeFunction = function(fnScope){
- var fn = this.functionIdent(fnScope);
- var argsFn = [];
- var token;
- while(true) {
- if ((token = this.expect(':'))) {
- argsFn.push(this.expression());
- } else {
- var fnInvoke = function(self, input){
- var args = [input];
- for ( var i = 0; i < argsFn.length; i++) {
- args.push(argsFn[i](self));
- }
- return fn.apply(self, args);
- };
- return function(){
- return fnInvoke;
- };
+ },
+
+ statements: function(){
+ var statements = [];
+ while(true) {
+ if (this.tokens.length > 0 && !this.peek('}', ')', ';', ']'))
+ statements.push(this.filterChain());
+ if (!this.expect(';')) {
+ return function (self){
+ var value;
+ for ( var i = 0; i < statements.length; i++) {
+ var statement = statements[i];
+ if (statement)
+ value = statement(self);
+ }
+ return value;
+ };
+ }
}
- }
-};
-
-Parser.prototype.expression = function(){
- return this.throwStmt();
-};
-
-Parser.prototype.throwStmt = function(){
- if (this.expect('throw')) {
- var throwExp = this.assignment();
- return function (self) {
- throw throwExp(self);
- };
- } else {
- return this.assignment();
- }
-};
-
-Parser.prototype.assignment = function(){
- var left = this.logicalOR();
- var token;
- if (token = this.expect('=')) {
- if (!left.isAssignable) {
- throw "Left hand side '" +
- this.text.substring(0, token.index) + "' of assignment '" +
- this.text.substring(token.index) + "' is not assignable.";
- }
- var ident = function(){return left.isAssignable;};
- return this._binary(ident, token.fn, this.logicalOR);
- } else {
- return left;
- }
-};
-
-Parser.prototype.logicalOR = function(){
- var left = this.logicalAND();
- var token;
- while(true) {
- if ((token = this.expect('||'))) {
- left = this._binary(left, token.fn, this.logicalAND);
+ },
+
+ filterChain: function(){
+ var left = this.expression();
+ var token;
+ while(true) {
+ if ((token = this.expect('|'))) {
+ left = this._binary(left, token.fn, this.filter);
+ } else {
+ return left;
+ }
+ }
+ },
+
+ filter: function(){
+ return this._pipeFunction(angular['filter']);
+ },
+
+ validator: function(){
+ return this._pipeFunction(angular['validator']);
+ },
+
+ _pipeFunction: function(fnScope){
+ var fn = this.functionIdent(fnScope);
+ var argsFn = [];
+ var token;
+ while(true) {
+ if ((token = this.expect(':'))) {
+ argsFn.push(this.expression());
+ } else {
+ var fnInvoke = function(self, input){
+ var args = [input];
+ for ( var i = 0; i < argsFn.length; i++) {
+ args.push(argsFn[i](self));
+ }
+ return fn.apply(self, args);
+ };
+ return function(){
+ return fnInvoke;
+ };
+ }
+ }
+ },
+
+ expression: function(){
+ return this.throwStmt();
+ },
+
+ throwStmt: function(){
+ if (this.expect('throw')) {
+ var throwExp = this.assignment();
+ return function (self) {
+ throw throwExp(self);
+ };
} else {
- return left;
+ return this.assignment();
}
- }
-};
-
-Parser.prototype.logicalAND = function(){
- var left = this.negated();
- var token;
- while(true) {
- if ((token = this.expect('&&'))) {
- left = this._binary(left, token.fn, this.negated);
+ },
+
+ assignment: function(){
+ var left = this.logicalOR();
+ var token;
+ if (token = this.expect('=')) {
+ if (!left.isAssignable) {
+ throw "Left hand side '" +
+ this.text.substring(0, token.index) + "' of assignment '" +
+ this.text.substring(token.index) + "' is not assignable.";
+ }
+ var ident = function(){return left.isAssignable;};
+ return this._binary(ident, token.fn, this.logicalOR);
} else {
- return left;
+ return left;
}
- }
-};
-
-Parser.prototype.negated = function(){
- var token;
- if (token = this.expect('!')) {
- return this._unary(token.fn, this.equality);
- } else {
- return this.equality();
- }
-};
-
-Parser.prototype.equality = function(){
- var left = this.relational();
- var token;
- while(true) {
- if ((token = this.expect('==','!='))) {
- left = this._binary(left, token.fn, this.relational);
+ },
+
+ logicalOR: function(){
+ var left = this.logicalAND();
+ var token;
+ while(true) {
+ if ((token = this.expect('||'))) {
+ left = this._binary(left, token.fn, this.logicalAND);
+ } else {
+ return left;
+ }
+ }
+ },
+
+ logicalAND: function(){
+ var left = this.negated();
+ var token;
+ while(true) {
+ if ((token = this.expect('&&'))) {
+ left = this._binary(left, token.fn, this.negated);
+ } else {
+ return left;
+ }
+ }
+ },
+
+ negated: function(){
+ var token;
+ if (token = this.expect('!')) {
+ return this._unary(token.fn, this.equality);
} else {
- return left;
+ return this.equality();
}
- }
-};
-
-Parser.prototype.relational = function(){
- var left = this.additive();
- var token;
- while(true) {
- if ((token = this.expect('<', '>', '<=', '>='))) {
- left = this._binary(left, token.fn, this.additive);
+ },
+
+ equality: function(){
+ var left = this.relational();
+ var token;
+ while(true) {
+ if ((token = this.expect('==','!='))) {
+ left = this._binary(left, token.fn, this.relational);
+ } else {
+ return left;
+ }
+ }
+ },
+
+ relational: function(){
+ var left = this.additive();
+ var token;
+ while(true) {
+ if ((token = this.expect('<', '>', '<=', '>='))) {
+ left = this._binary(left, token.fn, this.additive);
+ } else {
+ return left;
+ }
+ }
+ },
+
+ additive: function(){
+ var left = this.multiplicative();
+ var token;
+ while(token = this.expect('+','-')) {
+ left = this._binary(left, token.fn, this.multiplicative);
+ }
+ return left;
+ },
+
+ multiplicative: function(){
+ var left = this.unary();
+ var token;
+ while(token = this.expect('*','/','%')) {
+ left = this._binary(left, token.fn, this.unary);
+ }
+ return left;
+ },
+
+ unary: function(){
+ var token;
+ if (this.expect('+')) {
+ return this.primary();
+ } else if (token = this.expect('-')) {
+ return this._binary(Parser.ZERO, token.fn, this.multiplicative);
} else {
- return left;
+ return this.primary();
}
- }
-};
-
-Parser.prototype.additive = function(){
- var left = this.multiplicative();
- var token;
- while(token = this.expect('+','-')) {
- left = this._binary(left, token.fn, this.multiplicative);
- }
- return left;
-};
-
-Parser.prototype.multiplicative = function(){
- var left = this.unary();
- var token;
- while(token = this.expect('*','/','%')) {
- left = this._binary(left, token.fn, this.unary);
- }
- return left;
-};
-
-Parser.prototype.unary = function(){
- var token;
- if (this.expect('+')) {
- return this.primary();
- } else if (token = this.expect('-')) {
- return this._binary(Parser.ZERO, token.fn, this.multiplicative);
- } else {
- return this.primary();
- }
-};
-
-Parser.prototype.functionIdent = function(fnScope) {
- var token = this.expect();
- var element = token.text.split('.');
- var instance = fnScope;
- var key;
- for ( var i = 0; i < element.length; i++) {
- key = element[i];
- if (instance)
- instance = instance[key];
- }
- if (typeof instance != 'function') {
- throw "Function '" + token.text + "' at column '" +
- (token.index+1) + "' in '" + this.text + "' is not defined.";
- }
- return instance;
-};
-
-Parser.prototype.primary = function() {
- var primary;
- if (this.expect('(')) {
- var expression = this.filterChain();
- this.consume(')');
- primary = expression;
- } else if (this.expect('[')) {
- primary = this.arrayDeclaration();
- } else if (this.expect('{')) {
- primary = this.object();
- } else if (this.expect('{:')) {
- primary = this.closure(false);
- } else if (this.expect('{(')) {
- primary = this.closure(true);
- } else {
+ },
+
+ functionIdent: function(fnScope) {
var token = this.expect();
- primary = token.fn;
- if (!primary) {
- this.error("not a primary expression", token);
+ var element = token.text.split('.');
+ var instance = fnScope;
+ var key;
+ for ( var i = 0; i < element.length; i++) {
+ key = element[i];
+ if (instance)
+ instance = instance[key];
}
- }
- var next;
- while (next = this.expect('(', '[', '.')) {
- if (next.text === '(') {
- primary = this.functionCall(primary);
- } else if (next.text === '[') {
- primary = this.objectIndex(primary);
- } else if (next.text === '.') {
- primary = this.fieldAccess(primary);
+ if (typeof instance != 'function') {
+ throw "Function '" + token.text + "' at column '" +
+ (token.index+1) + "' in '" + this.text + "' is not defined.";
+ }
+ return instance;
+ },
+
+ primary: function() {
+ var primary;
+ if (this.expect('(')) {
+ var expression = this.filterChain();
+ this.consume(')');
+ primary = expression;
+ } else if (this.expect('[')) {
+ primary = this.arrayDeclaration();
+ } else if (this.expect('{')) {
+ primary = this.object();
+ } else if (this.expect('{:')) {
+ primary = this.closure(false);
+ } else if (this.expect('{(')) {
+ primary = this.closure(true);
} else {
- throw "IMPOSSIBLE";
+ var token = this.expect();
+ primary = token.fn;
+ if (!primary) {
+ this.error("not a primary expression", token);
+ }
}
- }
- return primary;
-};
-
-Parser.prototype.closure = function(hasArgs) {
- var args = [];
- if (hasArgs) {
- if (!this.expect(')')) {
- args.push(this.expect().text);
- while(this.expect(',')) {
+ var next;
+ while (next = this.expect('(', '[', '.')) {
+ if (next.text === '(') {
+ primary = this.functionCall(primary);
+ } else if (next.text === '[') {
+ primary = this.objectIndex(primary);
+ } else if (next.text === '.') {
+ primary = this.fieldAccess(primary);
+ } else {
+ throw "IMPOSSIBLE";
+ }
+ }
+ return primary;
+ },
+
+ closure: function(hasArgs) {
+ var args = [];
+ if (hasArgs) {
+ if (!this.expect(')')) {
args.push(this.expect().text);
+ while(this.expect(',')) {
+ args.push(this.expect().text);
+ }
+ this.consume(')');
}
- this.consume(')');
+ this.consume(":");
}
- this.consume(":");
- }
- var statements = this.statements();
- this.consume("}");
- return function(self){
- return function($){
- var scope = new Scope(self.scope.state);
- scope.set('$', $);
- for ( var i = 0; i < args.length; i++) {
- scope.set(args[i], arguments[i]);
+ var statements = this.statements();
+ this.consume("}");
+ return function(self){
+ return function($){
+ var scope = new Scope(self.scope.state);
+ scope.set('$', $);
+ for ( var i = 0; i < args.length; i++) {
+ scope.set(args[i], arguments[i]);
+ }
+ return statements({scope:scope});
+ };
+ };
+ },
+
+ fieldAccess: function(object) {
+ var field = this.expect().text;
+ var fn = function (self){
+ return Scope.getter(object(self), field);
+ };
+ fn.isAssignable = field;
+ return fn;
+ },
+
+ objectIndex: function(obj) {
+ var indexFn = this.expression();
+ this.consume(']');
+ if (this.expect('=')) {
+ var rhs = this.expression();
+ return function (self){
+ return obj(self)[indexFn(self)] = rhs(self);
+ };
+ } else {
+ return function (self){
+ var o = obj(self);
+ var i = indexFn(self);
+ return (o) ? o[i] : undefined;
+ };
+ }
+ },
+
+ functionCall: function(fn) {
+ var argsFn = [];
+ if (this.peekToken().text != ')') {
+ do {
+ argsFn.push(this.expression());
+ } while (this.expect(','));
+ }
+ this.consume(')');
+ return function (self){
+ var args = [];
+ 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.";
}
- return statements({scope:scope});
};
- };
-};
-
-Parser.prototype.fieldAccess = function(object) {
- var field = this.expect().text;
- var fn = function (self){
- return Scope.getter(object(self), field);
- };
- fn.isAssignable = field;
- return fn;
-};
-
-Parser.prototype.objectIndex = function(obj) {
- var indexFn = this.expression();
- this.consume(']');
- if (this.expect('=')) {
- var rhs = this.expression();
+ },
+
+ // This is used with json array declaration
+ arrayDeclaration: function () {
+ var elementFns = [];
+ if (this.peekToken().text != ']') {
+ do {
+ elementFns.push(this.expression());
+ } while (this.expect(','));
+ }
+ this.consume(']');
return function (self){
- return obj(self)[indexFn(self)] = rhs(self);
+ var array = [];
+ for ( var i = 0; i < elementFns.length; i++) {
+ array.push(elementFns[i](self));
+ }
+ return array;
};
- } else {
+ },
+
+ object: function () {
+ var keyValues = [];
+ if (this.peekToken().text != '}') {
+ do {
+ var key = this.expect().text;
+ this.consume(":");
+ var value = this.expression();
+ keyValues.push({key:key, value:value});
+ } while (this.expect(','));
+ }
+ this.consume('}');
return function (self){
- var o = obj(self);
- var i = indexFn(self);
- return (o) ? o[i] : undefined;
+ var object = {};
+ for ( var i = 0; i < keyValues.length; i++) {
+ var keyValue = keyValues[i];
+ var value = keyValue.value(self);
+ object[keyValue.key] = value;
+ }
+ return object;
};
- }
-};
-
-Parser.prototype.functionCall = function(fn) {
- var argsFn = [];
- if (this.peekToken().text != ')') {
- do {
- argsFn.push(this.expression());
- } while (this.expect(','));
- }
- this.consume(')');
- return function (self){
- var args = [];
- for ( var i = 0; i < argsFn.length; i++) {
- args.push(argsFn[i](self));
+ },
+
+ entityDeclaration: function () {
+ var decl = [];
+ while(this.hasTokens()) {
+ decl.push(this.entityDecl());
+ if (!this.expect(';')) {
+ this.assertAllConsumed();
+ }
}
- var fnPtr = fn(self);
- if (typeof fnPtr === 'function') {
- return fnPtr.apply(self, args);
- } else {
- throw "Expression '" + fn.isAssignable + "' is not a function.";
+ return function (self){
+ var code = "";
+ for ( var i = 0; i < decl.length; i++) {
+ code += decl[i](self);
+ }
+ return code;
+ };
+ },
+
+ entityDecl: function () {
+ var entity = this.expect().text;
+ var instance;
+ var defaults;
+ if (this.expect('=')) {
+ instance = entity;
+ entity = this.expect().text;
}
- };
-};
-
-// This is used with json array declaration
-Parser.prototype.arrayDeclaration = function () {
- var elementFns = [];
- if (this.peekToken().text != ']') {
- do {
- elementFns.push(this.expression());
- } while (this.expect(','));
- }
- this.consume(']');
- return function (self){
- var array = [];
- for ( var i = 0; i < elementFns.length; i++) {
- array.push(elementFns[i](self));
- }
- return array;
- };
-};
-
-Parser.prototype.object = function () {
- var keyValues = [];
- if (this.peekToken().text != '}') {
- do {
- var key = this.expect().text;
- this.consume(":");
- var value = this.expression();
- keyValues.push({key:key, value:value});
- } while (this.expect(','));
- }
- this.consume('}');
- return function (self){
- var object = {};
- for ( var i = 0; i < keyValues.length; i++) {
- var keyValue = keyValues[i];
- var value = keyValue.value(self);
- object[keyValue.key] = value;
- }
- return object;
- };
-};
-
-Parser.prototype.entityDeclaration = function () {
- var decl = [];
- while(this.hasTokens()) {
- decl.push(this.entityDecl());
- if (!this.expect(';')) {
- this.assertAllConsumed();
+ if (this.expect(':')) {
+ defaults = this.primary()(null);
}
- }
- return function (self){
- var code = "";
- for ( var i = 0; i < decl.length; i++) {
- code += decl[i](self);
+ return function(self) {
+ var datastore = self.scope.get('$datastore');
+ var Entity = datastore.entity(entity, defaults);
+ self.scope.set(entity, Entity);
+ if (instance) {
+ var document = Entity();
+ document.$$anchor = instance;
+ self.scope.set(instance, document);
+ return "$anchor." + instance + ":{" +
+ instance + "=" + entity + ".load($anchor." + instance + ");" +
+ instance + ".$$anchor=" + angular['String']['quote'](instance) + ";" +
+ "};";
+ } else {
+ return "";
+ }
+ };
+ },
+
+ watch: function () {
+ var decl = [];
+ while(this.hasTokens()) {
+ decl.push(this.watchDecl());
+ if (!this.expect(';')) {
+ this.assertAllConsumed();
+ }
}
- return code;
- };
-};
-
-Parser.prototype.entityDecl = function () {
- var entity = this.expect().text;
- var instance;
- var defaults;
- if (this.expect('=')) {
- instance = entity;
- entity = this.expect().text;
- }
- if (this.expect(':')) {
- defaults = this.primary()(null);
- }
- return function(self) {
- var datastore = self.scope.get('$datastore');
- var Entity = datastore.entity(entity, defaults);
- self.scope.set(entity, Entity);
- if (instance) {
- var document = Entity();
- document.$$anchor = instance;
- self.scope.set(instance, document);
- return "$anchor." + instance + ":{" +
- instance + "=" + entity + ".load($anchor." + instance + ");" +
- instance + ".$$anchor=" + angular['String']['quote'](instance) + ";" +
- "};";
+ this.assertAllConsumed();
+ return function (self){
+ for ( var i = 0; i < decl.length; i++) {
+ var d = decl[i](self);
+ self.addListener(d.name, d.fn);
+ }
+ };
+ },
+
+ watchDecl: function () {
+ var anchorName = this.expect().text;
+ this.consume(":");
+ var expression;
+ if (this.peekToken().text == '{') {
+ this.consume("{");
+ expression = this.statements();
+ this.consume("}");
} else {
- return "";
- }
- };
-};
-
-Parser.prototype.watch = function () {
- var decl = [];
- while(this.hasTokens()) {
- decl.push(this.watchDecl());
- if (!this.expect(';')) {
- this.assertAllConsumed();
- }
- }
- this.assertAllConsumed();
- return function (self){
- for ( var i = 0; i < decl.length; i++) {
- var d = decl[i](self);
- self.addListener(d.name, d.fn);
+ expression = this.expression();
}
- };
-};
-
-Parser.prototype.watchDecl = function () {
- var anchorName = this.expect().text;
- this.consume(":");
- var expression;
- if (this.peekToken().text == '{') {
- this.consume("{");
- expression = this.statements();
- this.consume("}");
- } else {
- expression = this.expression();
+ return function(self) {
+ return {name:anchorName, fn:expression};
+ };
}
- return function(self) {
- return {name:anchorName, fn:expression};
- };
};
diff --git a/src/Scope.js b/src/Scope.js
index f4b34c3c..dcc50007 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -1,6 +1,4 @@
-// Copyright (C) 2009 BRAT Tech LLC
-
-Scope = function(initialState, name) {
+function Scope(initialState, name) {
this.widgets = [];
this.watchListeners = {};
this.name = name;
@@ -15,31 +13,6 @@ Scope = function(initialState, name) {
};
Scope.expressionCache = {};
-
-Scope.prototype.updateView = function() {
- var self = this;
- this.fireWatchers();
- _.each(this.widgets, function(widget){
- self.evalWidget(widget, "", {}, function(){
- this.updateView(self);
- });
- });
-};
-
-Scope.prototype.addWidget = function(controller) {
- if (controller) this.widgets.push(controller);
-};
-
-Scope.prototype.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;
-};
-
Scope.getter = function(instance, path) {
if (!path) return instance;
var element = path.split('.');
@@ -70,129 +43,155 @@ Scope.getter = function(instance, path) {
return instance;
};
-Scope.prototype.get = function(path) {
- return Scope.getter(this.state, path);
-};
-
-Scope.prototype.set = function(path, value) {
- var element = path.split('.');
- var instance = this.state;
- for ( var i = 0; element.length > 1; i++) {
- var key = element.shift();
- var newInstance = instance[key];
- if (!newInstance) {
- newInstance = {};
- instance[key] = newInstance;
+Scope.prototype = {
+ updateView: function() {
+ var self = this;
+ this.fireWatchers();
+ _.each(this.widgets, function(widget){
+ self.evalWidget(widget, "", {}, function(){
+ this.updateView(self);
+ });
+ });
+ },
+
+ addWidget: function(controller) {
+ if (controller) this.widgets.push(controller);
+ },
+
+ isProperty: function(exp) {
+ for ( var i = 0; i < exp.length; i++) {
+ var ch = exp.charAt(i);
+ if (ch!='.' && !Lexer.prototype.isIdent(ch)) {
+ return false;
+ }
}
- instance = newInstance;
- }
- instance[element.shift()] = value;
- return value;
-};
-
-Scope.prototype.setEval = function(expressionText, value) {
- this.eval(expressionText + "=" + toJson(value));
-};
-
-Scope.prototype.eval = function(expressionText, context) {
- var expression = Scope.expressionCache[expressionText];
- if (!expression) {
- var parser = new Parser(expressionText);
- expression = parser.statements();
- parser.assertAllConsumed();
- Scope.expressionCache[expressionText] = expression;
- }
- context = context || {};
- context.scope = this;
- return expression(context);
-};
-
-//TODO: Refactor. This function needs to be an execution closure for widgets
-// move to widgets
-// remove expression, just have inner closure.
-Scope.prototype.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');
+ return true;
+ },
+
+ get: function(path) {
+ return Scope.getter(this.state, path);
+ },
+
+ set: function(path, value) {
+ var element = path.split('.');
+ var instance = this.state;
+ for ( var i = 0; element.length > 1; i++) {
+ var key = element.shift();
+ var newInstance = instance[key];
+ if (!newInstance) {
+ newInstance = {};
+ instance[key] = newInstance;
+ }
+ instance = newInstance;
}
- if (onSuccess) {
- value = onSuccess.apply(widget, [value]);
+ instance[element.shift()] = value;
+ return value;
+ },
+
+ setEval: function(expressionText, value) {
+ this.eval(expressionText + "=" + toJson(value));
+ },
+
+ eval: function(expressionText, context) {
+ var expression = Scope.expressionCache[expressionText];
+ if (!expression) {
+ var parser = new Parser(expressionText);
+ expression = parser.statements();
+ parser.assertAllConsumed();
+ Scope.expressionCache[expressionText] = expression;
}
- return true;
- } catch (e){
- error('Eval Widget Error:', e);
- var jsonError = toJson(e, true);
- widget.hasError = true;
- jQuery(widget.view).
- addClass('ng-exception').
- attr('ng-error', jsonError);
- if (onFailure) {
- onFailure.apply(widget, [e, jsonError]);
+ context = context || {};
+ context.scope = this;
+ return expression(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){
+ error('Eval Widget Error:', e);
+ var jsonError = toJson(e, true);
+ widget.hasError = true;
+ jQuery(widget.view).
+ addClass('ng-exception').
+ attr('ng-error', jsonError);
+ if (onFailure) {
+ onFailure.apply(widget, [e, jsonError]);
+ }
+ return false;
}
- return false;
- }
-};
-
-Scope.prototype.validate = function(expressionText, value) {
- var expression = Scope.expressionCache[expressionText];
- if (!expression) {
- expression = new Parser(expressionText).validator();
- Scope.expressionCache[expressionText] = expression;
- }
- var self = {scope:this};
- return expression(self)(self, value);
-};
-
-Scope.prototype.entity = function(entityDeclaration) {
- var expression = new Parser(entityDeclaration).entityDeclaration();
- return expression({scope:this});
-};
-
-Scope.prototype.markInvalid = function(widget) {
- this.state.$invalidWidgets.push(widget);
-};
-
-Scope.prototype.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);
- }
- });
+ },
+
+ validate: function(expressionText, value) {
+ var expression = Scope.expressionCache[expressionText];
+ if (!expression) {
+ expression = new Parser(expressionText).validator();
+ Scope.expressionCache[expressionText] = expression;
}
- });
-};
-
-Scope.prototype.addWatchListener = function(watchExpression, listener) {
- var watcher = this.watchListeners[watchExpression];
- if (!watcher) {
- watcher = {listeners:[], expression:watchExpression};
- this.watchListeners[watchExpression] = watcher;
- }
- watcher.listeners.push(listener);
-};
-
-Scope.prototype.fireWatchers = function() {
- var self = this;
- var 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;
+ var self = {scope:this};
+ return expression(self)(self, value);
+ },
+
+ entity: function(entityDeclaration) {
+ var expression = new Parser(entityDeclaration).entityDeclaration();
+ return expression({scope:this});
+ },
+
+ 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) {
+ var watcher = this.watchListeners[watchExpression];
+ if (!watcher) {
+ watcher = {listeners:[], expression:watchExpression};
+ this.watchListeners[watchExpression] = watcher;
}
- });
- return fired;
-};
+ watcher.listeners.push(listener);
+ },
+
+ fireWatchers: function() {
+ var self = this;
+ var 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;
+ }
+};
\ No newline at end of file
diff --git a/src/Server.js b/src/Server.js
index 8f682038..f351e84c 100644
--- a/src/Server.js
+++ b/src/Server.js
@@ -1,6 +1,4 @@
-// Copyright (C) 2008,2009 BRAT Tech LLC
-
-Server = function(url, getScript) {
+function Server(url, getScript) {
this.url = url;
this.nextId = 0;
this.getScript = getScript;
@@ -8,27 +6,29 @@ Server = function(url, getScript) {
this.maxSize = 1800;
};
-Server.prototype.base64url = function(txt) {
- return Base64.encode(txt);
-};
-
-Server.prototype.request = function(method, url, request, callback) {
- var requestId = this.uuid + (this.nextId++);
- angularCallbacks[requestId] = function(response) {
- delete angular[requestId];
- callback(200, response);
- };
- var payload = {u:url, m:method, p:request};
- payload = this.base64url(toJson(payload));
- var totalPockets = Math.ceil(payload.length / this.maxSize);
- var baseUrl = this.url + "/$/" + requestId + "/" + totalPockets + "/";
- for ( var pocketNo = 0; pocketNo < totalPockets; pocketNo++) {
- var pocket = payload.substr(pocketNo * this.maxSize, this.maxSize);
- this.getScript(baseUrl + (pocketNo+1) + "?h=" + pocket, noop);
+Server.prototype = {
+ base64url: function(txt) {
+ return Base64.encode(txt);
+ },
+
+ request: function(method, url, request, callback) {
+ var requestId = this.uuid + (this.nextId++);
+ angularCallbacks[requestId] = function(response) {
+ delete angular[requestId];
+ callback(200, response);
+ };
+ var payload = {u:url, m:method, p:request};
+ payload = this.base64url(toJson(payload));
+ var totalPockets = Math.ceil(payload.length / this.maxSize);
+ var baseUrl = this.url + "/$/" + requestId + "/" + totalPockets + "/";
+ for ( var pocketNo = 0; pocketNo < totalPockets; pocketNo++) {
+ var pocket = payload.substr(pocketNo * this.maxSize, this.maxSize);
+ this.getScript(baseUrl + (pocketNo+1) + "?h=" + pocket, noop);
+ }
}
};
-FrameServer = function(frame) {
+function FrameServer(frame) {
this.frame = frame;
};
FrameServer.PREFIX = "$DATASET:";
@@ -46,7 +46,7 @@ FrameServer.prototype = {
};
-VisualServer = function(delegate, status, update) {
+function VisualServer(delegate, status, update) {
this.delegate = delegate;
this.update = update;
this.status = status;
diff --git a/src/Users.js b/src/Users.js
index d10b96df..47da4f73 100644
--- a/src/Users.js
+++ b/src/Users.js
@@ -1,11 +1,10 @@
-// Copyright (C) 2008,2009 BRAT Tech LLC
-Users = function(server, controlBar) {
+function Users(server, controlBar) {
this.server = server;
this.controlBar = controlBar;
};
Users.prototype = {
- fetchCurrentUser:function(callback) {
+ 'fetchCurrentUser':function(callback) {
var self = this;
this.server.request("GET", "/account.json", {}, function(code, response){
self.current = response.user;
@@ -13,7 +12,7 @@ Users.prototype = {
});
},
- logout: function(callback) {
+ 'logout': function(callback) {
var self = this;
this.controlBar.logout(function(){
delete self.current;
@@ -21,7 +20,7 @@ Users.prototype = {
});
},
- login: function(callback) {
+ 'login': function(callback) {
var self = this;
this.controlBar.login(function(){
self.fetchCurrentUser(function(){
@@ -30,7 +29,7 @@ Users.prototype = {
});
},
- notAuthorized: function(){
+ 'notAuthorized': function(){
this.controlBar.notAuthorized();
}
};
diff --git a/src/Validators.js b/src/Validators.js
index eb8cff59..5549ee39 100644
--- a/src/Validators.js
+++ b/src/Validators.js
@@ -1,5 +1,3 @@
-// Copyright (C) 2009 BRAT Tech LLC
-
foreach({
'regexp': function(value, regexp, msg) {
if (!value.match(regexp)) {
diff --git a/src/Widgets.js b/src/Widgets.js
index 5dcb84c4..f93f2476 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -1,7 +1,4 @@
-// Copyright (C) 2009 BRAT Tech LLC
-
-
-WidgetFactory = function(serverUrl, database) {
+function WidgetFactory(serverUrl, database) {
this.nextUploadId = 0;
this.serverUrl = serverUrl;
this.database = database;
@@ -15,80 +12,81 @@ WidgetFactory = function(serverUrl, database) {
this.onChangeListener = function(){};
};
-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;
- if (type == 'button' || type == 'submit' || type == 'reset' || type == 'image') {
- controller = new ButtonController(input[0], exp);
- event = "click";
- bubbleEvent = false;
- } else if (type == 'text' || type == 'textarea' || type == 'hidden' || type == 'password') {
- controller = new TextController(input[0], exp);
- event = "keyup change";
- } else if (type == 'checkbox') {
- controller = new CheckboxController(input[0], exp);
- event = "click";
- } else if (type == 'radio') {
- controller = new RadioController(input[0], exp);
- event="click";
- } else if (type == 'select-one') {
- controller = new SelectController(input[0], exp);
- } else if (type == 'select-multiple') {
- controller = new MultiSelectController(input[0], exp);
- } else if (type == 'file') {
- controller = this.createFileController(input, exp);
- } else {
- throw 'Unknown type: ' + type;
- }
- input.data('controller', controller);
- var binder = scope.get('$binder');
- var action = function() {
- if (controller.updateModel(scope)) {
- var action = jQuery(controller.view).attr('ng-action') || "";
- if (scope.evalWidget(controller, action)) {
- binder.updateView(scope);
- }
+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;
+ if (type == 'button' || type == 'submit' || type == 'reset' || type == 'image') {
+ controller = new ButtonController(input[0], exp);
+ event = "click";
+ bubbleEvent = false;
+ } else if (type == 'text' || type == 'textarea' || type == 'hidden' || type == 'password') {
+ controller = new TextController(input[0], exp);
+ event = "keyup change";
+ } else if (type == 'checkbox') {
+ controller = new CheckboxController(input[0], exp);
+ event = "click";
+ } else if (type == 'radio') {
+ controller = new RadioController(input[0], exp);
+ event="click";
+ } else if (type == 'select-one') {
+ controller = new SelectController(input[0], exp);
+ } else if (type == 'select-multiple') {
+ controller = new MultiSelectController(input[0], exp);
+ } else if (type == 'file') {
+ controller = this.createFileController(input, exp);
+ } else {
+ throw 'Unknown type: ' + type;
}
- return bubbleEvent;
- };
- jQuery(controller.view, ":input").
- bind(event, action);
- return controller;
-};
-
-WidgetFactory.prototype.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).data('controller', cntl);
- return cntl;
-};
-
-WidgetFactory.prototype.createTextWidget = function(textInput) {
- var controller = new TextController(textInput);
- controller.onChange(this.onChangeListener);
- return controller;
+ input.data('controller', controller);
+ var binder = scope.get('$binder');
+ var action = function() {
+ if (controller.updateModel(scope)) {
+ var action = jQuery(controller.view).attr('ng-action') || "";
+ if (scope.evalWidget(controller, action)) {
+ binder.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).data('controller', cntl);
+ return cntl;
+ },
+
+ createTextWidget: function(textInput) {
+ var controller = new TextController(textInput);
+ controller.onChange(this.onChangeListener);
+ return controller;
+ }
};
-
/////////////////////
// FileController
///////////////////////
-FileController = function(view, scopeName, uploader, databaseUrl) {
+function FileController(view, scopeName, uploader, databaseUrl) {
this.view = view;
this.uploader = uploader;
this.scopeName = scopeName;
@@ -112,99 +110,89 @@ FileController.template = function(id) {
'');
};
-FileController.prototype._on_cancel = function() {
-};
-
-FileController.prototype._on_complete = function() {
-};
-
-FileController.prototype._on_httpStatus = function(status) {
- alert("httpStatus:" + this.scopeName + " status:" + status);
-};
-
-FileController.prototype._on_ioError = function() {
- alert("ioError:" + this.scopeName);
-};
-
-FileController.prototype._on_open = function() {
- alert("open:" + this.scopeName);
-};
-
-FileController.prototype._on_progress = function(bytesLoaded, bytesTotal) {
-};
-
-FileController.prototype._on_securityError = function() {
- alert("securityError:" + this.scopeName);
-};
-
-FileController.prototype._on_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;
- scope.get('$binder').updateView();
-};
-
-FileController.prototype._on_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();
-};
-
-FileController.prototype.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;
- }
-};
-
-FileController.prototype.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);
-};
-
-FileController.prototype.upload = function() {
- if (this.name) {
- this.uploader.uploadFile(this.attachmentsPath);
+FileController.prototype = {
+ '_on_cancel': noop,
+ '_on_complete': noop,
+ '_on_httpStatus': function(status) {
+ alert("httpStatus:" + this.scopeName + " status:" + status);
+ },
+ '_on_ioError': function() {
+ alert("ioError:" + this.scopeName);
+ },
+ '_on_open': function() {
+ alert("open:" + this.scopeName);
+ },
+ '_on_progress':noop,
+ '_on_securityError': function() {
+ alert("securityError:" + this.scopeName);
+ },
+ '_on_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;
+ scope.get('$binder').updateView();
+ },
+ '_on_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
///////////////////////
-NullController = function(view) {this.view = view;};
-NullController.prototype.updateModel = function() { return true; };
-NullController.prototype.updateView = function() { };
+function NullController(view) {this.view = view;};
+NullController.prototype = {
+ updateModel: function() { return true; },
+ updateView: noop
+};
NullController.instance = new NullController();
///////////////////////
// ButtonController
///////////////////////
-ButtonController = function(view) {this.view = view;};
-ButtonController.prototype.updateModel = function(scope) { return true; };
-ButtonController.prototype.updateView = function(scope) {};
+var ButtonController = NullController;
///////////////////////
// TextController
///////////////////////
-TextController = function(view, exp) {
+function TextController(view, exp) {
this.view = view;
this.exp = exp;
this.validator = view.getAttribute('ng-validate');
@@ -218,175 +206,183 @@ TextController = function(view, exp) {
}
};
-TextController.prototype.updateModel = function(scope) {
- var value = this.view.value;
- if (this.lastValue === value) {
- return false;
- } else {
- scope.setEval(this.exp, value);
- this.lastValue = value;
- return true;
- }
-};
-
-TextController.prototype.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 != value) {
- view.value = value;
- this.lastValue = value;
- }
- var isValidationError = false;
- view.removeAttribute('ng-error');
- if (this.required) {
- isValidationError = !(value && value.length > 0);
- }
- var errorText = isValidationError ? "Required Value" : null;
- if (!isValidationError && this.validator && value) {
- errorText = scope.validate(this.validator, value);
- isValidationError = !!errorText;
- }
- if (this.lastErrorText !== errorText) {
- this.lastErrorText = isValidationError;
- if (errorText !== null) {
- view.setAttribute('ng-error', errorText);
- scope.markInvalid(this);
+TextController.prototype = {
+ updateModel: function(scope) {
+ 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 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 != value) {
+ view.value = value;
+ this.lastValue = value;
+ }
+ var isValidationError = false;
+ view.removeAttribute('ng-error');
+ if (this.required) {
+ isValidationError = !(value && value.length > 0);
+ }
+ var errorText = isValidationError ? "Required Value" : null;
+ if (!isValidationError && this.validator && value) {
+ errorText = scope.validate(this.validator, value);
+ isValidationError = !!errorText;
+ }
+ if (this.lastErrorText !== errorText) {
+ this.lastErrorText = isValidationError;
+ if (errorText !== null) {
+ view.setAttribute('ng-error', errorText);
+ scope.markInvalid(this);
+ }
+ jQuery(view).toggleClass('ng-validation-error', isValidationError);
}
- jQuery(view).toggleClass('ng-validation-error', isValidationError);
}
};
///////////////////////
// CheckboxController
///////////////////////
-CheckboxController = function(view, exp) {
+function CheckboxController(view, exp) {
this.view = view;
this.exp = exp;
this.lastValue = undefined;
this.initialValue = view.checked ? view.value : "";
};
-CheckboxController.prototype.updateModel = function(scope) {
- var input = this.view;
- var value = input.checked ? input.value : '';
- if (this.lastValue === value) {
- return false;
- } else {
- scope.setEval(this.exp, value);
- this.lastValue = value;
- return true;
- }
-};
-
-CheckboxController.prototype.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);
+CheckboxController.prototype = {
+ updateModel: function(scope) {
+ var input = this.view;
+ var value = input.checked ? input.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.eval(this.exp);
+ if (typeof value === "undefined") {
+ value = this.initialValue;
+ scope.setEval(this.exp, value);
+ }
+ input.checked = input.value == (''+value);
}
- input.checked = input.value == (''+value);
};
///////////////////////
// SelectController
///////////////////////
-SelectController = function(view, exp) {
+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;
+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;
- return true;
}
}
};
-SelectController.prototype.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
///////////////////////
-MultiSelectController = function(view, exp) {
+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;
-};
-
-MultiSelectController.prototype.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;
- }
-};
-
-MultiSelectController.prototype.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;
+MultiSelectController.prototype = {
+ selected: function () {
+ var value = [];
+ var options = this.view.options;
for ( var i = 0; i < options.length; i++) {
var option = options[i];
- option.selected = _.include(selected, option.value);
+ 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;
}
- this.lastValue = selected;
}
};
///////////////////////
// RadioController
///////////////////////
-RadioController = function(view, exp) {
+function RadioController(view, exp) {
this.view = view;
this.exp = exp;
this.lastChecked = undefined;
@@ -395,35 +391,37 @@ RadioController = function(view, exp) {
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;
- }
-};
-
-RadioController.prototype.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;
+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
///////////////////////
-BindUpdater = function(view, exp) {
+function BindUpdater(view, exp) {
this.view = view;
this.exp = Binder.parseBindings(exp);
this.hasError = false;
@@ -473,152 +471,170 @@ BindUpdater.toText = function(obj) {
}
};
-BindUpdater.prototype.updateModel = function(scope) {};
-BindUpdater.prototype.updateView = function(scope) {
- var html = [];
- var parts = this.exp;
- var length = parts.length;
- for(var i=0; iloading....
';
-Status.prototype.beginRequest = function () {
- if (this.requestCount === 0) {
- this.loader.show();
- }
- this.requestCount++;
-};
-
-Status.prototype.endRequest = function () {
- this.requestCount--;
- if (this.requestCount === 0) {
- this.loader.hide("fold");
+Status.prototype = {
+ beginRequest: function () {
+ if (this.requestCount === 0) {
+ this.loader.show();
+ }
+ this.requestCount++;
+ },
+
+ endRequest: function () {
+ this.requestCount--;
+ if (this.requestCount === 0) {
+ this.loader.hide("fold");
+ }
}
};
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index b13bbf34..50c78f81 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -1,5 +1,26 @@
-// Copyright (C) 2008,2009 BRAT Tech LLC
-
+/**
+ * The MIT License
+ *
+ * Copyright (c) 2010 Adam Abrons and Misko Hevery http://getangular.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
(function(previousOnLoad){
var filename = /(.*)\/angular-(.*).js(#(.*))?/;
var scripts = document.getElementsByTagName("script");
diff --git a/src/angular.prefix b/src/angular.prefix
index dbd4959a..26a8429f 100644
--- a/src/angular.prefix
+++ b/src/angular.prefix
@@ -1 +1,24 @@
+/**
+ * The MIT License
+ *
+ * Copyright (c) 2010 Adam Abrons and Misko Hevery http://getangular.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
(function(window, document){
--
cgit v1.2.3
From 13dee60685216a1da9e3bce4d5130693f6f5c624 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 12 Jan 2010 08:40:10 -0800
Subject: dissable URL watching
---
src/Loader.js | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
(limited to 'src')
diff --git a/src/Loader.js b/src/Loader.js
index 5207defb..07731062 100644
--- a/src/Loader.js
+++ b/src/Loader.js
@@ -163,8 +163,6 @@ function Loader(document, head, config) {
Loader.prototype = {
load: function() {
this.configureLogging();
- this.loadCss('/stylesheets/jquery-ui/smoothness/jquery-ui-1.7.1.css');
- this.loadCss('/stylesheets/css');
log("Server: " + this.config.server);
this.configureJQueryPlugins();
this.computeConfiguration();
@@ -266,9 +264,9 @@ Loader.prototype = {
log('$binder.updateView()');
binder.updateView();
- watcher.listener = bind(binder, binder.onUrlChange, watcher);
- watcher.onUpdate = function(){alert("update");};
- watcher.watch();
+ //watcher.listener = bind(binder, binder.onUrlChange, watcher);
+ //watcher.onUpdate = function(){alert("update");};
+ //watcher.watch();
document.find("body").show();
log('ready()');
},
@@ -382,11 +380,14 @@ UrlWatcher.prototype = {
angular['compile'] = function(root, config) {
config = config || {};
var defaults = {
- server: ""
+ 'server': "",
+ 'addUrlChangeListener': noop
};
- //todo: don't load stylesheet by default
//todo: don't start watcher
var loader = new Loader(root, jQuery("head"), _(defaults).extend(config));
+ //todo: don't load stylesheet by default
+ // loader.loadCss('/stylesheets/jquery-ui/smoothness/jquery-ui-1.7.1.css');
+ // loader.loadCss('/stylesheets/css');
loader.load();
var scope = jQuery(root).scope();
//TODO: cleanup
--
cgit v1.2.3
From 19bbee030ba012b8fc4835c1d17e039804b2b94b Mon Sep 17 00:00:00 2001
From: Adam Abrons
Date: Tue, 12 Jan 2010 09:34:27 -0800
Subject: send database to mini login
---
src/ControlBar.js | 5 +++--
src/Loader.js | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/ControlBar.js b/src/ControlBar.js
index 3e1f0b57..bed7742f 100644
--- a/src/ControlBar.js
+++ b/src/ControlBar.js
@@ -1,8 +1,9 @@
// Copyright (C) 2008,2009 BRAT Tech LLC
-nglr.ControlBar = function (document, serverUrl) {
+nglr.ControlBar = function (document, serverUrl, database) {
this.document = document;
this.serverUrl = serverUrl;
+ this.database = database;
this.window = window;
this.callbacks = [];
};
@@ -21,7 +22,7 @@ nglr.ControlBar.HTML =
nglr.ControlBar.prototype.login = function (loginSubmitFn) {
this.callbacks.push(loginSubmitFn);
if (this.callbacks.length == 1) {
- this.doTemplate("/user_session/new.mini?return_url=" + encodeURIComponent(this.urlWithoutAnchor()));
+ this.doTemplate("/user_session/new.mini?database="+encodeURIComponent(this.database)+"&return_url=" + encodeURIComponent(this.urlWithoutAnchor()));
}
};
diff --git a/src/Loader.js b/src/Loader.js
index fdcfa3cc..e4dec316 100644
--- a/src/Loader.js
+++ b/src/Loader.js
@@ -213,7 +213,7 @@ nglr.Loader.prototype.bindHtml = function() {
var widgetFactory = new nglr.WidgetFactory(this.config.server, this.config.database);
var binder = new nglr.Binder(document[0], widgetFactory, watcher, this.config);
widgetFactory.onChangeListener = nglr.shiftBind(binder, binder.updateModel);
- var controlBar = new nglr.ControlBar(document.find('body'), this.config.server);
+ var controlBar = new nglr.ControlBar(document.find('body'), this.config.server, this.config.database);
var onUpdate = function(){binder.updateView();};
var server = this.config.database=="$MEMORY" ?
new nglr.FrameServer(this.window) :
--
cgit v1.2.3
From cae222ec7af7e1ab09bc2c0181efddc2d3d1aca2 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 12 Jan 2010 10:25:55 -0800
Subject: fix the special case for console functions
---
src/Loader.js | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/Loader.js b/src/Loader.js
index 07731062..5cef348a 100644
--- a/src/Loader.js
+++ b/src/Loader.js
@@ -25,8 +25,6 @@ var consoleNode,
extend = _.extend,
jQuery = window['jQuery'],
msie = jQuery['browser']['msie'],
- log = function(){window['console']['log'].apply(this, arguments);},
- error = function(){window['console']['error'].apply(this, arguments);},
angular = window['angular'] || (window['angular'] = {}),
angularValidator = angular['validator'] || (angular['validator'] = {}),
angularFilter = angular['filter'] || (angular['filter'] = {}),
@@ -34,7 +32,36 @@ var consoleNode,
angularAlert = angular['alert'] || (angular['alert'] = function(){
log(arguments); window.alert.apply(window, arguments);
});
-
+
+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");
--
cgit v1.2.3
From e2a48aa2322801bd67cecd9ec516c07977500a52 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 12 Jan 2010 10:38:00 -0800
Subject: dissable set url
---
src/Loader.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'src')
diff --git a/src/Loader.js b/src/Loader.js
index 5cef348a..2ce44f48 100644
--- a/src/Loader.js
+++ b/src/Loader.js
@@ -391,12 +391,12 @@ UrlWatcher.prototype = {
},
setUrl: function(url) {
- var existingURL = window.location.href;
- if (!existingURL.match(/#/))
- existingURL += '#';
- if (existingURL != url)
- window.location.href = url;
- this.existingURL = url;
+// var existingURL = window.location.href;
+// if (!existingURL.match(/#/))
+// existingURL += '#';
+// if (existingURL != url)
+// window.location.href = url;
+// this.existingURL = url;
},
getUrl: function() {
--
cgit v1.2.3
From 27709c3f69384a7630aa336a1e73e730ea5f9790 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 12 Jan 2010 14:19:19 -0800
Subject: break out init phase into scope
---
src/Loader.js | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
(limited to 'src')
diff --git a/src/Loader.js b/src/Loader.js
index 2ce44f48..f3c765cd 100644
--- a/src/Loader.js
+++ b/src/Loader.js
@@ -284,10 +284,7 @@ Loader.prototype = {
log('$binder.parseAnchor()');
binder.parseAnchor();
-
- log('$binder.executeInit()');
- binder.executeInit();
-
+
log('$binder.updateView()');
binder.updateView();
@@ -419,8 +416,9 @@ angular['compile'] = function(root, config) {
var scope = jQuery(root).scope();
//TODO: cleanup
return {
- 'updateView':function(){return scope.updateView.apply(scope, arguments);},
+ 'updateView':function(){return scope.updateView();},
'set':function(){return scope.set.apply(scope, arguments);},
- 'get':function(){return scope.get.apply(scope, arguments);}
+ 'get':function(){return scope.get.apply(scope, arguments);},
+ 'init':function(){scope.get('$binder.executeInit')(); scope.updateView();}
};
};
\ No newline at end of file
--
cgit v1.2.3
From 595b4ea097bcb512173b6d4a12924ea1a3d70ecd Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 18 Jan 2010 10:47:03 -0800
Subject: checkpoint for integration with angular
---
src/Angular.js | 414 +++++++++++++++++++++++++++++++++++++++++++++
src/Loader.js | 424 -----------------------------------------------
src/angular-bootstrap.js | 115 -------------
3 files changed, 414 insertions(+), 539 deletions(-)
create mode 100644 src/Angular.js
delete mode 100644 src/Loader.js
delete mode 100644 src/angular-bootstrap.js
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
new file mode 100644
index 00000000..69cab0a2
--- /dev/null
+++ b/src/Angular.js
@@ -0,0 +1,414 @@
+if (typeof document.getAttribute == 'undefined')
+ document.getAttribute = function() {};
+if (typeof Node == 'undefined') {
+ Node = {
+ ELEMENT_NODE : 1,
+ ATTRIBUTE_NODE : 2,
+ TEXT_NODE : 3,
+ CDATA_SECTION_NODE : 4,
+ ENTITY_REFERENCE_NODE : 5,
+ ENTITY_NODE : 6,
+ PROCESSING_INSTRUCTION_NODE : 7,
+ COMMENT_NODE : 8,
+ DOCUMENT_NODE : 9,
+ DOCUMENT_TYPE_NODE : 10,
+ DOCUMENT_FRAGMENT_NODE : 11,
+ NOTATION_NODE : 12
+ };
+}
+
+function noop() {}
+if (!window['console']) window['console']={'log':noop, 'error':noop};
+
+var consoleNode,
+ foreach = _.each,
+ extend = _.extend,
+ jQuery = window['jQuery'],
+ msie = jQuery['browser']['msie'],
+ angular = window['angular'] || (window['angular'] = {}),
+ angularValidator = angular['validator'] || (angular['validator'] = {}),
+ angularFilter = angular['filter'] || (angular['filter'] = {}),
+ angularCallbacks = angular['callbacks'] || (angular['callbacks'] = {}),
+ angularAlert = angular['alert'] || (angular['alert'] = function(){
+ log(arguments); window.alert.apply(window, arguments);
+ });
+
+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 isNode(inp) {
+ return inp &&
+ inp.tagName &&
+ inp.nodeName &&
+ inp.ownerDocument &&
+ inp.removeAttribute;
+}
+
+function isLeafNode (node) {
+ switch (node.nodeName) {
+ case "OPTION":
+ case "PRE":
+ case "TITLE":
+ return true;
+ default:
+ return false;
+ }
+}
+
+function setHtml(node, html) {
+ if (isLeafNode(node)) {
+ if (msie) {
+ node.innerText = html;
+ } else {
+ node.textContent = html;
+ }
+ } else {
+ node.innerHTML = html;
+ }
+}
+
+function escapeHtml(html) {
+ if (!html || !html.replace)
+ return html;
+ return html.
+ replace(/&/g, '&').
+ replace(//g, '>');
+}
+
+function escapeAttr(html) {
+ if (!html || !html.replace)
+ return html;
+ return html.replace(//g, '>').replace(/\"/g,
+ '"');
+}
+
+function bind(_this, _function) {
+ if (!_this)
+ throw "Missing this";
+ if (!_.isFunction(_function))
+ throw "Missing function";
+ return function() {
+ return _function.apply(_this, arguments);
+ };
+}
+
+function shiftBind(_this, _function) {
+ return function() {
+ var args = [ this ];
+ for ( var i = 0; i < arguments.length; i++) {
+ args.push(arguments[i]);
+ }
+ return _function.apply(_this, args);
+ };
+}
+
+function outerHTML(node) {
+ var temp = document.createElement('div');
+ temp.appendChild(node);
+ var outerHTML = temp.innerHTML;
+ temp.removeChild(node);
+ return outerHTML;
+}
+
+function trim(str) {
+ return str.replace(/^ */, '').replace(/ *$/, '');
+}
+
+function toBoolean(value) {
+ var v = ("" + value).toLowerCase();
+ if (v == 'f' || v == '0' || v == 'false' || v == 'no')
+ value = false;
+ return !!value;
+}
+
+function merge(src, dst) {
+ for ( var key in src) {
+ var value = dst[key];
+ var type = typeof value;
+ if (type == 'undefined') {
+ dst[key] = fromJson(toJson(src[key]));
+ } else if (type == 'object' && value.constructor != array &&
+ key.substring(0, 1) != "$") {
+ merge(src[key], value);
+ }
+ }
+}
+
+// ////////////////////////////
+// Angular
+// ////////////////////////////
+
+function Angular(document, head, config) {
+ this.document = jQuery(document);
+ this.head = jQuery(head);
+ this.config = config;
+ this.location = window.location;
+}
+
+Angular.prototype = {
+ load: function() {
+ this.configureLogging();
+ log("Server: " + this.config.server);
+ this.configureJQueryPlugins();
+ this.computeConfiguration();
+ this.bindHtml();
+ },
+
+ configureJQueryPlugins: function() {
+ log('Angular.configureJQueryPlugins()');
+ jQuery['fn']['scope'] = function() {
+ var element = this;
+ while (element && element.get(0)) {
+ var scope = element.data("scope");
+ if (scope)
+ return scope;
+ element = element.parent();
+ }
+ return null;
+ };
+ jQuery['fn']['controller'] = function() {
+ return this.data('controller') || NullController.instance;
+ };
+ },
+
+ uid: function() {
+ return "" + new Date().getTime();
+ },
+
+ computeConfiguration: function() {
+ var config = this.config;
+ if (!config.database) {
+ var match = config.server.match(/https?:\/\/([\w]*)/);
+ config.database = match ? match[1] : "$MEMORY";
+ }
+ },
+
+ bindHtml: function() {
+ log('Angular.bindHtml()');
+ var watcher = new UrlWatcher(this.location);
+ var document = this.document;
+ var widgetFactory = new WidgetFactory(this.config.server, this.config.database);
+ var binder = new Binder(document[0], widgetFactory, watcher, this.config);
+ widgetFactory.onChangeListener = shiftBind(binder, binder.updateModel);
+ var controlBar = new ControlBar(document.find('body'), this.config.server);
+ var onUpdate = function(){binder.updateView();};
+ var server = this.config.database=="$MEMORY" ?
+ new FrameServer(this.window) :
+ new Server(this.config.server, jQuery.getScript);
+ server = new VisualServer(server, new Status(jQuery(document.body)), onUpdate);
+ var users = new Users(server, controlBar);
+ var databasePath = '/data/' + this.config.database;
+ var post = function(request, callback){
+ server.request("POST", databasePath, request, callback);
+ };
+ var datastore = new DataStore(post, users, binder.anchor);
+ binder.updateListeners.push(function(){datastore.flush();});
+ var scope = new Scope( {
+ '$anchor' : binder.anchor,
+ '$binder' : binder,
+ '$config' : this.config,
+ '$console' : window.console,
+ '$datastore' : datastore,
+ '$save' : function(callback) {
+ datastore.saveScope(scope.state, callback, binder.anchor);
+ },
+ '$window' : window,
+ '$uid' : this.uid,
+ '$users' : users
+ }, "ROOT");
+
+ document.data('scope', scope);
+ log('$binder.entity()');
+ binder.entity(scope);
+
+ log('$binder.compile()');
+ binder.compile();
+
+ log('ControlBar.bind()');
+ controlBar.bind();
+
+ log('$users.fetchCurrentUser()');
+ function fetchCurrentUser() {
+ users.fetchCurrentUser(function(u) {
+ if (!u && document.find("[ng-auth=eager]").length) {
+ users.login();
+ }
+ });
+ }
+ fetchCurrentUser();
+
+ log('PopUp.bind()');
+ new PopUp(document).bind();
+
+ log('$binder.parseAnchor()');
+ binder.parseAnchor();
+
+ log('$binder.updateView()');
+ binder.updateView();
+
+ //watcher.listener = bind(binder, binder.onUrlChange, watcher);
+ //watcher.onUpdate = function(){alert("update");};
+ //watcher.watch();
+ document.find("body").show();
+ log('ready()');
+ },
+
+ visualPost: function(delegate) {
+ var status = new Status(jQuery(document.body));
+ return function(request, delegateCallback) {
+ status.beginRequest(request);
+ var callback = function() {
+ status.endRequest();
+ try {
+ delegateCallback.apply(this, arguments);
+ } catch (e) {
+ alert(toJson(e));
+ }
+ };
+ delegate(request, callback);
+ };
+ },
+
+ configureLogging: function() {
+ var url = window.location.href + '#';
+ url = url.split('#')[1];
+ var config = {
+ debug : null
+ };
+ var configs = url.split('&');
+ for ( var i = 0; i < configs.length; i++) {
+ var part = (configs[i] + '=').split('=');
+ config[part[0]] = part[1];
+ }
+ if (config.debug == 'console') {
+ consoleNode = document.createElement("div");
+ consoleNode.id = 'ng-console';
+ document.getElementsByTagName('body')[0].appendChild(consoleNode);
+ log = function() {
+ consoleLog('ng-console-info', arguments);
+ };
+ console.error = function() {
+ consoleLog('ng-console-error', arguments);
+ };
+ }
+ }
+};
+
+function UrlWatcher(location) {
+ this.location = location;
+ this.delay = 25;
+ this.setTimeout = function(fn, delay) {
+ window.setTimeout(fn, delay);
+ };
+ this.listener = function(url) {
+ return url;
+ };
+ this.expectedUrl = location.href;
+}
+
+UrlWatcher.prototype = {
+ watch: function() {
+ var self = this;
+ var pull = function() {
+ if (self.expectedUrl !== self.location.href) {
+ var notify = self.location.hash.match(/^#\$iframe_notify=(.*)$/);
+ if (notify) {
+ if (!self.expectedUrl.match(/#/)) {
+ self.expectedUrl += "#";
+ }
+ self.location.href = self.expectedUrl;
+ var id = '_iframe_notify_' + notify[1];
+ var notifyFn = angularCallbacks[id];
+ delete angularCallbacks[id];
+ try {
+ (notifyFn||noop)();
+ } catch (e) {
+ alert(e);
+ }
+ } else {
+ self.listener(self.location.href);
+ self.expectedUrl = self.location.href;
+ }
+ }
+ self.setTimeout(pull, self.delay);
+ };
+ pull();
+ },
+
+ setUrl: function(url) {
+// var existingURL = window.location.href;
+// if (!existingURL.match(/#/))
+// existingURL += '#';
+// if (existingURL != url)
+// window.location.href = url;
+// this.existingURL = url;
+ },
+
+ getUrl: function() {
+ return window.location.href;
+ }
+};
+
+angular['compile'] = function(root, config) {
+ config = config || {};
+ var defaults = {
+ 'server': "",
+ 'addUrlChangeListener': noop
+ };
+ //todo: don't start watcher
+ var angular = new Angular(root, jQuery("head"), _(defaults).extend(config));
+ //todo: don't load stylesheet by default
+ // loader.loadCss('/stylesheets/jquery-ui/smoothness/jquery-ui-1.7.1.css');
+ // loader.loadCss('/stylesheets/css');
+ angular.load();
+ var scope = jQuery(root).scope();
+ //TODO: cleanup
+ return {
+ 'updateView':function(){return scope.updateView();},
+ 'set':function(){return scope.set.apply(scope, arguments);},
+ 'get':function(){return scope.get.apply(scope, arguments);},
+ 'init':function(){scope.get('$binder.executeInit')(); scope.updateView();}
+ };
+};
\ No newline at end of file
diff --git a/src/Loader.js b/src/Loader.js
deleted file mode 100644
index f3c765cd..00000000
--- a/src/Loader.js
+++ /dev/null
@@ -1,424 +0,0 @@
-if (typeof document.getAttribute == 'undefined')
- document.getAttribute = function() {};
-if (typeof Node == 'undefined') {
- Node = {
- ELEMENT_NODE : 1,
- ATTRIBUTE_NODE : 2,
- TEXT_NODE : 3,
- CDATA_SECTION_NODE : 4,
- ENTITY_REFERENCE_NODE : 5,
- ENTITY_NODE : 6,
- PROCESSING_INSTRUCTION_NODE : 7,
- COMMENT_NODE : 8,
- DOCUMENT_NODE : 9,
- DOCUMENT_TYPE_NODE : 10,
- DOCUMENT_FRAGMENT_NODE : 11,
- NOTATION_NODE : 12
- };
-}
-
-function noop() {}
-if (!window['console']) window['console']={'log':noop, 'error':noop};
-
-var consoleNode,
- foreach = _.each,
- extend = _.extend,
- jQuery = window['jQuery'],
- msie = jQuery['browser']['msie'],
- angular = window['angular'] || (window['angular'] = {}),
- angularValidator = angular['validator'] || (angular['validator'] = {}),
- angularFilter = angular['filter'] || (angular['filter'] = {}),
- angularCallbacks = angular['callbacks'] || (angular['callbacks'] = {}),
- angularAlert = angular['alert'] || (angular['alert'] = function(){
- log(arguments); window.alert.apply(window, arguments);
- });
-
-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 isNode(inp) {
- return inp &&
- inp.tagName &&
- inp.nodeName &&
- inp.ownerDocument &&
- inp.removeAttribute;
-}
-
-function isLeafNode (node) {
- switch (node.nodeName) {
- case "OPTION":
- case "PRE":
- case "TITLE":
- return true;
- default:
- return false;
- }
-}
-
-function setHtml(node, html) {
- if (isLeafNode(node)) {
- if (msie) {
- node.innerText = html;
- } else {
- node.textContent = html;
- }
- } else {
- node.innerHTML = html;
- }
-}
-
-function escapeHtml(html) {
- if (!html || !html.replace)
- return html;
- return html.
- replace(/&/g, '&').
- replace(//g, '>');
-}
-
-function escapeAttr(html) {
- if (!html || !html.replace)
- return html;
- return html.replace(//g, '>').replace(/\"/g,
- '"');
-}
-
-function bind(_this, _function) {
- if (!_this)
- throw "Missing this";
- if (!_.isFunction(_function))
- throw "Missing function";
- return function() {
- return _function.apply(_this, arguments);
- };
-}
-
-function shiftBind(_this, _function) {
- return function() {
- var args = [ this ];
- for ( var i = 0; i < arguments.length; i++) {
- args.push(arguments[i]);
- }
- return _function.apply(_this, args);
- };
-}
-
-function outerHTML(node) {
- var temp = document.createElement('div');
- temp.appendChild(node);
- var outerHTML = temp.innerHTML;
- temp.removeChild(node);
- return outerHTML;
-}
-
-function trim(str) {
- return str.replace(/^ */, '').replace(/ *$/, '');
-}
-
-function toBoolean(value) {
- var v = ("" + value).toLowerCase();
- if (v == 'f' || v == '0' || v == 'false' || v == 'no')
- value = false;
- return !!value;
-}
-
-function merge(src, dst) {
- for ( var key in src) {
- var value = dst[key];
- var type = typeof value;
- if (type == 'undefined') {
- dst[key] = fromJson(toJson(src[key]));
- } else if (type == 'object' && value.constructor != array &&
- key.substring(0, 1) != "$") {
- merge(src[key], value);
- }
- }
-}
-
-// ////////////////////////////
-// Loader
-// ////////////////////////////
-
-function Loader(document, head, config) {
- this.document = jQuery(document);
- this.head = jQuery(head);
- this.config = config;
- this.location = window.location;
-}
-
-Loader.prototype = {
- load: function() {
- this.configureLogging();
- log("Server: " + this.config.server);
- this.configureJQueryPlugins();
- this.computeConfiguration();
- this.bindHtml();
- },
-
- configureJQueryPlugins: function() {
- log('Loader.configureJQueryPlugins()');
- jQuery['fn']['scope'] = function() {
- var element = this;
- while (element && element.get(0)) {
- var scope = element.data("scope");
- if (scope)
- return scope;
- element = element.parent();
- }
- return null;
- };
- jQuery['fn']['controller'] = function() {
- return this.data('controller') || NullController.instance;
- };
- },
-
- uid: function() {
- return "" + new Date().getTime();
- },
-
- computeConfiguration: function() {
- var config = this.config;
- if (!config.database) {
- var match = config.server.match(/https?:\/\/([\w]*)/);
- config.database = match ? match[1] : "$MEMORY";
- }
- },
-
- bindHtml: function() {
- log('Loader.bindHtml()');
- var watcher = new UrlWatcher(this.location);
- var document = this.document;
- var widgetFactory = new WidgetFactory(this.config.server, this.config.database);
- var binder = new Binder(document[0], widgetFactory, watcher, this.config);
- widgetFactory.onChangeListener = shiftBind(binder, binder.updateModel);
- var controlBar = new ControlBar(document.find('body'), this.config.server);
- var onUpdate = function(){binder.updateView();};
- var server = this.config.database=="$MEMORY" ?
- new FrameServer(this.window) :
- new Server(this.config.server, jQuery.getScript);
- server = new VisualServer(server, new Status(jQuery(document.body)), onUpdate);
- var users = new Users(server, controlBar);
- var databasePath = '/data/' + this.config.database;
- var post = function(request, callback){
- server.request("POST", databasePath, request, callback);
- };
- var datastore = new DataStore(post, users, binder.anchor);
- binder.updateListeners.push(function(){datastore.flush();});
- var scope = new Scope( {
- '$anchor' : binder.anchor,
- '$binder' : binder,
- '$config' : this.config,
- '$console' : window.console,
- '$datastore' : datastore,
- '$save' : function(callback) {
- datastore.saveScope(scope.state, callback, binder.anchor);
- },
- '$window' : window,
- '$uid' : this.uid,
- '$users' : users
- }, "ROOT");
-
- document.data('scope', scope);
- log('$binder.entity()');
- binder.entity(scope);
-
- log('$binder.compile()');
- binder.compile();
-
- log('ControlBar.bind()');
- controlBar.bind();
-
- log('$users.fetchCurrentUser()');
- function fetchCurrentUser() {
- users.fetchCurrentUser(function(u) {
- if (!u && document.find("[ng-auth=eager]").length) {
- users.login();
- }
- });
- }
- fetchCurrentUser();
-
- log('PopUp.bind()');
- new PopUp(document).bind();
-
- log('$binder.parseAnchor()');
- binder.parseAnchor();
-
- log('$binder.updateView()');
- binder.updateView();
-
- //watcher.listener = bind(binder, binder.onUrlChange, watcher);
- //watcher.onUpdate = function(){alert("update");};
- //watcher.watch();
- document.find("body").show();
- log('ready()');
- },
-
- visualPost: function(delegate) {
- var status = new Status(jQuery(document.body));
- return function(request, delegateCallback) {
- status.beginRequest(request);
- var callback = function() {
- status.endRequest();
- try {
- delegateCallback.apply(this, arguments);
- } catch (e) {
- alert(toJson(e));
- }
- };
- delegate(request, callback);
- };
- },
-
- configureLogging: function() {
- var url = window.location.href + '#';
- url = url.split('#')[1];
- var config = {
- debug : null
- };
- var configs = url.split('&');
- for ( var i = 0; i < configs.length; i++) {
- var part = (configs[i] + '=').split('=');
- config[part[0]] = part[1];
- }
- if (config.debug == 'console') {
- consoleNode = document.createElement("div");
- consoleNode.id = 'ng-console';
- document.getElementsByTagName('body')[0].appendChild(consoleNode);
- log = function() {
- consoleLog('ng-console-info', arguments);
- };
- console.error = function() {
- consoleLog('ng-console-error', arguments);
- };
- }
- },
-
- loadCss: function(css) {
- var cssTag = document.createElement('link');
- cssTag.rel = "stylesheet";
- cssTag.type = "text/css";
- if (!css.match(/^http:/))
- css = this.config.server + css;
- cssTag.href = css;
- this.head[0].appendChild(cssTag);
- }
-};
-
-function UrlWatcher(location) {
- this.location = location;
- this.delay = 25;
- this.setTimeout = function(fn, delay) {
- window.setTimeout(fn, delay);
- };
- this.listener = function(url) {
- return url;
- };
- this.expectedUrl = location.href;
-}
-
-UrlWatcher.prototype = {
- watch: function() {
- var self = this;
- var pull = function() {
- if (self.expectedUrl !== self.location.href) {
- var notify = self.location.hash.match(/^#\$iframe_notify=(.*)$/);
- if (notify) {
- if (!self.expectedUrl.match(/#/)) {
- self.expectedUrl += "#";
- }
- self.location.href = self.expectedUrl;
- var id = '_iframe_notify_' + notify[1];
- var notifyFn = angularCallbacks[id];
- delete angularCallbacks[id];
- try {
- (notifyFn||noop)();
- } catch (e) {
- alert(e);
- }
- } else {
- self.listener(self.location.href);
- self.expectedUrl = self.location.href;
- }
- }
- self.setTimeout(pull, self.delay);
- };
- pull();
- },
-
- setUrl: function(url) {
-// var existingURL = window.location.href;
-// if (!existingURL.match(/#/))
-// existingURL += '#';
-// if (existingURL != url)
-// window.location.href = url;
-// this.existingURL = url;
- },
-
- getUrl: function() {
- return window.location.href;
- }
-};
-
-angular['compile'] = function(root, config) {
- config = config || {};
- var defaults = {
- 'server': "",
- 'addUrlChangeListener': noop
- };
- //todo: don't start watcher
- var loader = new Loader(root, jQuery("head"), _(defaults).extend(config));
- //todo: don't load stylesheet by default
- // loader.loadCss('/stylesheets/jquery-ui/smoothness/jquery-ui-1.7.1.css');
- // loader.loadCss('/stylesheets/css');
- loader.load();
- var scope = jQuery(root).scope();
- //TODO: cleanup
- return {
- 'updateView':function(){return scope.updateView();},
- 'set':function(){return scope.set.apply(scope, arguments);},
- 'get':function(){return scope.get.apply(scope, arguments);},
- 'init':function(){scope.get('$binder.executeInit')(); scope.updateView();}
- };
-};
\ No newline at end of file
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
deleted file mode 100644
index 50c78f81..00000000
--- a/src/angular-bootstrap.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * The MIT License
- *
- * Copyright (c) 2010 Adam Abrons and Misko Hevery http://getangular.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-(function(previousOnLoad){
- var filename = /(.*)\/angular-(.*).js(#(.*))?/;
- var scripts = document.getElementsByTagName("script");
- var scriptConfig = {
- autoSubmit:true,
- autoBind:true,
- autoLoadDependencies:false
- };
- for(var j = 0; j < scripts.length; j++) {
- var src = scripts[j].src;
- if (src && src.match(filename)) {
- var parts = src.match(filename);
- if (parts[2] == 'bootstrap') {
- scriptConfig.autoLoadDependencies = true;
- }
- scriptConfig.server = parts[1] || '';
- if (!scriptConfig.server) {
- scriptConfig.server = window.location.toString().split(window.location.pathname)[0];
- }
- if (parts[4]) {
- var directive = parts[4].split('&');
- for ( var i = 0; i < directive.length; i++) {
- var keyValue = directive[i].split('=');
- var key = keyValue[0];
- var value = keyValue.length == 1 ? true : keyValue[1];
- if (value == 'false') value = false;
- if (value == 'true') value = true;
- scriptConfig[key] = value;
- }
- }
- }
- }
-
- var addScript = function(path, server){
- server = server || scriptConfig.server;
- document.write('');
- };
-
- if (scriptConfig.autoLoadDependencies) {
- addScript("/../lib/webtoolkit/webtoolkit.base64.js");
- addScript("/../lib/swfobject/swfobject.js");
- addScript("/../lib/jquery/jquery-1.3.2.js");
- addScript("/../lib/jquery/jquery-ui-1.7.1.custom.min.js");
- addScript("/../lib/underscore/underscore.js");
- addScript("/Loader.js");
- addScript("/API.js");
- addScript("/Binder.js");
- addScript("/ControlBar.js");
- addScript("/DataStore.js");
- addScript("/Filters.js");
- addScript("/JSON.js");
- addScript("/Model.js");
- addScript("/Parser.js");
- addScript("/Scope.js");
- addScript("/Server.js");
- addScript("/Users.js");
- addScript("/Validators.js");
- addScript("/Widgets.js");
- } else {
- addScript("/ajax/libs/swfobject/2.2/swfobject.js", "http://ajax.googleapis.com");
- addScript("/ajax/libs/jquery/1.3.2/jquery.min.js", "http://ajax.googleapis.com");
- addScript("/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js", "http://ajax.googleapis.com");
- }
-
- window.onload = function() {
- var doc = window.document;
- if (scriptConfig.bindRootId) {
- doc = null;
- var ids = scriptConfig.bindRootId.split('|');
- for ( var i = 0; i < ids.length && !doc; i++) {
- var idCond = ids[i].split('?');
- var id = idCond[0];
- if (idCond.length > 1) {
- if (!window.document.getElementById(idCond[1])) {
- continue;
- }
- }
- doc = window.document.getElementById(id);
- }
- }
- if (scriptConfig.autoBind && doc) {
- window.angularScope = angular.compile(doc, scriptConfig);
- }
- if (typeof previousOnLoad === 'function') {
- try {
- previousOnLoad.apply(this, arguments);
- } catch (e) {}
- }
- };
-})(window.onload);
-
-
--
cgit v1.2.3
From 0e566fe6cb41de388df6793b350fb81aaa4a8476 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 18 Jan 2010 17:56:08 -0800
Subject: tweeter demo client
---
src/Angular.js | 30 ++++++++++++++++--------------
src/Binder.js | 1 -
src/Filters.js | 17 +++++++++++++++++
3 files changed, 33 insertions(+), 15 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 69cab0a2..3dc72ff7 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -227,7 +227,7 @@ Angular.prototype = {
bindHtml: function() {
log('Angular.bindHtml()');
- var watcher = new UrlWatcher(this.location);
+ var watcher = this.watcher = new UrlWatcher(this.location);
var document = this.document;
var widgetFactory = new WidgetFactory(this.config.server, this.config.database);
var binder = new Binder(document[0], widgetFactory, watcher, this.config);
@@ -285,12 +285,6 @@ Angular.prototype = {
log('$binder.parseAnchor()');
binder.parseAnchor();
- log('$binder.updateView()');
- binder.updateView();
-
- //watcher.listener = bind(binder, binder.onUrlChange, watcher);
- //watcher.onUpdate = function(){alert("update");};
- //watcher.watch();
document.find("body").show();
log('ready()');
},
@@ -378,12 +372,13 @@ UrlWatcher.prototype = {
},
setUrl: function(url) {
-// var existingURL = window.location.href;
-// if (!existingURL.match(/#/))
-// existingURL += '#';
-// if (existingURL != url)
-// window.location.href = url;
-// this.existingURL = url;
+ //TODO: conditionaly?
+ var existingURL = window.location.href;
+ if (!existingURL.match(/#/))
+ existingURL += '#';
+ if (existingURL != url)
+ window.location.href = url;
+ this.existingURL = url;
},
getUrl: function() {
@@ -409,6 +404,13 @@ angular['compile'] = function(root, config) {
'updateView':function(){return scope.updateView();},
'set':function(){return scope.set.apply(scope, arguments);},
'get':function(){return scope.get.apply(scope, arguments);},
- 'init':function(){scope.get('$binder.executeInit')(); scope.updateView();}
+ 'init':function(){scope.get('$binder.executeInit')(); scope.updateView();},
+ 'watchUrl':function(){
+ var binder = scope.get('$binder');
+ var watcher = angular.watcher;
+ watcher.listener = bind(binder, binder.onUrlChange, watcher);
+ watcher.onUpdate = function(){alert("update");};
+ watcher.watch();
+ }
};
};
\ No newline at end of file
diff --git a/src/Binder.js b/src/Binder.js
index 36cb6ec3..b29a07c6 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -66,7 +66,6 @@ Binder.prototype = {
},
onUrlChange: function (url) {
- log("URL change detected", url);
this.parseAnchor(url);
this.updateView();
},
diff --git a/src/Filters.js b/src/Filters.js
index 666c9f30..833d5630 100644
--- a/src/Filters.js
+++ b/src/Filters.js
@@ -293,6 +293,23 @@ foreach({
'html': function(html){
return new angularFilter.Meta({html:html});
+ },
+
+ 'linky': function(text){
+ function regExpEscape(text) {
+ return text.replace(/([\/\.\*\+\?\|\(\)\[\]\{\}\\])/g, '\\$1');
+ }
+ var URL = /(ftp|http|https):\/\/([^\(\)|\s]+)/gm;
+ var html = text;
+ var dups = {};
+ foreach(text.match(URL)||[], function(url){
+ url = url.replace(/\.$/, '');
+ if (!dups[url]) {
+ html = html.replace(new RegExp(regExpEscape(url), 'gm'), ''+url+'');
+ dups[url] = true;
+ }
+ });
+ return new angularFilter.Meta({text:text, html:html});
}
}, function(v,k){angularFilter[k] = v;});
--
cgit v1.2.3
From db2031c5a1df205e6db40ca6aba80930375069c0 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 19 Jan 2010 17:53:20 -0800
Subject: added debug info; fix parser bug with double negation
---
src/Parser.js | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
(limited to 'src')
diff --git a/src/Parser.js b/src/Parser.js
index 333b8413..840f5541 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -294,15 +294,13 @@ Parser.prototype = {
}
},
- _unary: function(fn, parse) {
- var right = parse.apply(this);
+ _unary: function(fn, right) {
return function(self) {
return fn(self, right(self));
};
},
- _binary: function(left, fn, parse) {
- var right = parse.apply(this);
+ _binary: function(left, fn, right) {
return function(self) {
return fn(self, left(self), right(self));
};
@@ -343,7 +341,7 @@ Parser.prototype = {
var token;
while(true) {
if ((token = this.expect('|'))) {
- left = this._binary(left, token.fn, this.filter);
+ left = this._binary(left, token.fn, this.filter());
} else {
return left;
}
@@ -405,7 +403,7 @@ Parser.prototype = {
this.text.substring(token.index) + "' is not assignable.";
}
var ident = function(){return left.isAssignable;};
- return this._binary(ident, token.fn, this.logicalOR);
+ return this._binary(ident, token.fn, this.logicalOR());
} else {
return left;
}
@@ -416,7 +414,7 @@ Parser.prototype = {
var token;
while(true) {
if ((token = this.expect('||'))) {
- left = this._binary(left, token.fn, this.logicalAND);
+ left = this._binary(left, token.fn, this.logicalAND());
} else {
return left;
}
@@ -428,7 +426,7 @@ Parser.prototype = {
var token;
while(true) {
if ((token = this.expect('&&'))) {
- left = this._binary(left, token.fn, this.negated);
+ left = this._binary(left, token.fn, this.negated());
} else {
return left;
}
@@ -438,9 +436,9 @@ Parser.prototype = {
negated: function(){
var token;
if (token = this.expect('!')) {
- return this._unary(token.fn, this.equality);
+ return this._unary(token.fn, this.assignment());
} else {
- return this.equality();
+ return this.equality();
}
},
@@ -449,7 +447,7 @@ Parser.prototype = {
var token;
while(true) {
if ((token = this.expect('==','!='))) {
- left = this._binary(left, token.fn, this.relational);
+ left = this._binary(left, token.fn, this.relational());
} else {
return left;
}
@@ -461,7 +459,7 @@ Parser.prototype = {
var token;
while(true) {
if ((token = this.expect('<', '>', '<=', '>='))) {
- left = this._binary(left, token.fn, this.additive);
+ left = this._binary(left, token.fn, this.additive());
} else {
return left;
}
@@ -472,7 +470,7 @@ Parser.prototype = {
var left = this.multiplicative();
var token;
while(token = this.expect('+','-')) {
- left = this._binary(left, token.fn, this.multiplicative);
+ left = this._binary(left, token.fn, this.multiplicative());
}
return left;
},
@@ -481,7 +479,7 @@ Parser.prototype = {
var left = this.unary();
var token;
while(token = this.expect('*','/','%')) {
- left = this._binary(left, token.fn, this.unary);
+ left = this._binary(left, token.fn, this.unary());
}
return left;
},
@@ -491,7 +489,7 @@ Parser.prototype = {
if (this.expect('+')) {
return this.primary();
} else if (token = this.expect('-')) {
- return this._binary(Parser.ZERO, token.fn, this.multiplicative);
+ return this._binary(Parser.ZERO, token.fn, this.multiplicative());
} else {
return this.primary();
}
--
cgit v1.2.3
From dc0db57b36bb6cd47dfea835a315f61b34ed8e1b Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 20 Jan 2010 06:52:50 -0800
Subject: tweek tweeter
---
src/Filters.js | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
(limited to 'src')
diff --git a/src/Filters.js b/src/Filters.js
index 833d5630..a0bedaaf 100644
--- a/src/Filters.js
+++ b/src/Filters.js
@@ -296,20 +296,25 @@ foreach({
},
'linky': function(text){
+ if (!text) return text;
function regExpEscape(text) {
return text.replace(/([\/\.\*\+\?\|\(\)\[\]\{\}\\])/g, '\\$1');
}
- var URL = /(ftp|http|https):\/\/([^\(\)|\s]+)/gm;
- var html = text;
- var dups = {};
- foreach(text.match(URL)||[], function(url){
- url = url.replace(/\.$/, '');
- if (!dups[url]) {
- html = html.replace(new RegExp(regExpEscape(url), 'gm'), ''+url+'');
- dups[url] = true;
- }
- });
- return new angularFilter.Meta({text:text, html:html});
+ 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('');
+ html.push(url);
+ html.push('');
+ raw = raw.substring(i + url.length);
+ }
+ html.push(escapeHtml(raw));
+ return new angularFilter.Meta({text:text, html:html.join('')});
}
}, function(v,k){angularFilter[k] = v;});
--
cgit v1.2.3
From e41ee88ef85986dcd0fea23fefcc57d89cee5c0b Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 22 Jan 2010 11:21:22 -0800
Subject: fix bug when multiple binders on same page
---
src/Binder.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/Binder.js b/src/Binder.js
index b29a07c6..b687fb77 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -137,7 +137,6 @@ Binder.prototype = {
compile: function() {
var jNode = jQuery(this.doc);
- var self = this;
if (this.config.autoSubmit) {
var submits = this.docFindWithSelf(":submit").not("[ng-action]");
submits.attr("ng-action", "$save()");
@@ -146,15 +145,16 @@ Binder.prototype = {
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 {
- jNode.scope().eval(jNode.attr('ng-action'));
+ 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));
}
- self.updateView();
+ scope.eval('$binder.updateView()');
return false;
});
},
--
cgit v1.2.3
From 4460328bc1173f5d97fb4ff54edc041968486fce Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sat, 23 Jan 2010 15:54:58 -0800
Subject: lots of cleanup to get it ready for OS
---
src/Angular.js | 328 ++++++++++++++++++++++++---------------------------------
src/Binder.js | 19 ++--
src/JSON.js | 18 +++-
src/Users.js | 4 +-
src/Widgets.js | 11 +-
5 files changed, 163 insertions(+), 217 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 3dc72ff7..51fca458 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -134,16 +134,6 @@ function bind(_this, _function) {
};
}
-function shiftBind(_this, _function) {
- return function() {
- var args = [ this ];
- for ( var i = 0; i < arguments.length; i++) {
- args.push(arguments[i]);
- }
- return _function.apply(_this, args);
- };
-}
-
function outerHTML(node) {
var temp = document.createElement('div');
temp.appendChild(node);
@@ -177,159 +167,9 @@ function merge(src, dst) {
}
// ////////////////////////////
-// Angular
+// UrlWatcher
// ////////////////////////////
-function Angular(document, head, config) {
- this.document = jQuery(document);
- this.head = jQuery(head);
- this.config = config;
- this.location = window.location;
-}
-
-Angular.prototype = {
- load: function() {
- this.configureLogging();
- log("Server: " + this.config.server);
- this.configureJQueryPlugins();
- this.computeConfiguration();
- this.bindHtml();
- },
-
- configureJQueryPlugins: function() {
- log('Angular.configureJQueryPlugins()');
- jQuery['fn']['scope'] = function() {
- var element = this;
- while (element && element.get(0)) {
- var scope = element.data("scope");
- if (scope)
- return scope;
- element = element.parent();
- }
- return null;
- };
- jQuery['fn']['controller'] = function() {
- return this.data('controller') || NullController.instance;
- };
- },
-
- uid: function() {
- return "" + new Date().getTime();
- },
-
- computeConfiguration: function() {
- var config = this.config;
- if (!config.database) {
- var match = config.server.match(/https?:\/\/([\w]*)/);
- config.database = match ? match[1] : "$MEMORY";
- }
- },
-
- bindHtml: function() {
- log('Angular.bindHtml()');
- var watcher = this.watcher = new UrlWatcher(this.location);
- var document = this.document;
- var widgetFactory = new WidgetFactory(this.config.server, this.config.database);
- var binder = new Binder(document[0], widgetFactory, watcher, this.config);
- widgetFactory.onChangeListener = shiftBind(binder, binder.updateModel);
- var controlBar = new ControlBar(document.find('body'), this.config.server);
- var onUpdate = function(){binder.updateView();};
- var server = this.config.database=="$MEMORY" ?
- new FrameServer(this.window) :
- new Server(this.config.server, jQuery.getScript);
- server = new VisualServer(server, new Status(jQuery(document.body)), onUpdate);
- var users = new Users(server, controlBar);
- var databasePath = '/data/' + this.config.database;
- var post = function(request, callback){
- server.request("POST", databasePath, request, callback);
- };
- var datastore = new DataStore(post, users, binder.anchor);
- binder.updateListeners.push(function(){datastore.flush();});
- var scope = new Scope( {
- '$anchor' : binder.anchor,
- '$binder' : binder,
- '$config' : this.config,
- '$console' : window.console,
- '$datastore' : datastore,
- '$save' : function(callback) {
- datastore.saveScope(scope.state, callback, binder.anchor);
- },
- '$window' : window,
- '$uid' : this.uid,
- '$users' : users
- }, "ROOT");
-
- document.data('scope', scope);
- log('$binder.entity()');
- binder.entity(scope);
-
- log('$binder.compile()');
- binder.compile();
-
- log('ControlBar.bind()');
- controlBar.bind();
-
- log('$users.fetchCurrentUser()');
- function fetchCurrentUser() {
- users.fetchCurrentUser(function(u) {
- if (!u && document.find("[ng-auth=eager]").length) {
- users.login();
- }
- });
- }
- fetchCurrentUser();
-
- log('PopUp.bind()');
- new PopUp(document).bind();
-
- log('$binder.parseAnchor()');
- binder.parseAnchor();
-
- document.find("body").show();
- log('ready()');
- },
-
- visualPost: function(delegate) {
- var status = new Status(jQuery(document.body));
- return function(request, delegateCallback) {
- status.beginRequest(request);
- var callback = function() {
- status.endRequest();
- try {
- delegateCallback.apply(this, arguments);
- } catch (e) {
- alert(toJson(e));
- }
- };
- delegate(request, callback);
- };
- },
-
- configureLogging: function() {
- var url = window.location.href + '#';
- url = url.split('#')[1];
- var config = {
- debug : null
- };
- var configs = url.split('&');
- for ( var i = 0; i < configs.length; i++) {
- var part = (configs[i] + '=').split('=');
- config[part[0]] = part[1];
- }
- if (config.debug == 'console') {
- consoleNode = document.createElement("div");
- consoleNode.id = 'ng-console';
- document.getElementsByTagName('body')[0].appendChild(consoleNode);
- log = function() {
- consoleLog('ng-console-info', arguments);
- };
- console.error = function() {
- consoleLog('ng-console-error', arguments);
- };
- }
- }
-};
-
function UrlWatcher(location) {
this.location = location;
this.delay = 25;
@@ -343,6 +183,9 @@ function UrlWatcher(location) {
}
UrlWatcher.prototype = {
+ listen: function(fn){
+ this.listener = fn;
+ },
watch: function() {
var self = this;
var pull = function() {
@@ -369,48 +212,149 @@ UrlWatcher.prototype = {
self.setTimeout(pull, self.delay);
};
pull();
+ return this;
},
- setUrl: function(url) {
- //TODO: conditionaly?
- var existingURL = window.location.href;
+ set: function(url) {
+ var existingURL = this.location.href;
if (!existingURL.match(/#/))
existingURL += '#';
if (existingURL != url)
- window.location.href = url;
+ this.location.href = url;
this.existingURL = url;
},
- getUrl: function() {
+ get: function() {
return window.location.href;
}
};
-
-angular['compile'] = function(root, config) {
- config = config || {};
- var defaults = {
- 'server': "",
- 'addUrlChangeListener': noop
- };
- //todo: don't start watcher
- var angular = new Angular(root, jQuery("head"), _(defaults).extend(config));
- //todo: don't load stylesheet by default
- // loader.loadCss('/stylesheets/jquery-ui/smoothness/jquery-ui-1.7.1.css');
- // loader.loadCss('/stylesheets/css');
- angular.load();
- var scope = jQuery(root).scope();
- //TODO: cleanup
- return {
- 'updateView':function(){return scope.updateView();},
- 'set':function(){return scope.set.apply(scope, arguments);},
- 'get':function(){return scope.get.apply(scope, arguments);},
- 'init':function(){scope.get('$binder.executeInit')(); scope.updateView();},
- 'watchUrl':function(){
- var binder = scope.get('$binder');
- var watcher = angular.watcher;
- watcher.listener = bind(binder, binder.onUrlChange, watcher);
- watcher.onUpdate = function(){alert("update");};
- watcher.watch();
+
+/////////////////////////////////////////////////
+function configureJQueryPlugins() {
+ log('Angular.configureJQueryPlugins()');
+ var fn = jQuery['fn'];
+ fn['scope'] = function() {
+ var element = this;
+ while (element && element.get(0)) {
+ var scope = element.data("scope");
+ if (scope)
+ return scope;
+ element = element.parent();
}
+ return null;
+ };
+ fn['controller'] = function() {
+ return this.data('controller') || NullController.instance;
};
+}
+
+function configureLogging(config) {
+ if (config.debug == 'console' && !consoleNode) {
+ consoleNode = document.createElement("div");
+ consoleNode.id = 'ng-console';
+ document.getElementsByTagName('body')[0].appendChild(consoleNode);
+ log = function() {
+ consoleLog('ng-console-info', arguments);
+ };
+ console.error = function() {
+ consoleLog('ng-console-error', arguments);
+ };
+ }
+}
+
+function exposeMethods(obj, methods){
+ var bound = {};
+ foreach(methods, function(fn, name){
+ bound[name] = _(fn).bind(obj);
+ });
+ return bound;
+}
+
+function wireAngular(element, config) {
+ var widgetFactory = new WidgetFactory(config['server'], config['database']);
+ var binder = new Binder(element[0], widgetFactory, config['location'], config);
+ var controlBar = new ControlBar(element.find('body'), config.server);
+ var onUpdate = function(){binder.updateView();};
+ var server = config.database=="$MEMORY" ?
+ new FrameServer(this.window) :
+ new Server(config.server, jQuery.getScript);
+ server = new VisualServer(server, new Status(jQuery(element.body)), onUpdate);
+ var users = new Users(server, controlBar);
+ var databasePath = '/data/' + config.database;
+ var post = function(request, callback){
+ server.request("POST", databasePath, request, callback);
+ };
+ var datastore = new DataStore(post, users, binder.anchor);
+ binder.updateListeners.push(function(){datastore.flush();});
+ var scope = new Scope({
+ '$anchor' : binder.anchor,
+ '$updateView': _(binder.updateView).bind(binder),
+ '$config' : config,
+ '$console' : window.console,
+ '$datastore' : exposeMethods(datastore, {
+ 'load': datastore.load,
+ 'loadMany': datastore.loadMany,
+ 'loadOrCreate': datastore.loadOrCreate,
+ 'loadAll': datastore.loadAll,
+ 'save': datastore.save,
+ 'remove': datastore.remove,
+ 'flush': datastore.flush,
+ 'query': datastore.query,
+ 'entity': datastore.entity,
+ 'entities': datastore.entities,
+ 'documentCountsByUser': datastore.documentCountsByUser,
+ 'userDocumentIdsByEntity': datastore.userDocumentIdsByEntity,
+ 'join': datastore.join
+ }),
+ '$save' : function(callback) {
+ datastore.saveScope(scope.state, callback, binder.anchor);
+ },
+ '$window' : window,
+ '$uid' : function() {
+ return "" + new Date().getTime();
+ },
+ '$users' : users
+ }, "ROOT");
+
+ element.data('scope', scope);
+ binder.entity(scope);
+ binder.compile();
+ controlBar.bind();
+
+ //TODO: remove this code
+ new PopUp(element).bind();
+
+ var self = _(exposeMethods(scope, {
+ 'updateView': scope.updateView,
+ 'set': scope.set,
+ 'get': scope.get,
+ 'eval': scope.eval
+ })).extend({
+ 'init':function(){
+ config['location']['listen'](_(binder.onUrlChange).bind(binder));
+ binder.parseAnchor();
+ binder.executeInit();
+ scope.updateView();
+ return self;
+ },
+ 'element':element[0],
+ 'config':config
+ });
+ return self;
+}
+
+angular['startUrlWatcher'] = function(){
+ return new UrlWatcher(window['location']).watch();
+};
+
+angular['compile'] = function(element, config) {
+ config = _({
+ 'server': "",
+ 'location': {'get':noop, 'set':noop, 'listen':noop}
+ }).extend(config||{});
+
+ configureLogging(config);
+ configureJQueryPlugins();
+
+ return wireAngular(jQuery(element), config);
};
\ No newline at end of file
diff --git a/src/Binder.js b/src/Binder.js
index b687fb77..3fc45a20 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -1,6 +1,6 @@
-function Binder(doc, widgetFactory, urlWatcher, config) {
+function Binder(doc, widgetFactory, location, config) {
this.doc = doc;
- this.urlWatcher = urlWatcher;
+ this.location = location;
this.anchor = {};
this.widgetFactory = widgetFactory;
this.config = config || {};
@@ -48,9 +48,8 @@ Binder.prototype = {
return params;
},
- parseAnchor: function(url) {
- var self = this;
- url = url || this.urlWatcher.getUrl();
+ parseAnchor: function() {
+ var self = this, url = this.location.get() || "";
var anchorIndex = url.indexOf('#');
if (anchorIndex < 0) return;
@@ -65,13 +64,13 @@ Binder.prototype = {
});
},
- onUrlChange: function (url) {
- this.parseAnchor(url);
+ onUrlChange: function() {
+ this.parseAnchor();
this.updateView();
},
updateAnchor: function() {
- var url = this.urlWatcher.getUrl();
+ var url = this.location.get();
var anchorIndex = url.indexOf('#');
if (anchorIndex > -1)
url = url.substring(0, anchorIndex);
@@ -88,7 +87,7 @@ Binder.prototype = {
sep = '&';
}
}
- this.urlWatcher.setUrl(url);
+ this.location.set(url);
return url;
},
@@ -154,7 +153,7 @@ Binder.prototype = {
jNode.addClass("ng-exception");
jNode.attr('ng-error', toJson(e, true));
}
- scope.eval('$binder.updateView()');
+ scope.get('$updateView')();
return false;
});
},
diff --git a/src/JSON.js b/src/JSON.js
index 0c842865..98dfddd2 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -2,7 +2,7 @@ array = [].constructor;
function toJson(obj, pretty){
var buf = [];
- toJsonArray(buf, obj, pretty ? "\n " : null);
+ toJsonArray(buf, obj, pretty ? "\n " : null, _([]));
return buf.join('');
};
@@ -25,7 +25,14 @@ function fromJson(json) {
angular['toJson'] = toJson;
angular['fromJson'] = fromJson;
-function toJsonArray(buf, obj, pretty){
+function toJsonArray(buf, obj, pretty, stack){
+ if (typeof obj == "object") {
+ if (stack.include(obj)) {
+ buf.push("RECURSION");
+ return;
+ }
+ stack.push(obj);
+ }
var type = typeof obj;
if (obj === null) {
buf.push("null");
@@ -52,7 +59,7 @@ function toJsonArray(buf, obj, pretty){
if (typeof item == 'function' || typeof item == 'undefined') {
buf.push("null");
} else {
- toJsonArray(buf, item, pretty);
+ toJsonArray(buf, item, pretty, stack);
}
sep = true;
}
@@ -82,7 +89,7 @@ function toJsonArray(buf, obj, pretty){
}
buf.push(angular['String']['quote'](key));
buf.push(":");
- toJsonArray(buf, value, childPretty);
+ toJsonArray(buf, value, childPretty, stack);
comma = true;
}
} catch (e) {
@@ -91,4 +98,7 @@ function toJsonArray(buf, obj, pretty){
buf.push("}");
}
}
+ if (typeof obj == "object") {
+ stack.pop();
+ }
};
diff --git a/src/Users.js b/src/Users.js
index 47da4f73..79ed3129 100644
--- a/src/Users.js
+++ b/src/Users.js
@@ -7,7 +7,7 @@ Users.prototype = {
'fetchCurrentUser':function(callback) {
var self = this;
this.server.request("GET", "/account.json", {}, function(code, response){
- self.current = response.user;
+ self['current'] = response['user'];
callback(response.user);
});
},
@@ -15,7 +15,7 @@ Users.prototype = {
'logout': function(callback) {
var self = this;
this.controlBar.logout(function(){
- delete self.current;
+ delete self['current'];
(callback||noop)();
});
},
diff --git a/src/Widgets.js b/src/Widgets.js
index f93f2476..a012adf3 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -9,7 +9,6 @@ function WidgetFactory(serverUrl, database) {
alert("ERROR: swfobject not loaded!");
};
}
- this.onChangeListener = function(){};
};
WidgetFactory.prototype = {
@@ -43,12 +42,12 @@ WidgetFactory.prototype = {
throw 'Unknown type: ' + type;
}
input.data('controller', controller);
- var binder = scope.get('$binder');
+ 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)) {
- binder.updateView(scope);
+ updateView(scope);
}
}
return bubbleEvent;
@@ -74,12 +73,6 @@ WidgetFactory.prototype = {
var cntl = new FileController(view, fileInput[0].name, swfNode, this.serverUrl + "/data/" + this.database);
jQuery(swfNode).data('controller', cntl);
return cntl;
- },
-
- createTextWidget: function(textInput) {
- var controller = new TextController(textInput);
- controller.onChange(this.onChangeListener);
- return controller;
}
};
/////////////////////
--
cgit v1.2.3
From c7719c24121b500f0bc2ac7c652d8ec0de418a37 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sun, 24 Jan 2010 12:10:26 -0800
Subject: fix initialization
---
src/Angular.js | 3 +--
src/Binder.js | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 51fca458..d3eef9d9 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -231,7 +231,6 @@ UrlWatcher.prototype = {
/////////////////////////////////////////////////
function configureJQueryPlugins() {
- log('Angular.configureJQueryPlugins()');
var fn = jQuery['fn'];
fn['scope'] = function() {
var element = this;
@@ -334,7 +333,7 @@ function wireAngular(element, config) {
config['location']['listen'](_(binder.onUrlChange).bind(binder));
binder.parseAnchor();
binder.executeInit();
- scope.updateView();
+ binder.updateView();
return self;
},
'element':element[0],
diff --git a/src/Binder.js b/src/Binder.js
index 3fc45a20..48a4f611 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -70,7 +70,7 @@ Binder.prototype = {
},
updateAnchor: function() {
- var url = this.location.get();
+ var url = this.location.get() || "";
var anchorIndex = url.indexOf('#');
if (anchorIndex > -1)
url = url.substring(0, anchorIndex);
--
cgit v1.2.3
From efad9ec5be8da442af5fb3dffc08510f7a71e10f Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sun, 24 Jan 2010 17:10:58 -0800
Subject: changes to make it closure compiler compatible
---
src/Angular.js | 20 ++++++-----
src/Binder.js | 15 ++++----
src/ControlBar.js | 2 +-
src/DataStore.js | 104 ++++++++++++++++++++++++++----------------------------
src/Model.js | 12 +++----
src/Parser.js | 3 +-
src/Scope.js | 12 ++++---
src/Server.js | 4 +--
8 files changed, 87 insertions(+), 85 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index d3eef9d9..cadef4d0 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -20,11 +20,9 @@ if (typeof Node == 'undefined') {
function noop() {}
if (!window['console']) window['console']={'log':noop, 'error':noop};
-var consoleNode,
+var consoleNode, jQuery, msie,
foreach = _.each,
extend = _.extend,
- jQuery = window['jQuery'],
- msie = jQuery['browser']['msie'],
angular = window['angular'] || (window['angular'] = {}),
angularValidator = angular['validator'] || (angular['validator'] = {}),
angularFilter = angular['filter'] || (angular['filter'] = {}),
@@ -212,7 +210,6 @@ UrlWatcher.prototype = {
self.setTimeout(pull, self.delay);
};
pull();
- return this;
},
set: function(url) {
@@ -271,19 +268,20 @@ function exposeMethods(obj, methods){
function wireAngular(element, config) {
var widgetFactory = new WidgetFactory(config['server'], config['database']);
- var binder = new Binder(element[0], widgetFactory, config['location'], config);
+ var binder = new Binder(element[0], widgetFactory, datastore, config['location'], config);
var controlBar = new ControlBar(element.find('body'), config.server);
var onUpdate = function(){binder.updateView();};
- var server = config.database=="$MEMORY" ?
+ var server = config['database'] =="$MEMORY" ?
new FrameServer(this.window) :
- new Server(config.server, jQuery.getScript);
+ new Server(config['server'], jQuery['getScript']);
server = new VisualServer(server, new Status(jQuery(element.body)), onUpdate);
var users = new Users(server, controlBar);
- var databasePath = '/data/' + config.database;
+ var databasePath = '/data/' + config['database'];
var post = function(request, callback){
server.request("POST", databasePath, request, callback);
};
var datastore = new DataStore(post, users, binder.anchor);
+ binder.datastore = datastore;
binder.updateListeners.push(function(){datastore.flush();});
var scope = new Scope({
'$anchor' : binder.anchor,
@@ -343,10 +341,14 @@ function wireAngular(element, config) {
}
angular['startUrlWatcher'] = function(){
- return new UrlWatcher(window['location']).watch();
+ var watcher = new UrlWatcher(window['location']);
+ watcher.watch();
+ return exposeMethods(watcher, {'listen':watcher.listen, 'set':watcher.set, 'get':watcher.get});
};
angular['compile'] = function(element, config) {
+ jQuery = window['jQuery'];
+ msie = jQuery['browser']['msie'];
config = _({
'server': "",
'location': {'get':noop, 'set':noop, 'listen':noop}
diff --git a/src/Binder.js b/src/Binder.js
index 48a4f611..e516ec32 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -1,6 +1,7 @@
-function Binder(doc, widgetFactory, location, config) {
+function Binder(doc, widgetFactory, datastore, location, config) {
this.doc = doc;
this.location = location;
+ this.datastore = datastore;
this.anchor = {};
this.widgetFactory = widgetFactory;
this.config = config || {};
@@ -49,7 +50,7 @@ Binder.prototype = {
},
parseAnchor: function() {
- var self = this, url = this.location.get() || "";
+ var self = this, url = this.location['get']() || "";
var anchorIndex = url.indexOf('#');
if (anchorIndex < 0) return;
@@ -70,7 +71,7 @@ Binder.prototype = {
},
updateAnchor: function() {
- var url = this.location.get() || "";
+ var url = this.location['get']() || "";
var anchorIndex = url.indexOf('#');
if (anchorIndex > -1)
url = url.substring(0, anchorIndex);
@@ -87,7 +88,7 @@ Binder.prototype = {
sep = '&';
}
}
- this.location.set(url);
+ this.location['set'](url);
return url;
},
@@ -123,12 +124,14 @@ Binder.prototype = {
},
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"));
+ var decl = scope.entity(jNode.attr("ng-entity"), self.datastore);
return decl + (jNode.attr('ng-watch') || "");
} catch (e) {
+ log(e);
alert(e);
}
});
@@ -136,7 +139,7 @@ Binder.prototype = {
compile: function() {
var jNode = jQuery(this.doc);
- if (this.config.autoSubmit) {
+ 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}}"}');
diff --git a/src/ControlBar.js b/src/ControlBar.js
index 53c87199..a50b8854 100644
--- a/src/ControlBar.js
+++ b/src/ControlBar.js
@@ -55,7 +55,7 @@ ControlBar.prototype = {
resizable: false, modal:true,
title: 'Authentication: <angular/>'
});
- callbacks["_iframe_notify_" + id] = function() {
+ angularCallbacks["_iframe_notify_" + id] = function() {
loginView.dialog("destroy");
loginView.remove();
foreach(self.callbacks, function(callback){
diff --git a/src/DataStore.js b/src/DataStore.js
index 7952096f..789b8f71 100644
--- a/src/DataStore.js
+++ b/src/DataStore.js
@@ -1,7 +1,8 @@
function DataStore(post, users, anchor) {
this.post = post;
this.users = users;
- this._cache = {$collections:[]};
+ this._cache_collections = [];
+ this._cache = {'$collections':this._cache_collections};
this.anchor = anchor;
this.bulkRequest = [];
};
@@ -15,10 +16,10 @@ DataStore.NullEntity = extend(function(){}, {
DataStore.prototype = {
cache: function(document) {
- if (! document instanceof Model) {
+ if (! document.datastore === this) {
throw "Parameter must be an instance of Entity! " + toJson(document);
}
- var key = document.$entity + '/' + document.$id;
+ var key = document['$entity'] + '/' + document['$id'];
var cachedDocument = this._cache[key];
if (cachedDocument) {
Model.copyDirectFields(document, cachedDocument);
@@ -32,10 +33,10 @@ DataStore.prototype = {
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);
+ 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);
@@ -61,8 +62,8 @@ DataStore.prototype = {
loadOrCreate: function(instance, id, callback) {
var self=this;
return this.load(instance, id, callback, function(response){
- if (response.$status_code == 404) {
- instance.$id = id;
+ if (response['$status_code'] == 404) {
+ instance['$id'] = id;
(callback||noop)(instance);
} else {
throw response;
@@ -73,15 +74,15 @@ DataStore.prototype = {
loadAll: function(entity, callback) {
var self = this;
var list = [];
- list.$$accept = function(doc){
- return doc.$entity == entity.title;
+ list['$$accept'] = function(doc){
+ return doc['$entity'] == entity['title'];
};
- this._cache.$collections.push(list);
- this._jsonRequest(["GET", entity.title], function(response) {
+ 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]);
+ document['$loadFrom'](rows[i]);
list.push(self.cache(document));
}
(callback||noop)(list);
@@ -92,17 +93,17 @@ DataStore.prototype = {
save: function(document, callback) {
var self = this;
var data = {};
- document.$saveTo(data);
+ document['$saveTo'](data);
this._jsonRequest(["POST", "", data], function(response) {
- document.$loadFrom(response);
+ document['$loadFrom'](response);
var cachedDoc = self.cache(document);
- _.each(self._cache.$collections, function(collection){
- if (collection.$$accept(document)) {
- angular['Array']['includeIf'](collection, cachedDoc, true);
+ _.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 (document['$$anchor']) {
+ self.anchor[document['$$anchor']] = document['$id'];
}
if (callback)
callback(document);
@@ -112,13 +113,13 @@ DataStore.prototype = {
remove: function(document, callback) {
var self = this;
var data = {};
- document.$saveTo(data);
+ document['$saveTo'](data);
this._jsonRequest(["DELETE", "", data], function(response) {
- delete self._cache[document.$entity + '/' + document.$id];
- _.each(self._cache.$collections, function(collection){
+ 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) {
+ if (item['$id'] == document['$id']) {
collection.splice(i, 1);
}
}
@@ -128,8 +129,8 @@ DataStore.prototype = {
},
_jsonRequest: function(request, callback, failure) {
- request.$$callback = callback;
- request.$$failure = failure||function(response){
+ request['$$callback'] = callback;
+ request['$$failure'] = failure||function(response){
throw response;
};
this.bulkRequest.push(request);
@@ -143,25 +144,25 @@ DataStore.prototype = {
log('REQUEST:', bulkRequest);
function callback(code, bulkResponse){
log('RESPONSE[' + code + ']: ', bulkResponse);
- if(bulkResponse.$status_code == 401) {
- self.users.login(function(){
+ if(bulkResponse['$status_code'] == 401) {
+ self.users['login'](function(){
self.post(bulkRequest, callback);
});
- } else if(bulkResponse.$status_code) {
+ } 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;
+ var responseCode = response['$status_code'];
if(responseCode) {
if(responseCode == 403) {
- self.users.notAuthorized();
+ self.users['notAuthorized']();
} else {
- request.$$failure(response);
+ request['$$failure'](response);
}
} else {
- request.$$callback(response);
+ request['$$callback'](response);
}
}
}
@@ -178,9 +179,9 @@ DataStore.prototype = {
}
for(var key in scope) {
var item = scope[key];
- if (item && item.$save == Model.prototype.$save) {
+ if (item && item['$save'] == Model.prototype['$save']) {
saveCounter++;
- item.$save(onSaveDone);
+ item['$save'](onSaveDone);
}
}
onSaveDone();
@@ -189,19 +190,18 @@ DataStore.prototype = {
query: function(type, query, arg, callback){
var self = this;
var queryList = [];
- queryList.$$accept = function(doc){
+ queryList['$$accept'] = function(doc){
return false;
};
- this._cache.$collections.push(queryList);
- var request = type.title + '/' + query + '=' + arg;
+ this._cache_collections.push(queryList);
+ var request = type['title'] + '/' + query + '=' + arg;
this._jsonRequest(["GET", request], function(response){
var list = response;
- for(var i = 0; i < list.length; i++) {
- var document = new type().$loadFrom(list[i]);
+ foreach(list, function(item){
+ var document = type()['$loadFrom'](item);
queryList.push(self.cache(document));
- }
- if (callback)
- callback(queryList);
+ });
+ (callback||noop)(queryList);
});
return queryList;
},
@@ -210,11 +210,11 @@ DataStore.prototype = {
var entities = [];
var self = this;
this._jsonRequest(["GET", "$entities"], function(response) {
- for (var entityName in response) {
+ foreach(response, function(value, entityName){
entities.push(self.entity(entityName));
- }
+ });
entities.sort(function(a,b){return a.title > b.title ? 1 : -1;});
- if (callback) callback(entities);
+ (callback||noop)(entities);
});
return entities;
},
@@ -223,9 +223,7 @@ DataStore.prototype = {
var counts = {};
var self = this;
self.post([["GET", "$users"]], function(code, response){
- foreach(response[0], function(value, key){
- counts[key] = value;
- });
+ extend(counts, response[0]);
});
return counts;
},
@@ -234,9 +232,7 @@ DataStore.prototype = {
var ids = {};
var self = this;
self.post([["GET", "$users/" + user]], function(code, response){
- foreach(response[0], function(value, key){
- ids[key] = value;
- });
+ extend(ids, response[0]);
});
return ids;
},
@@ -252,7 +248,7 @@ DataStore.prototype = {
// entity.name does not work as name seems to be reserved for functions
'title': name,
'$$factory': true,
- 'datastore': this,
+ datastore: this, //private, obfuscate
'defaults': defaults || {},
'load': function(id, callback){
return self.load(entity(), id, callback);
diff --git a/src/Model.js b/src/Model.js
index 4a3a1806..b09efd0e 100644
--- a/src/Model.js
+++ b/src/Model.js
@@ -3,9 +3,9 @@
function Model(entity, initial) {
this['$$entity'] = entity;
- this.$loadFrom(initial||{});
- this.$entity = entity['title'];
- this.$migrate();
+ this['$loadFrom'](initial||{});
+ this['$entity'] = entity['title'];
+ this['$migrate']();
};
Model.copyDirectFields = function(src, dst) {
@@ -25,9 +25,9 @@ Model.copyDirectFields = function(src, dst) {
}
};
-Model.prototype = {
+extend(Model.prototype, {
'$migrate': function() {
- merge(this['$$entity'].defaults, this);
+ merge(this['$$entity']['defaults'], this);
return this;
},
@@ -62,4 +62,4 @@ Model.prototype = {
Model.copyDirectFields(this, other);
return this;
}
-};
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/Parser.js b/src/Parser.js
index 840f5541..d33ae3db 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -691,8 +691,7 @@ Parser.prototype = {
defaults = this.primary()(null);
}
return function(self) {
- var datastore = self.scope.get('$datastore');
- var Entity = datastore.entity(entity, defaults);
+ var Entity = self.datastore.entity(entity, defaults);
self.scope.set(entity, Entity);
if (instance) {
var document = Entity();
diff --git a/src/Scope.js b/src/Scope.js
index dcc50007..3b1f3930 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -6,9 +6,9 @@ function Scope(initialState, name) {
var State = function(){};
State.prototype = initialState;
this.state = new State();
- this.state.$parent = initialState;
+ this.state['$parent'] = initialState;
if (name == "ROOT") {
- this.state.$root = this.state;
+ this.state['$root'] = this.state;
}
};
@@ -37,7 +37,7 @@ Scope.getter = function(instance, path) {
}
}
}
- if (typeof instance === 'function' && !instance.$$factory) {
+ if (typeof instance === 'function' && !instance['$$factory']) {
return bind(lastInstance, instance);
}
return instance;
@@ -69,10 +69,12 @@ Scope.prototype = {
},
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 element = path.split('.');
var instance = this.state;
for ( var i = 0; element.length > 1; i++) {
@@ -145,9 +147,9 @@ Scope.prototype = {
return expression(self)(self, value);
},
- entity: function(entityDeclaration) {
+ entity: function(entityDeclaration, datastore) {
var expression = new Parser(entityDeclaration).entityDeclaration();
- return expression({scope:this});
+ return expression({scope:this, datastore:datastore});
},
markInvalid: function(widget) {
diff --git a/src/Server.js b/src/Server.js
index f351e84c..2932c09b 100644
--- a/src/Server.js
+++ b/src/Server.js
@@ -14,10 +14,10 @@ Server.prototype = {
request: function(method, url, request, callback) {
var requestId = this.uuid + (this.nextId++);
angularCallbacks[requestId] = function(response) {
- delete angular[requestId];
+ delete angularCallbacks[requestId];
callback(200, response);
};
- var payload = {u:url, m:method, p:request};
+ var payload = {'u':url, 'm':method, 'p':request};
payload = this.base64url(toJson(payload));
var totalPockets = Math.ceil(payload.length / this.maxSize);
var baseUrl = this.url + "/$/" + requestId + "/" + totalPockets + "/";
--
cgit v1.2.3
From a5c446441fee005975a82885771e8d931e7a4e7a Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sun, 24 Jan 2010 19:12:01 -0800
Subject: fix closure compiler incompatibilities
---
src/Angular.js | 4 ++--
src/ControlBar.js | 23 +++++++++++------------
src/Users.js | 6 +++---
src/Widgets.js | 48 +++++++++++++++++++++++++-----------------------
4 files changed, 41 insertions(+), 40 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index cadef4d0..bfbe8ee9 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -269,10 +269,10 @@ function exposeMethods(obj, methods){
function wireAngular(element, config) {
var widgetFactory = new WidgetFactory(config['server'], config['database']);
var binder = new Binder(element[0], widgetFactory, datastore, config['location'], config);
- var controlBar = new ControlBar(element.find('body'), config.server);
+ var controlBar = new ControlBar(element.find('body'), config['server']);
var onUpdate = function(){binder.updateView();};
var server = config['database'] =="$MEMORY" ?
- new FrameServer(this.window) :
+ new FrameServer(window) :
new Server(config['server'], jQuery['getScript']);
server = new VisualServer(server, new Status(jQuery(element.body)), onUpdate);
var users = new Users(server, controlBar);
diff --git a/src/ControlBar.js b/src/ControlBar.js
index a50b8854..6fe5b42d 100644
--- a/src/ControlBar.js
+++ b/src/ControlBar.js
@@ -1,7 +1,7 @@
function ControlBar(document, serverUrl) {
- this.document = document;
+ this._document = document;
this.serverUrl = serverUrl;
- this.window = window;
+ this._window = window;
this.callbacks = [];
};
@@ -39,25 +39,24 @@ ControlBar.prototype = {
},
urlWithoutAnchor: function (path) {
- return this.window.location.href.split("#")[0];
+ return this._window['location']['href'].split("#")[0];
},
doTemplate: function (path) {
var self = this;
var id = new Date().getTime();
- var url = this.urlWithoutAnchor();
- url += "#$iframe_notify=" + id;
+ var url = this.urlWithoutAnchor() + "#$iframe_notify=" + id;
var iframeHeight = 330;
var loginView = jQuery('');
- this.document.append(loginView);
- loginView.dialog({
- height:iframeHeight + 33, width:500,
- resizable: false, modal:true,
- title: 'Authentication: <angular/>'
+ this._document.append(loginView);
+ loginView['dialog']({
+ 'height':iframeHeight + 33, 'width':500,
+ 'resizable': false, 'modal':true,
+ 'title': 'Authentication: <angular/>'
});
angularCallbacks["_iframe_notify_" + id] = function() {
- loginView.dialog("destroy");
- loginView.remove();
+ loginView['dialog']("destroy");
+ loginView['remove']();
foreach(self.callbacks, function(callback){
callback();
});
diff --git a/src/Users.js b/src/Users.js
index 79ed3129..f81507f4 100644
--- a/src/Users.js
+++ b/src/Users.js
@@ -3,7 +3,7 @@ function Users(server, controlBar) {
this.controlBar = controlBar;
};
-Users.prototype = {
+extend(Users.prototype, {
'fetchCurrentUser':function(callback) {
var self = this;
this.server.request("GET", "/account.json", {}, function(code, response){
@@ -23,7 +23,7 @@ Users.prototype = {
'login': function(callback) {
var self = this;
this.controlBar.login(function(){
- self.fetchCurrentUser(function(){
+ self['fetchCurrentUser'](function(){
(callback||noop)();
});
});
@@ -32,4 +32,4 @@ Users.prototype = {
'notAuthorized': function(){
this.controlBar.notAuthorized();
}
-};
+});
diff --git a/src/Widgets.js b/src/Widgets.js
index a012adf3..cf8c5d99 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -2,8 +2,8 @@ function WidgetFactory(serverUrl, database) {
this.nextUploadId = 0;
this.serverUrl = serverUrl;
this.database = database;
- if (window.swfobject) {
- this.createSWF = swfobject.createSWF;
+ if (window['swfobject']) {
+ this.createSWF = window['swfobject']['createSWF'];
} else {
this.createSWF = function(){
alert("ERROR: swfobject not loaded!");
@@ -62,12 +62,12 @@ WidgetFactory.prototype = {
var view = FileController.template(uploadId);
fileInput.after(view);
var att = {
- data:this.serverUrl + "/admin/ServerAPI.swf",
- width:"95", height:"20", align:"top",
- wmode:"transparent"};
+ 'data':this.serverUrl + "/admin/ServerAPI.swf",
+ 'width':"95", 'height':"20", 'align':"top",
+ 'wmode':"transparent"};
var par = {
- flashvars:"uploadWidgetId=" + uploadId,
- allowScriptAccess:"always"};
+ '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);
@@ -88,10 +88,12 @@ function FileController(view, scopeName, uploader, databaseUrl) {
this.lastValue = undefined;
};
-FileController.dispatchEvent = function(id, event, args) {
+angularCallbacks['flashEvent'] = function(id, event, args) {
var object = document.getElementById(id);
- var controller = jQuery(object).data("controller");
- FileController.prototype['_on_' + event].apply(controller, args);
+ var jobject = jQuery(object);
+ var controller = jobject.data("controller");
+ FileController.prototype[event].apply(controller, args);
+ jobject.scope().get('$updateView')();
};
FileController.template = function(id) {
@@ -103,23 +105,23 @@ FileController.template = function(id) {
'');
};
-FileController.prototype = {
- '_on_cancel': noop,
- '_on_complete': noop,
- '_on_httpStatus': function(status) {
+extend(FileController.prototype, {
+ 'cancel': noop,
+ 'complete': noop,
+ 'httpStatus': function(status) {
alert("httpStatus:" + this.scopeName + " status:" + status);
},
- '_on_ioError': function() {
+ 'ioError': function() {
alert("ioError:" + this.scopeName);
},
- '_on_open': function() {
+ 'open': function() {
alert("open:" + this.scopeName);
},
- '_on_progress':noop,
- '_on_securityError': function() {
+ 'progress':noop,
+ 'securityError': function() {
alert("securityError:" + this.scopeName);
},
- '_on_uploadCompleteData': function(data) {
+ 'uploadCompleteData': function(data) {
var value = fromJson(data);
value.url = this.attachmentsPath + '/' + value.id + '/' + value.text;
this.view.find("input").attr('checked', true);
@@ -129,7 +131,7 @@ FileController.prototype = {
this.value = null;
scope.get('$binder').updateView();
},
- '_on_select': function(name, size, type) {
+ '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));
@@ -161,10 +163,10 @@ FileController.prototype = {
upload: function() {
if (this.name) {
- this.uploader.uploadFile(this.attachmentsPath);
+ this.uploader['uploadFile'](this.attachmentsPath);
}
}
-};
+});
///////////////////////
// NullController
@@ -532,7 +534,7 @@ BindAttrUpdater.prototype = {
}
var attrValue = attrValues.length ? attrValues.join('') : null;
if(isImage && attrName == 'src' && !attrValue)
- attrValue = scope.get('config.server') + '/images/blank.gif';
+ attrValue = scope.get('$config.blankImage');
jNode.attr(attrName, attrValue);
}
}
--
cgit v1.2.3
From 0f42fa2930f5827ac9f1eac2ce09ea3bf9533563 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sun, 24 Jan 2010 19:33:04 -0800
Subject: fix closure compiler issues
---
src/Scope.js | 2 +-
src/Server.js | 7 +++----
src/Widgets.js | 5 ++---
3 files changed, 6 insertions(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/Scope.js b/src/Scope.js
index 3b1f3930..9be6bc3f 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -153,7 +153,7 @@ Scope.prototype = {
},
markInvalid: function(widget) {
- this.state.$invalidWidgets.push(widget);
+ this.state['$invalidWidgets'].push(widget);
},
watch: function(declaration) {
diff --git a/src/Server.js b/src/Server.js
index 2932c09b..5c4ec3c6 100644
--- a/src/Server.js
+++ b/src/Server.js
@@ -13,14 +13,13 @@ Server.prototype = {
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);
};
- var payload = {'u':url, 'm':method, 'p':request};
- payload = this.base64url(toJson(payload));
- var totalPockets = Math.ceil(payload.length / this.maxSize);
- var baseUrl = this.url + "/$/" + requestId + "/" + totalPockets + "/";
for ( var pocketNo = 0; pocketNo < totalPockets; pocketNo++) {
var pocket = payload.substr(pocketNo * this.maxSize, this.maxSize);
this.getScript(baseUrl + (pocketNo+1) + "?h=" + pocket, noop);
diff --git a/src/Widgets.js b/src/Widgets.js
index cf8c5d99..d85c0ddc 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -93,7 +93,7 @@ angularCallbacks['flashEvent'] = function(id, event, args) {
var jobject = jQuery(object);
var controller = jobject.data("controller");
FileController.prototype[event].apply(controller, args);
- jobject.scope().get('$updateView')();
+ _.defer(jobject.scope().get('$updateView'));
};
FileController.template = function(id) {
@@ -102,7 +102,7 @@ FileController.template = function(id) {
'' +
'' +
'' +
- '');
+ '');
};
extend(FileController.prototype, {
@@ -129,7 +129,6 @@ extend(FileController.prototype, {
this.value = value;
this.updateModel(scope);
this.value = null;
- scope.get('$binder').updateView();
},
'select': function(name, size, type) {
this.name = name;
--
cgit v1.2.3
From 473e57e22532f9b85fc9dcc1bcc53e12a10154c2 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sun, 24 Jan 2010 20:44:17 -0800
Subject: bindRootId configuration option
---
src/Filters.js | 51 ++++++++++++++++++++++++++-------------------------
src/Parser.js | 2 +-
src/Scope.js | 1 +
3 files changed, 28 insertions(+), 26 deletions(-)
(limited to 'src')
diff --git a/src/Filters.js b/src/Filters.js
index a0bedaaf..77fa5ec7 100644
--- a/src/Filters.js
+++ b/src/Filters.js
@@ -184,25 +184,25 @@ foreach({
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'
+ '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('|');
+ 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){
+ foreach(data['series']||[], function(serie){
var values = [];
- foreach(serie.values||[], function(value){
+ foreach(serie['values']||[], function(value){
values.push(value);
});
seriesValues.push(values.join(','));
@@ -213,7 +213,7 @@ foreach({
'title': function(data){
var titles = [];
- var title = data.title || [];
+ var title = data['title'] || [];
foreach(_.isArray(title)?title:[title], function(text){
titles.push(encodeURIComponent(text));
});
@@ -223,7 +223,7 @@ foreach({
'collect': function(data, key){
var outterValues = [];
var count = 0;
- foreach(data.series||[], function(serie){
+ foreach(data['series']||[], function(serie){
var innerValues = [];
var value = serie[key] || [];
foreach(_.isArray(value)?value:[value], function(color){
@@ -240,7 +240,7 @@ foreach({
height = height || width;
var url = "http://chart.apis.google.com/chart?";
var urlParam = [];
- params.chs = width + "x" + height;
+ params['chs'] = width + "x" + height;
foreach(params, function(value, key){
if (value) {
urlParam.push(key + "=" + value);
@@ -256,37 +256,38 @@ foreach({
'qrcode': function(value, width, height) {
- return angularFilterGoogleChartApi['encode']({cht:'qr', chl:encodeURIComponent(value)}, width, height);
+ return angularFilterGoogleChartApi['encode']({
+ 'cht':'qr', 'chl':encodeURIComponent(value)}, width, height);
},
'chart': {
- pie:function(data, width, height) {
+ 'pie':function(data, width, height) {
return angularFilterGoogleChartApi('p', data, width, height);
},
- pie3d:function(data, width, height) {
+ 'pie3d':function(data, width, height) {
return angularFilterGoogleChartApi('p3', data, width, height);
},
- pieConcentric:function(data, width, height) {
+ 'pieConcentric':function(data, width, height) {
return angularFilterGoogleChartApi('pc', data, width, height);
},
- barHorizontalStacked:function(data, width, height) {
+ 'barHorizontalStacked':function(data, width, height) {
return angularFilterGoogleChartApi('bhs', data, width, height);
},
- barHorizontalGrouped:function(data, width, height) {
+ 'barHorizontalGrouped':function(data, width, height) {
return angularFilterGoogleChartApi('bhg', data, width, height);
},
- barVerticalStacked:function(data, width, height) {
+ 'barVerticalStacked':function(data, width, height) {
return angularFilterGoogleChartApi('bvs', data, width, height);
},
- barVerticalGrouped:function(data, width, height) {
+ 'barVerticalGrouped':function(data, width, height) {
return angularFilterGoogleChartApi('bvg', data, width, height);
},
- line:function(data, width, height) {
+ 'line':function(data, width, height) {
return angularFilterGoogleChartApi('lc', data, width, height);
},
- sparkline:function(data, width, height) {
+ 'sparkline':function(data, width, height) {
return angularFilterGoogleChartApi('ls', data, width, height);
},
- scatter:function(data, width, height) {
+ 'scatter':function(data, width, height) {
return angularFilterGoogleChartApi('s', data, width, height);
}
},
diff --git a/src/Parser.js b/src/Parser.js
index d33ae3db..fe9671af 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -695,7 +695,7 @@ Parser.prototype = {
self.scope.set(entity, Entity);
if (instance) {
var document = Entity();
- document.$$anchor = instance;
+ document['$$anchor'] = instance;
self.scope.set(instance, document);
return "$anchor." + instance + ":{" +
instance + "=" + entity + ".load($anchor." + instance + ");" +
diff --git a/src/Scope.js b/src/Scope.js
index 9be6bc3f..7e477ec5 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -95,6 +95,7 @@ Scope.prototype = {
},
eval: function(expressionText, context) {
+ log('Scope.eval', expressionText);
var expression = Scope.expressionCache[expressionText];
if (!expression) {
var parser = new Parser(expressionText);
--
cgit v1.2.3
From a2540fd581f35e8f79240d827d2252da5798c3a2 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 25 Jan 2010 23:49:52 -0800
Subject: fixes to make it pass on IE
---
src/API.js | 2 ++
src/Angular.js | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/API.js b/src/API.js
index d795f4c3..ce690ad1 100644
--- a/src/API.js
+++ b/src/API.js
@@ -319,5 +319,7 @@ defineApi('Object', [angularGlobal, angularCollection, angularObject],
['keys', 'values']);
defineApi('String', [angularGlobal, angularString], []);
defineApi('Date', [angularGlobal, angularDate], []);
+//IE bug
+angular['Date']['toString'] = angularDate['toString'];
defineApi('Function', [angularGlobal, angularCollection, angularFunction],
['bind', 'bindAll', 'delay', 'defer', 'wrap', 'compose']);
diff --git a/src/Angular.js b/src/Angular.js
index bfbe8ee9..f06562da 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -20,7 +20,8 @@ if (typeof Node == 'undefined') {
function noop() {}
if (!window['console']) window['console']={'log':noop, 'error':noop};
-var consoleNode, jQuery, msie,
+var consoleNode, msie,
+ jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
foreach = _.each,
extend = _.extend,
angular = window['angular'] || (window['angular'] = {}),
--
cgit v1.2.3
From 88384854c209f87507c273218fea85009f3801d6 Mon Sep 17 00:00:00 2001
From: Adam Abrons
Date: Tue, 26 Jan 2010 11:27:50 -0800
Subject: add default rake task (compile and test), send database name to login
---
src/Angular.js | 2 +-
src/ControlBar.js | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index f06562da..a055ce1d 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -270,7 +270,7 @@ function exposeMethods(obj, methods){
function wireAngular(element, config) {
var widgetFactory = new WidgetFactory(config['server'], config['database']);
var binder = new Binder(element[0], widgetFactory, datastore, config['location'], config);
- var controlBar = new ControlBar(element.find('body'), config['server']);
+ var controlBar = new ControlBar(element.find('body'), config['server'], config['database']);
var onUpdate = function(){binder.updateView();};
var server = config['database'] =="$MEMORY" ?
new FrameServer(window) :
diff --git a/src/ControlBar.js b/src/ControlBar.js
index 73be74db..685beeb2 100644
--- a/src/ControlBar.js
+++ b/src/ControlBar.js
@@ -1,6 +1,7 @@
-function ControlBar(document, serverUrl) {
+function ControlBar(document, serverUrl, database) {
this._document = document;
this.serverUrl = serverUrl;
+ this.database = database;
this._window = window;
this.callbacks = [];
};
@@ -26,7 +27,7 @@ ControlBar.prototype = {
login: function (loginSubmitFn) {
this.callbacks.push(loginSubmitFn);
if (this.callbacks.length == 1) {
- this.doTemplate("/user_session/new.mini?return_url=" + encodeURIComponent(this.urlWithoutAnchor()));
+ this.doTemplate("/user_session/new.mini?database="+encodeURIComponent(this.database)+"&return_url=" + encodeURIComponent(this.urlWithoutAnchor()));
}
},
--
cgit v1.2.3
From f5055c6530ffdb94436b52afe8c52ab6c2f2f14a Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 26 Jan 2010 15:59:46 -0800
Subject: remove uneeded log
---
src/Scope.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Scope.js b/src/Scope.js
index 7e477ec5..b8fadfa0 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -95,7 +95,7 @@ Scope.prototype = {
},
eval: function(expressionText, context) {
- log('Scope.eval', expressionText);
+// log('Scope.eval', expressionText);
var expression = Scope.expressionCache[expressionText];
if (!expression) {
var parser = new Parser(expressionText);
--
cgit v1.2.3
From 3d99e0f6dee6569ca9471d419bda79aec95b9ebc Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 28 Jan 2010 20:44:34 -0800
Subject: work
---
src/Angular.js | 1 +
src/Formaters.js | 6 ++++++
src/Scope.js | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
create mode 100644 src/Formaters.js
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index bfbe8ee9..b208d0ec 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -26,6 +26,7 @@ var consoleNode, jQuery, msie,
angular = window['angular'] || (window['angular'] = {}),
angularValidator = angular['validator'] || (angular['validator'] = {}),
angularFilter = angular['filter'] || (angular['filter'] = {}),
+ angularFormater = angular['formater'] || (angular['formater'] = {}),
angularCallbacks = angular['callbacks'] || (angular['callbacks'] = {}),
angularAlert = angular['alert'] || (angular['alert'] = function(){
log(arguments); window.alert.apply(window, arguments);
diff --git a/src/Formaters.js b/src/Formaters.js
new file mode 100644
index 00000000..e623d6b8
--- /dev/null
+++ b/src/Formaters.js
@@ -0,0 +1,6 @@
+
+extend(angularFormater, {
+ 'noop':function(){
+
+ }
+});
diff --git a/src/Scope.js b/src/Scope.js
index 7e477ec5..b8fadfa0 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -95,7 +95,7 @@ Scope.prototype = {
},
eval: function(expressionText, context) {
- log('Scope.eval', expressionText);
+// log('Scope.eval', expressionText);
var expression = Scope.expressionCache[expressionText];
if (!expression) {
var parser = new Parser(expressionText);
--
cgit v1.2.3
From a9c182764b5feeb2466c4bb32f7572762f7fab6d Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 28 Jan 2010 22:10:49 -0800
Subject: added formatters
---
src/Angular.js | 3 ++-
src/Formaters.js | 6 ------
src/Formatters.js | 14 ++++++++++++++
src/Widgets.js | 37 +++++++++++++++++++++----------------
4 files changed, 37 insertions(+), 23 deletions(-)
delete mode 100644 src/Formaters.js
create mode 100644 src/Formatters.js
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index ce25423c..3c88c6b7 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -24,10 +24,11 @@ var consoleNode, msie,
jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
foreach = _.each,
extend = _.extend,
+ identity = _.identity,
angular = window['angular'] || (window['angular'] = {}),
angularValidator = angular['validator'] || (angular['validator'] = {}),
angularFilter = angular['filter'] || (angular['filter'] = {}),
- angularFormater = angular['formater'] || (angular['formater'] = {}),
+ angularFormatter = angular['formatter'] || (angular['formatter'] = {}),
angularCallbacks = angular['callbacks'] || (angular['callbacks'] = {}),
angularAlert = angular['alert'] || (angular['alert'] = function(){
log(arguments); window.alert.apply(window, arguments);
diff --git a/src/Formaters.js b/src/Formaters.js
deleted file mode 100644
index e623d6b8..00000000
--- a/src/Formaters.js
+++ /dev/null
@@ -1,6 +0,0 @@
-
-extend(angularFormater, {
- 'noop':function(){
-
- }
-});
diff --git a/src/Formatters.js b/src/Formatters.js
new file mode 100644
index 00000000..74126feb
--- /dev/null
+++ b/src/Formatters.js
@@ -0,0 +1,14 @@
+function formater(format, parse) {return {'format':format, 'parse':parse};}
+function toString(obj) {return ""+obj;};
+extend(angularFormatter, {
+ 'noop':formater(identity, identity),
+ 'boolean':formater(toString, toBoolean),
+ 'number':formater(toString, function(obj){return 1*obj;}),
+
+ 'list':formater(
+ function(obj) { return obj ? obj.join(", ") : obj; },
+ function(value) {
+ return value ? _(_(value.split(',')).map(jQuery.trim)).select(_.identity) : value;
+ }
+ )
+});
diff --git a/src/Widgets.js b/src/Widgets.js
index d85c0ddc..d392d285 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -19,25 +19,26 @@ WidgetFactory.prototype = {
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);
+ 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);
+ controller = new TextController(input[0], exp, formatter);
event = "keyup change";
} else if (type == 'checkbox') {
- controller = new CheckboxController(input[0], exp);
+ controller = new CheckboxController(input[0], exp, formatter);
event = "click";
} else if (type == 'radio') {
- controller = new RadioController(input[0], exp);
+ controller = new RadioController(input[0], exp, formatter);
event="click";
} else if (type == 'select-one') {
- controller = new SelectController(input[0], exp);
+ controller = new SelectController(input[0], exp, formatter);
} else if (type == 'select-multiple') {
- controller = new MultiSelectController(input[0], exp);
+ controller = new MultiSelectController(input[0], exp, formatter);
} else if (type == 'file') {
- controller = this.createFileController(input, exp);
+ controller = this.createFileController(input, exp, formatter);
} else {
throw 'Unknown type: ' + type;
}
@@ -186,8 +187,9 @@ var ButtonController = NullController;
///////////////////////
// TextController
///////////////////////
-function TextController(view, exp) {
+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";
@@ -206,7 +208,7 @@ TextController.prototype = {
if (this.lastValue === value) {
return false;
} else {
- scope.setEval(this.exp, value);
+ scope.setEval(this.exp, this.formatter['parse'](value));
this.lastValue = value;
return true;
}
@@ -214,10 +216,10 @@ TextController.prototype = {
updateView: function(scope) {
var view = this.view;
- var value = scope.get(this.exp);
+ var value = this.formatter['format'](scope.get(this.exp));
if (typeof value === "undefined") {
value = this.initialValue;
- scope.setEval(this.exp, value);
+ scope.setEval(this.exp, this.formatter['parse'](value));
}
value = value ? value : '';
if (this.lastValue != value) {
@@ -248,21 +250,23 @@ TextController.prototype = {
///////////////////////
// CheckboxController
///////////////////////
-function CheckboxController(view, exp) {
+function CheckboxController(view, exp, formatter) {
this.view = view;
this.exp = exp;
this.lastValue = undefined;
+ this.formatter = formatter;
this.initialValue = view.checked ? view.value : "";
};
CheckboxController.prototype = {
- updateModel: function(scope) {
+ updateModel: function(scope) {
+ jstd.console.log("model");
var input = this.view;
var value = input.checked ? input.value : '';
if (this.lastValue === value) {
return false;
} else {
- scope.setEval(this.exp, value);
+ scope.setEval(this.exp, this.formatter['parse'](value));
this.lastValue = value;
return true;
}
@@ -273,9 +277,10 @@ CheckboxController.prototype = {
var value = scope.eval(this.exp);
if (typeof value === "undefined") {
value = this.initialValue;
- scope.setEval(this.exp, value);
+ scope.setEval(this.exp, this.formatter['parse'](value));
}
- input.checked = input.value == (''+value);
+ value = this.formatter['format'](value);
+ input.checked = input.value == value;
}
};
--
cgit v1.2.3
From 2880411713bf051b0d30b0a1f3531a34272f3b25 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 29 Jan 2010 10:15:15 -0800
Subject: added bootstrap, fixed formatter
---
src/Widgets.js | 25 +++++++++++-----------
src/angular-bootstrap.js | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 68 insertions(+), 12 deletions(-)
create mode 100644 src/angular-bootstrap.js
(limited to 'src')
diff --git a/src/Widgets.js b/src/Widgets.js
index d392d285..69b444c0 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -195,7 +195,7 @@ function TextController(view, exp, formatter) {
this.required = typeof view.attributes['ng-required'] != "undefined";
this.lastErrorText = null;
this.lastValue = undefined;
- this.initialValue = view.value;
+ this.initialValue = this.formatter['parse'](view.value);
var widget = view.getAttribute('ng-widget');
if (widget === 'datepicker') {
jQuery(view).datepicker();
@@ -204,11 +204,11 @@ function TextController(view, exp, formatter) {
TextController.prototype = {
updateModel: function(scope) {
- var value = this.view.value;
+ var value = this.formatter['parse'](this.view.value);
if (this.lastValue === value) {
return false;
} else {
- scope.setEval(this.exp, this.formatter['parse'](value));
+ scope.setEval(this.exp, value);
this.lastValue = value;
return true;
}
@@ -216,16 +216,17 @@ TextController.prototype = {
updateView: function(scope) {
var view = this.view;
- var value = this.formatter['format'](scope.get(this.exp));
+ var value = scope.get(this.exp);
if (typeof value === "undefined") {
value = this.initialValue;
- scope.setEval(this.exp, this.formatter['parse'](value));
+ scope.setEval(this.exp, value);
}
value = value ? value : '';
- if (this.lastValue != value) {
- view.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) {
@@ -255,14 +256,15 @@ function CheckboxController(view, exp, formatter) {
this.exp = exp;
this.lastValue = undefined;
this.formatter = formatter;
- this.initialValue = view.checked ? view.value : "";
+ this.initialValue = this.formatter['parse'](view.checked ? view.value : "");
};
CheckboxController.prototype = {
updateModel: function(scope) {
- jstd.console.log("model");
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 {
@@ -277,10 +279,9 @@ CheckboxController.prototype = {
var value = scope.eval(this.exp);
if (typeof value === "undefined") {
value = this.initialValue;
- scope.setEval(this.exp, this.formatter['parse'](value));
+ scope.setEval(this.exp, value);
}
- value = this.formatter['format'](value);
- input.checked = input.value == value;
+ input.checked = this.formatter['parse'](input.value) == value;
}
};
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
new file mode 100644
index 00000000..0f7cd2ea
--- /dev/null
+++ b/src/angular-bootstrap.js
@@ -0,0 +1,55 @@
+/**
+ * The MIT License
+ *
+ * Copyright (c) 2010 Adam Abrons and Misko Hevery http://getangular.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+(function(previousOnLoad){
+ var filename = /(.*)\/angular-(.*).js/;
+ var scripts = document.getElementsByTagName("script");
+ var serverPath;
+ for(var j = 0; j < scripts.length; j++) {
+ var match = (scripts[j].src || "").match(filename);
+ if (match) {
+ serverPath = match[1];
+ }
+ }
+
+ function addScript(file){
+ document.write('');
+ };
+
+ addScript("/Angular.js");
+ addScript("/API.js");
+ addScript("/Binder.js");
+ addScript("/ControlBar.js");
+ addScript("/DataStore.js");
+ addScript("/Filters.js");
+ addScript("/Formatters.js");
+ addScript("/JSON.js");
+ addScript("/Model.js");
+ addScript("/Parser.js");
+ addScript("/Scope.js");
+ addScript("/Server.js");
+ addScript("/Users.js");
+ addScript("/Validators.js");
+ addScript("/Widgets.js");
+})(window.onload);
+
--
cgit v1.2.3
From 302472f4fa50f995085ebf36b8990bedf3806973 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 4 Feb 2010 11:12:34 -0800
Subject: list formater always should return arry
---
src/Formatters.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Formatters.js b/src/Formatters.js
index 74126feb..661dd701 100644
--- a/src/Formatters.js
+++ b/src/Formatters.js
@@ -8,7 +8,7 @@ extend(angularFormatter, {
'list':formater(
function(obj) { return obj ? obj.join(", ") : obj; },
function(value) {
- return value ? _(_(value.split(',')).map(jQuery.trim)).select(_.identity) : value;
+ return value ? _(_(value.split(',')).map(jQuery.trim)).select(_.identity) : [];
}
)
});
--
cgit v1.2.3
From 5dd43b85e73ca1708e7fd85094b533b02266a79a Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 4 Feb 2010 11:45:38 -0800
Subject: ng-required treats whitespace as empty
---
src/Widgets.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Widgets.js b/src/Widgets.js
index 69b444c0..c5ab7c6f 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -230,7 +230,7 @@ TextController.prototype = {
var isValidationError = false;
view.removeAttribute('ng-error');
if (this.required) {
- isValidationError = !(value && value.length > 0);
+ isValidationError = !(value && $.trim(value).length > 0);
}
var errorText = isValidationError ? "Required Value" : null;
if (!isValidationError && this.validator && value) {
--
cgit v1.2.3
From 1da18e73a4d09b2a1ace92a4094eeba014eb7dc4 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 4 Feb 2010 13:27:56 -0800
Subject: consider widget errors only when widgets are visible
---
src/Angular.js | 4 ++++
src/Formatters.js | 6 +++++-
src/Widgets.js | 4 ++--
3 files changed, 11 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 3c88c6b7..ded4485f 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -97,6 +97,10 @@ function isLeafNode (node) {
}
}
+function isVisible(element) {
+ return jQuery(element).is(":visible");
+}
+
function setHtml(node, html) {
if (isLeafNode(node)) {
if (msie) {
diff --git a/src/Formatters.js b/src/Formatters.js
index 661dd701..6aa832af 100644
--- a/src/Formatters.js
+++ b/src/Formatters.js
@@ -1,4 +1,4 @@
-function formater(format, parse) {return {'format':format, 'parse':parse};}
+function formater(format, parse) {return {'format':format, 'parse':parse || format};}
function toString(obj) {return ""+obj;};
extend(angularFormatter, {
'noop':formater(identity, identity),
@@ -10,5 +10,9 @@ extend(angularFormatter, {
function(value) {
return value ? _(_(value.split(',')).map(jQuery.trim)).select(_.identity) : [];
}
+ ),
+
+ 'trim':formater(
+ function(obj) { return obj ? $.trim("" + obj) : ""; }
)
});
diff --git a/src/Widgets.js b/src/Widgets.js
index c5ab7c6f..01877128 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -230,7 +230,7 @@ TextController.prototype = {
var isValidationError = false;
view.removeAttribute('ng-error');
if (this.required) {
- isValidationError = !(value && $.trim(value).length > 0);
+ isValidationError = !(value && $.trim("" + value).length > 0);
}
var errorText = isValidationError ? "Required Value" : null;
if (!isValidationError && this.validator && value) {
@@ -239,7 +239,7 @@ TextController.prototype = {
}
if (this.lastErrorText !== errorText) {
this.lastErrorText = isValidationError;
- if (errorText !== null) {
+ if (errorText !== null && isVisible(view)) {
view.setAttribute('ng-error', errorText);
scope.markInvalid(this);
}
--
cgit v1.2.3
From 9f919c42f0885e39870195fab8ce2a22621119b7 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 4 Feb 2010 14:02:20 -0800
Subject: better handling of $invalidWidgets
---
src/Angular.js | 1 +
src/Binder.js | 2 +-
src/Scope.js | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index ded4485f..fa6a610c 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -294,6 +294,7 @@ function wireAngular(element, config) {
'$anchor' : binder.anchor,
'$updateView': _(binder.updateView).bind(binder),
'$config' : config,
+ '$invalidWidgets': [],
'$console' : window.console,
'$datastore' : exposeMethods(datastore, {
'load': datastore.load,
diff --git a/src/Binder.js b/src/Binder.js
index e516ec32..8dac934b 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -95,7 +95,7 @@ Binder.prototype = {
updateView: function() {
var start = new Date().getTime();
var scope = jQuery(this.doc).scope();
- scope.set("$invalidWidgets", []);
+ scope.clearInvalid();
scope.updateView();
var end = new Date().getTime();
this.updateAnchor();
diff --git a/src/Scope.js b/src/Scope.js
index b8fadfa0..cedb0542 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -153,6 +153,11 @@ Scope.prototype = {
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);
},
--
cgit v1.2.3
From 251fab40291183c8e50ea0fabd23c30341cc72d3 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 4 Feb 2010 15:04:28 -0800
Subject: updateView is now called on binder instead of scope
---
src/Angular.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index fa6a610c..a7d4f719 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -34,6 +34,10 @@ var consoleNode, msie,
log(arguments); window.alert.apply(window, arguments);
});
+var isVisible = isVisible || function (element) {
+ return jQuery(element).is(":visible");
+}
+
function log(a, b, c){
var console = window['console'];
switch(arguments.length) {
@@ -97,10 +101,6 @@ function isLeafNode (node) {
}
}
-function isVisible(element) {
- return jQuery(element).is(":visible");
-}
-
function setHtml(node, html) {
if (isLeafNode(node)) {
if (msie) {
@@ -281,7 +281,7 @@ function wireAngular(element, config) {
var server = config['database'] =="$MEMORY" ?
new FrameServer(window) :
new Server(config['server'], jQuery['getScript']);
- server = new VisualServer(server, new Status(jQuery(element.body)), onUpdate);
+ server = new VisualServer(server, new Status(element.find('body')), onUpdate);
var users = new Users(server, controlBar);
var databasePath = '/data/' + config['database'];
var post = function(request, callback){
@@ -330,7 +330,6 @@ function wireAngular(element, config) {
new PopUp(element).bind();
var self = _(exposeMethods(scope, {
- 'updateView': scope.updateView,
'set': scope.set,
'get': scope.get,
'eval': scope.eval
@@ -343,6 +342,7 @@ function wireAngular(element, config) {
return self;
},
'element':element[0],
+ 'updateView': _(binder.updateView).bind(binder),
'config':config
});
return self;
--
cgit v1.2.3
From 5eb440c22bb87b1d69c14193954620b9f1cec023 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 4 Feb 2010 15:12:34 -0800
Subject: lazy load the status dom
---
src/Widgets.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/Widgets.js b/src/Widgets.js
index 01877128..5e844ae0 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -779,8 +779,8 @@ PopUp.prototype = {
function Status(body) {
- this.loader = body.append(Status.DOM).find("#ng-loading");
this.requestCount = 0;
+ this.body = body;
};
Status.DOM ='loading....
';
@@ -788,7 +788,7 @@ Status.DOM ='loading....
';
Status.prototype = {
beginRequest: function () {
if (this.requestCount === 0) {
- this.loader.show();
+ (this.loader = this.loader || this.body.append(Status.DOM).find("#ng-loading")).show();
}
this.requestCount++;
},
--
cgit v1.2.3
From 6d75afe6d2ea26bb412becd1e8f7cab8031eaab4 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 5 Feb 2010 14:13:19 -0800
Subject: fixed memory leak on repeaters
---
src/Widgets.js | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/Widgets.js b/src/Widgets.js
index 5e844ae0..6eb2acc3 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -425,7 +425,6 @@ function BindUpdater(view, exp) {
this.view = view;
this.exp = Binder.parseBindings(exp);
this.hasError = false;
- this.scopeSelf = {element:view};
};
BindUpdater.toText = function(obj) {
@@ -481,7 +480,7 @@ BindUpdater.prototype = {
var part = parts[i];
var binding = Binder.binding(part);
if (binding) {
- scope.evalWidget(this, binding, this.scopeSelf, function(value){
+ scope.evalWidget(this, binding, {element:this.view}, function(value){
html.push(BindUpdater.toText(value));
}, function(e, text){
setHtml(this.view, text);
@@ -700,8 +699,7 @@ RepeaterUpdater.prototype = {
});
// shrink children
for ( var r = childrenLength; r > iteratorLength; --r) {
- var unneeded = this.children.pop().element[0];
- unneeded.parentNode.removeChild(unneeded);
+ this.children.pop().element.remove();
}
// Special case for option in select
if (child && child.element[0].nodeName === "OPTION") {
--
cgit v1.2.3
From 9d566a0cd0225685efb192c195280b6857628d32 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 5 Feb 2010 14:41:45 -0800
Subject: better integer farmater
---
src/Validators.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/Validators.js b/src/Validators.js
index 5549ee39..84681f15 100644
--- a/src/Validators.js
+++ b/src/Validators.js
@@ -24,11 +24,12 @@ foreach({
},
'integer': function(value, min, max) {
- var number = angularValidator['number'](value, min, max);
- if (number === null && value != Math.round(value)) {
+ var numberError = angularValidator['number'](value, min, max);
+ if (numberError) return numberError;
+ if (!("" + value).match(/^\s*[\d+]*\s*$/) || value != Math.round(value)) {
return "Value is not a whole number.";
}
- return number;
+ return null;
},
'date': function(value, min, max) {
--
cgit v1.2.3
From 799d72931a5a01de74bba69d8a6638cd57cec315 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 9 Feb 2010 13:13:18 -0800
Subject: added onUpdateView listener for config
---
src/Angular.js | 2 ++
src/Binder.js | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index a7d4f719..93ca71b4 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -276,6 +276,7 @@ function exposeMethods(obj, methods){
function wireAngular(element, config) {
var widgetFactory = new WidgetFactory(config['server'], config['database']);
var binder = new Binder(element[0], widgetFactory, datastore, config['location'], config);
+ binder.updateListeners.push(config.onUpdateView);
var controlBar = new ControlBar(element.find('body'), config['server'], config['database']);
var onUpdate = function(){binder.updateView();};
var server = config['database'] =="$MEMORY" ?
@@ -358,6 +359,7 @@ angular['compile'] = function(element, config) {
jQuery = window['jQuery'];
msie = jQuery['browser']['msie'];
config = _({
+ 'onUpdateView': noop,
'server': "",
'location': {'get':noop, 'set':noop, 'listen':noop}
}).extend(config||{});
diff --git a/src/Binder.js b/src/Binder.js
index 8dac934b..4699a601 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -99,7 +99,7 @@ Binder.prototype = {
scope.updateView();
var end = new Date().getTime();
this.updateAnchor();
- _.each(this.updateListeners, function(fn) {fn();});
+ foreach(this.updateListeners, function(fn) {fn();});
},
docFindWithSelf: function(exp){
--
cgit v1.2.3
From b2a8a089b6c31c8ff176c2483f659caae4f71afb Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 11 Feb 2010 09:57:42 -0800
Subject: make validator more leniant for errors which are false instead of
null
---
src/Widgets.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Widgets.js b/src/Widgets.js
index 6eb2acc3..4f359e91 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -239,7 +239,7 @@ TextController.prototype = {
}
if (this.lastErrorText !== errorText) {
this.lastErrorText = isValidationError;
- if (errorText !== null && isVisible(view)) {
+ if (errorText && isVisible(view)) {
view.setAttribute('ng-error', errorText);
scope.markInvalid(this);
}
--
cgit v1.2.3
From 6cc946413622f1cef97997849e73a06a00f876fd Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 12 Feb 2010 14:16:33 -0800
Subject: Fixed negation grouping bug Make 'this' of validation be scope
---
src/Filters.js | 4 ++--
src/Parser.js | 53 +++++++++++++++++++++++------------------------------
src/Scope.js | 4 ++--
src/Widgets.js | 6 +++---
4 files changed, 30 insertions(+), 37 deletions(-)
(limited to 'src')
diff --git a/src/Filters.js b/src/Filters.js
index 77fa5ec7..60d53fb9 100644
--- a/src/Filters.js
+++ b/src/Filters.js
@@ -24,7 +24,7 @@ var angularFilterGoogleChartApi;
foreach({
'currency': function(amount){
- jQuery(this.element).toggleClass('ng-format-negative', amount < 0);
+ jQuery(this.$element).toggleClass('ng-format-negative', amount < 0);
return '$' + angularFilter['number'].apply(this, [amount, 2]);
},
@@ -60,7 +60,7 @@ foreach({
},
'json': function(object) {
- jQuery(this.element).addClass("ng-monospace");
+ jQuery(this.$element).addClass("ng-monospace");
return toJson(object, true);
},
diff --git a/src/Parser.js b/src/Parser.js
index fe9671af..3aa644ac 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -369,7 +369,16 @@ Parser.prototype = {
for ( var i = 0; i < argsFn.length; i++) {
args.push(argsFn[i](self));
}
- return fn.apply(self, args);
+ var pipeThis = function(){
+ var _this = this;
+ foreach(self, function(v, k) {
+ if (k.charAt(0) == '$') {
+ _this[k] = v;
+ }
+ });
+ };
+ pipeThis.prototype = self.self;
+ return fn.apply(new pipeThis(), args);
};
return function(){
return fnInvoke;
@@ -422,48 +431,30 @@ Parser.prototype = {
},
logicalAND: function(){
- var left = this.negated();
+ var left = this.equality();
var token;
- while(true) {
- if ((token = this.expect('&&'))) {
- left = this._binary(left, token.fn, this.negated());
- } else {
- return left;
- }
- }
- },
-
- negated: function(){
- var token;
- if (token = this.expect('!')) {
- return this._unary(token.fn, this.assignment());
- } else {
- return this.equality();
+ if ((token = this.expect('&&'))) {
+ left = this._binary(left, token.fn, this.logicalAND());
}
+ return left;
},
equality: function(){
var left = this.relational();
var token;
- while(true) {
- if ((token = this.expect('==','!='))) {
- left = this._binary(left, token.fn, this.relational());
- } else {
- return left;
- }
+ if ((token = this.expect('==','!='))) {
+ left = this._binary(left, token.fn, this.equality());
}
+ return left;
},
relational: function(){
var left = this.additive();
var token;
- while(true) {
- if ((token = this.expect('<', '>', '<=', '>='))) {
- left = this._binary(left, token.fn, this.additive());
- } else {
- return left;
- }
+ if (token = this.expect('<', '>', '<=', '>=')) {
+ left = this._binary(left, token.fn, this.relational());
}
+ return left;
},
additive: function(){
@@ -489,7 +480,9 @@ Parser.prototype = {
if (this.expect('+')) {
return this.primary();
} else if (token = this.expect('-')) {
- return this._binary(Parser.ZERO, token.fn, this.multiplicative());
+ return this._binary(Parser.ZERO, token.fn, this.unary());
+ } else if (token = this.expect('!')) {
+ return this._unary(token.fn, this.unary());
} else {
return this.primary();
}
diff --git a/src/Scope.js b/src/Scope.js
index cedb0542..c0998168 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -138,13 +138,13 @@ Scope.prototype = {
}
},
- validate: function(expressionText, value) {
+ 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};
+ var self = {scope:this, self:this.state, '$element':element};
return expression(self)(self, value);
},
diff --git a/src/Widgets.js b/src/Widgets.js
index 4f359e91..71fcd110 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -234,7 +234,7 @@ TextController.prototype = {
}
var errorText = isValidationError ? "Required Value" : null;
if (!isValidationError && this.validator && value) {
- errorText = scope.validate(this.validator, value);
+ errorText = scope.validate(this.validator, value, view);
isValidationError = !!errorText;
}
if (this.lastErrorText !== errorText) {
@@ -480,7 +480,7 @@ BindUpdater.prototype = {
var part = parts[i];
var binding = Binder.binding(part);
if (binding) {
- scope.evalWidget(this, binding, {element:this.view}, function(value){
+ scope.evalWidget(this, binding, {$element:this.view}, function(value){
html.push(BindUpdater.toText(value));
}, function(e, text){
setHtml(this.view, text);
@@ -520,7 +520,7 @@ BindAttrUpdater.prototype = {
var binding = Binder.binding(attributeTemplate[i]);
if (binding) {
try {
- var value = scope.eval(binding, {element:jNode[0], attrName:attrName});
+ var value = scope.eval(binding, {$element:jNode[0], attrName:attrName});
if (value && (value.constructor !== array || value.length !== 0))
attrValues.push(value);
} catch (e) {
--
cgit v1.2.3
From 3f9a2ab9bdfcd12cb7df74b0d38cecf2ee4ac94a Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 12 Feb 2010 19:39:01 -0800
Subject: added asynchronous validator
---
src/Parser.js | 4 ++--
src/Validators.js | 29 +++++++++++++++++++++++++++++
2 files changed, 31 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/Parser.js b/src/Parser.js
index 3aa644ac..b59b21a7 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -349,11 +349,11 @@ Parser.prototype = {
},
filter: function(){
- return this._pipeFunction(angular['filter']);
+ return this._pipeFunction(angularFilter);
},
validator: function(){
- return this._pipeFunction(angular['validator']);
+ return this._pipeFunction(angularValidator);
},
_pipeFunction: function(fnScope){
diff --git a/src/Validators.js b/src/Validators.js
index 84681f15..b7efcb4a 100644
--- a/src/Validators.js
+++ b/src/Validators.js
@@ -77,5 +77,34 @@ foreach({
} catch (e) {
return e.toString();
}
+ },
+
+ 'asynchronous': function(text, asynchronousFn) {
+ var stateKey = '$validateState';
+ var lastKey = '$lastKey';
+ var obj = this['$element'];
+ var stateCache = obj[stateKey] = obj[stateKey] || {};
+ var state = stateCache[text];
+ var updateView = this['$updateView'];
+ obj[lastKey] = text;
+ if (state === undefined) {
+ // we have never seen this before, Request it
+ jQuery(obj).addClass('ng-input-indicator-wait');
+ state = stateCache[text] = null;
+ asynchronousFn(text, function(error){
+ state = stateCache[text] = error ? error : false;
+ if (stateCache[obj[lastKey]] !== null) {
+ jQuery(obj).removeClass('ng-input-indicator-wait');
+ }
+ updateView();
+ });
+ }
+
+ if (state === null){
+ // request in flight, mark widget invalid, but don't show it to user
+ this['$invalidWidgets'].push(this.$element);
+ }
+ return state;
}
+
}, function(v,k) {angularValidator[k] = v;});
--
cgit v1.2.3
From b561f6a0cc3e2e03c05925fbed3e06723f91b4b5 Mon Sep 17 00:00:00 2001
From: Adam Abrons
Date: Tue, 16 Feb 2010 21:30:15 -0800
Subject: stop showing loading... text
---
src/Angular.js | 4 ++--
src/Widgets.js | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 93ca71b4..6cb3f602 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -282,7 +282,7 @@ function wireAngular(element, config) {
var server = config['database'] =="$MEMORY" ?
new FrameServer(window) :
new Server(config['server'], jQuery['getScript']);
- server = new VisualServer(server, new Status(element.find('body')), onUpdate);
+ server = new VisualServer(server, new NullStatus(element.find('body')), onUpdate);
var users = new Users(server, controlBar);
var databasePath = '/data/' + config['database'];
var post = function(request, callback){
@@ -368,4 +368,4 @@ angular['compile'] = function(element, config) {
configureJQueryPlugins();
return wireAngular(jQuery(element), config);
-};
\ No newline at end of file
+};
diff --git a/src/Widgets.js b/src/Widgets.js
index 71fcd110..13506a78 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -775,6 +775,13 @@ PopUp.prototype = {
// Status
//////////////////////////////////
+function NullStatus(body) {
+};
+
+NullStatus.prototype = {
+ beginRequest:function(){},
+ endRequest:function(){}
+};
function Status(body) {
this.requestCount = 0;
--
cgit v1.2.3
From 7e14dff90516a41ff1903cc44fe3389710f15556 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 17 Feb 2010 16:05:26 -0800
Subject: fix this on filter to point to scope
---
src/Scope.js | 1 +
1 file changed, 1 insertion(+)
(limited to 'src')
diff --git a/src/Scope.js b/src/Scope.js
index c0998168..4de57dd2 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -105,6 +105,7 @@ Scope.prototype = {
}
context = context || {};
context.scope = this;
+ context.self = this.state;
return expression(context);
},
--
cgit v1.2.3
From 2f99af1cce0e7bd440f937d2557dbd583d8a6129 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 17 Feb 2010 20:50:13 -0800
Subject: fixed upload widget
---
src/Widgets.js | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
(limited to 'src')
diff --git a/src/Widgets.js b/src/Widgets.js
index 13506a78..6d7530f0 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -57,7 +57,7 @@ WidgetFactory.prototype = {
bind(event, action);
return controller;
},
-
+
createFileController: function(fileInput) {
var uploadId = '__uploadWidget_' + (this.nextUploadId++);
var view = FileController.template(uploadId);
@@ -72,7 +72,7 @@ WidgetFactory.prototype = {
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).data('controller', cntl);
+ jQuery(swfNode).parent().data('controller', cntl);
return cntl;
}
};
@@ -92,7 +92,7 @@ function FileController(view, scopeName, uploader, databaseUrl) {
angularCallbacks['flashEvent'] = function(id, event, args) {
var object = document.getElementById(id);
var jobject = jQuery(object);
- var controller = jobject.data("controller");
+ var controller = jobject.parent().data("controller");
FileController.prototype[event].apply(controller, args);
_.defer(jobject.scope().get('$updateView'));
};
@@ -103,7 +103,7 @@ FileController.template = function(id) {
'' +
'' +
'' +
- '');
+ '');
};
extend(FileController.prototype, {
@@ -130,14 +130,14 @@ extend(FileController.prototype, {
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;
@@ -148,7 +148,7 @@ extend(FileController.prototype, {
return true;
}
},
-
+
updateView: function(scope) {
var modelValue = scope.get(this.scopeName);
if (modelValue && this.value !== modelValue) {
@@ -160,7 +160,7 @@ extend(FileController.prototype, {
}
this.view.find("input").attr('checked', !!modelValue);
},
-
+
upload: function() {
if (this.name) {
this.uploader['uploadFile'](this.attachmentsPath);
@@ -213,7 +213,7 @@ TextController.prototype = {
return true;
}
},
-
+
updateView: function(scope) {
var view = this.view;
var value = scope.get(this.exp);
@@ -226,7 +226,7 @@ TextController.prototype = {
view.value = this.formatter['format'](value);
this.lastValue = value;
}
-
+
var isValidationError = false;
view.removeAttribute('ng-error');
if (this.required) {
@@ -273,7 +273,7 @@ CheckboxController.prototype = {
return true;
}
},
-
+
updateView: function(scope) {
var input = this.view;
var value = scope.eval(this.exp);
@@ -311,7 +311,7 @@ SelectController.prototype = {
}
}
},
-
+
updateView: function(scope) {
var input = this.view;
var value = scope.get(this.exp);
@@ -348,7 +348,7 @@ MultiSelectController.prototype = {
}
return value;
},
-
+
updateModel: function(scope) {
var value = this.selected();
// TODO: This is wrong! no caching going on here as we are always comparing arrays
@@ -360,7 +360,7 @@ MultiSelectController.prototype = {
return true;
}
},
-
+
updateView: function(scope) {
var input = this.view;
var selected = scope.get(this.exp);
@@ -403,7 +403,7 @@ RadioController.prototype = {
return true;
}
},
-
+
updateView: function(scope) {
var input = this.view;
var value = scope.get(this.exp);
@@ -540,7 +540,7 @@ BindAttrUpdater.prototype = {
if(isImage && attrName == 'src' && !attrValue)
attrValue = scope.get('$config.blankImage');
jNode.attr(attrName, attrValue);
- }
+ }
}
};
@@ -797,7 +797,7 @@ Status.prototype = {
}
this.requestCount++;
},
-
+
endRequest: function () {
this.requestCount--;
if (this.requestCount === 0) {
--
cgit v1.2.3
From 97c02c9def42655e28ec86fed288ca363b152f9e Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sat, 20 Feb 2010 14:56:06 -0800
Subject: upgraded underscore.js for ie compatibility
---
src/Users.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/Users.js b/src/Users.js
index f81507f4..fb5845d3 100644
--- a/src/Users.js
+++ b/src/Users.js
@@ -8,10 +8,10 @@ extend(Users.prototype, {
var self = this;
this.server.request("GET", "/account.json", {}, function(code, response){
self['current'] = response['user'];
- callback(response.user);
+ callback(response['user']);
});
},
-
+
'logout': function(callback) {
var self = this;
this.controlBar.logout(function(){
@@ -19,7 +19,7 @@ extend(Users.prototype, {
(callback||noop)();
});
},
-
+
'login': function(callback) {
var self = this;
this.controlBar.login(function(){
--
cgit v1.2.3
From b628de9758c313b106d22468f4b49bd223698fd5 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sat, 20 Feb 2010 17:27:21 -0800
Subject: fix option value bug
---
src/Binder.js | 64 +++++++++++++++++++++++++++++++----------------------------
1 file changed, 34 insertions(+), 30 deletions(-)
(limited to 'src')
diff --git a/src/Binder.js b/src/Binder.js
index 4699a601..9fc32513 100644
--- a/src/Binder.js
+++ b/src/Binder.js
@@ -48,14 +48,14 @@ Binder.prototype = {
});
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];
@@ -64,12 +64,12 @@ Binder.prototype = {
self.anchor[key] = newValue;
});
},
-
+
onUrlChange: function() {
this.parseAnchor();
this.updateView();
},
-
+
updateAnchor: function() {
var url = this.location['get']() || "";
var anchorIndex = url.indexOf('#');
@@ -91,7 +91,7 @@ Binder.prototype = {
this.location['set'](url);
return url;
},
-
+
updateView: function() {
var start = new Date().getTime();
var scope = jQuery(this.doc).scope();
@@ -101,7 +101,7 @@ Binder.prototype = {
this.updateAnchor();
foreach(this.updateListeners, function(fn) {fn();});
},
-
+
docFindWithSelf: function(exp){
var doc = jQuery(this.doc);
var selection = doc.find(exp);
@@ -110,7 +110,7 @@ Binder.prototype = {
}
return selection;
},
-
+
executeInit: function() {
this.docFindWithSelf("[ng-init]").each(function() {
var jThis = jQuery(this);
@@ -122,7 +122,7 @@ Binder.prototype = {
}
});
},
-
+
entity: function (scope) {
var self = this;
this.docFindWithSelf("[ng-entity]").attr("ng-watch", function() {
@@ -136,7 +136,7 @@ Binder.prototype = {
}
});
},
-
+
compile: function() {
var jNode = jQuery(this.doc);
if (this.config['autoSubmit']) {
@@ -160,7 +160,7 @@ Binder.prototype = {
return false;
});
},
-
+
translateBinding: function(node, parentPath, factories) {
var path = parentPath.concat();
var offset = path.pop();
@@ -196,7 +196,7 @@ Binder.prototype = {
parent.removeChild(node);
}
},
-
+
precompile: function(root) {
var factories = [];
this.precompileNode(root, [], factories);
@@ -217,7 +217,7 @@ Binder.prototype = {
}
};
},
-
+
precompileNode: function(node, path, factories) {
var nodeType = node.nodeType;
if (nodeType == Node.TEXT_NODE) {
@@ -226,11 +226,11 @@ Binder.prototype = {
} 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');
@@ -252,7 +252,7 @@ Binder.prototype = {
node.setAttribute("ng-bind-attr", json);
}
}
-
+
if (!node.getAttribute) log(node);
var repeaterExpression = node.getAttribute('ng-repeat');
if (repeaterExpression) {
@@ -275,7 +275,7 @@ Binder.prototype = {
}});
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});
@@ -300,53 +300,57 @@ Binder.prototype = {
if (nodeName == 'OPTION') {
var html = jQuery('').append(jQuery(node).clone()).html();
if (!html.match(/' +
+ '' +
+ '
' +
+ '' +
+ '' +
+ '
');
+ this.console = this.body.find(".console");
+ this.testFrame = this.body.find("iframe");
+ this.console.find(".run").live("click", function(){
+ jQuery(this).parent().find('.log').toggle();
+ });
+ },
+
+
+ runScenarios:function(){
+ var runner = new scenario.Runner(this.console, this.testFrame);
+ _.stepper(this.scenarios, function(next, scenarioObj, name){
+ new scenario.Scenario(name, scenarioObj).run(runner, next);
+ }, function(){
+ }
+ );
+ }
+};
+
+scenario.Runner = function(console, frame){
+ this.console = console;
+ this.current = null;
+ this.tests = [];
+ this.frame = frame;
+};
+scenario.Runner.prototype = {
+ start:function(name){
+ var current = this.current = {
+ name:name,
+ start:new Date().getTime(),
+ scenario:jQuery('')
+ };
+ current.run = current.scenario.append(
+ '' +
+ '.' +
+ '.' +
+ '.' +
+ '').find(".run");
+ current.log = current.scenario.append('').find(".log");
+ current.run.find(".name").text(name);
+ this.tests.push(current);
+ this.console.append(current.scenario);
+ },
+ end:function(name){
+ var current = this.current;
+ var run = current.run;
+ this.current = null;
+ current.end = new Date().getTime();
+ current.time = current.end - current.start;
+ run.find(".time").text(current.time);
+ run.find(".state").text(current.error ? "FAIL" : "PASS");
+ run.addClass(current.error ? "fail" : "pass");
+ if (current.error)
+ run.find(".run").append('').text(current.error);
+ current.scenario.find(".log").hide();
+ },
+ log:function(level) {
+ var buf = [];
+ for ( var i = 1; i < arguments.length; i++) {
+ var arg = arguments[i];
+ buf.push(typeof arg == "string" ?arg:toJson(arg));
+ }
+ var log = jQuery('');
+ log.text(buf.join(" "));
+ this.current.log.append(log);
+ this.console.scrollTop(this.console[0].scrollHeight);
+ if (level == "error")
+ this.current.error = buf.join(" ");
+ }
+};
+
+scenario.Scenario = function(name, scenario){
+ this.name = name;
+ this.scenario = scenario;
+};
+scenario.Scenario.prototype = {
+ run:function(runner, callback) {
+ var self = this;
+ _.stepper(this.scenario, function(next, steps, name){
+ if (name.charAt(0) == '$') {
+ next();
+ } else {
+ runner.start(self.name + "::" + name);
+ var allSteps = (self.scenario.$before||[]).concat(steps);
+ _.stepper(allSteps, function(next, step){
+ self.executeStep(runner, step, next);
+ }, function(){
+ runner.end();
+ next();
+ });
+ }
+ }, callback);
+ },
+
+
+ verb:function(step){
+ var fn = null;
+ if (!step) fn = function (){ throw "Step is null!"; };
+ else if (step.Given) fn = scenario.GIVEN[step.Given];
+ else if (step.When) fn = scenario.WHEN[step.When];
+ else if (step.Then) fn = scenario.THEN[step.Then];
+ return fn || function (){
+ throw "ERROR: Need Given/When/Then got: " + toJson(step);
+ };
+ },
+
+
+ context: function(runner) {
+ var frame = runner.frame;
+ var window = frame[0].contentWindow;
+ var document;
+ if (window.jQuery)
+ document = window.jQuery(window.document);
+ var context = {
+ frame:frame,
+ window:window,
+ log:_.bind(runner.log, runner, "info"),
+ document:document,
+ assert:function(element, path){
+ if (element.size() != 1) {
+ throw "Expected to find '1' found '"+
+ element.size()+"' for '"+path+"'.";
+ }
+ return element;
+ },
+ element:function(path){
+ var exp = path.replace("{{","[ng-bind=").replace("}}", "]");
+ var element = document.find(exp);
+ return context.assert(element, path);
+ }
+ };
+ return context;
+ },
+
+
+ executeStep:function(runner, step, callback) {
+ if (!step) {
+ callback();
+ return;
+ }
+ runner.log("info", toJson(step));
+ var fn = this.verb(step);
+ var context = this.context(runner);
+ _.extend(context, step);
+ try {
+ (fn.call(context)||function(c){c();})(callback);
+ } catch (e) {
+ runner.log("error", "ERROR: " + toJson(e));
+ }
+ }
+};
diff --git a/src/scenario/Steps.js b/src/scenario/Steps.js
new file mode 100644
index 00000000..f8ac173f
--- /dev/null
+++ b/src/scenario/Steps.js
@@ -0,0 +1,57 @@
+angular.scenario.GIVEN = {
+ browser:function(){
+ var self = this;
+ if (jQuery.browser.safari && this.frame.attr('src') == this.at) {
+ this.window.location.reload();
+ } else {
+ this.frame.attr('src', this.at);
+ }
+ return function(done){
+ self.frame.load(function(){
+ self.frame.unbind();
+ done();
+ });
+ };
+ },
+ dataset:function(){
+ this.frame.name="$DATASET:" + toJson({dataset:this.dataset});
+ }
+};
+angular.scenario.WHEN = {
+ enter:function(){
+ var element = this.element(this.at);
+ element.attr('value', this.text);
+ element.change();
+ },
+ click:function(){
+ var element = this.element(this.at);
+ var input = element[0];
+ // emulate the browser behavior which causes it
+ // to be overridden at the end.
+ var checked = input.checked = !input.checked;
+ element.click();
+ input.checked = checked;
+ },
+ select:function(){
+ var element = this.element(this.at);
+ var path = "option[value=" + this.option + "]";
+ var option = this.assert(element.find(path));
+ option[0].selected = !option[0].selected;
+ element.change();
+ }
+};
+angular.scenario.THEN = {
+ text:function(){
+ var element = this.element(this.at);
+ if (typeof this.should_be != undefined ) {
+ var should_be = this.should_be;
+ if (_.isArray(this.should_be))
+ should_be = JSON.stringify(should_be);
+ if (element.text() != should_be)
+ throw "Expected " + should_be +
+ " but was " + element.text() + ".";
+ }
+ },
+ drainRequestQueue:function(){
+ }
+};
diff --git a/src/scenario/_namespace.js b/src/scenario/_namespace.js
new file mode 100644
index 00000000..7da3a5d8
--- /dev/null
+++ b/src/scenario/_namespace.js
@@ -0,0 +1,6 @@
+if (!angular) var angular = window['angular'] = {};
+if (!angular['scenario']) var angularScenario = angular['scenario'] = {};
+if (!angular['scenarioDef']) var scenarioDef = angular['scenarioDef'] = {};
+if (!angular['scenario']['GIVEN']) angularScenario['GIVEN'] = {};
+if (!angular['scenario']['WHEN']) angularScenario['WHEN'] = {};
+if (!angular['scenario']['THEN']) angularScenario['THEN'] = {};
diff --git a/src/scenario/bootstrap.js b/src/scenario/bootstrap.js
new file mode 100644
index 00000000..1d40b9d0
--- /dev/null
+++ b/src/scenario/bootstrap.js
@@ -0,0 +1,47 @@
+(function(onLoadDelegate){
+ var prefix = (function(){
+ var filename = /(.*\/)bootstrap.js(#(.*))?/;
+ var scripts = document.getElementsByTagName("script");
+ for(var j = 0; j < scripts.length; j++) {
+ var src = scripts[j].src;
+ if (src && src.match(filename)) {
+ var parts = src.match(filename);
+ return parts[1];
+ }
+ }
+ })();
+ function addScript(path) {
+ document.write('');
+ };
+ function addCSS(path) {
+ document.write('');
+ };
+ window.onload = function(){
+ if (!_.stepper) {
+ _.stepper = function(collection, iterator, done){
+ var keys = _.keys(collection);
+ function next() {
+ if (keys.length) {
+ var key = keys.shift();
+ iterator(next, collection[key], key);
+ } else {
+ (done||_.identity)();
+ }
+ }
+ next();
+ };
+ }
+ _.defer(function(){
+ new angular.scenario.SuiteRunner(angular.scenarioDef, jQuery(document.body)).run();
+ });
+ (onLoadDelegate||function(){})();
+ };
+ addCSS("../../css/angular-scenario.css");
+ addScript("../../lib/underscore/underscore.js");
+ addScript("../../lib/jquery/jquery-1.3.2.js");
+ addScript("../angular-bootstrap.js");
+ addScript("_namespace.js");
+ addScript("Steps.js");
+ addScript("Runner.js");
+})(window.onload);
+
diff --git a/src/test/Runner.js b/src/test/Runner.js
deleted file mode 100644
index c6684951..00000000
--- a/src/test/Runner.js
+++ /dev/null
@@ -1,162 +0,0 @@
-if (typeof test == 'undefined') test = {};
-
-test.ScenarioRunner = function(scenarios, body) {
- this.scenarios = scenarios;
- this.body = body;
-};
-
-test.ScenarioRunner.prototype = {
- run:function(){
- this.setUpUI();
- this.runScenarios();
- },
- setUpUI:function(){
- this.body.html(
- '
' +
- '' +
- '
' +
- '' +
- '' +
- '
');
- this.console = this.body.find(".console");
- this.testFrame = this.body.find("iframe");
- this.console.find(".run").live("click", function(){
- jQuery(this).parent().find('.log').toggle();
- });
- },
- runScenarios:function(){
- var runner = new test.Runner(this.console, this.testFrame);
- _.stepper(this.scenarios, function(next, scenario, name){
- new test.Scenario(name, scenario).run(runner, next);
- }, function(){
- }
- );
- }
-};
-
-test.Runner = function(console, frame){
- this.console = console;
- this.current = null;
- this.tests = [];
- this.frame = frame;
-};
-test.Runner.prototype = {
- start:function(name){
- var current = this.current = {
- name:name,
- start:new Date().getTime(),
- scenario:jQuery('')
- };
- current.run = current.scenario.append(
- '' +
- '.' +
- '.' +
- '.' +
- '').find(".run");
- current.log = current.scenario.append('').find(".log");
- current.run.find(".name").text(name);
- this.tests.push(current);
- this.console.append(current.scenario);
- },
- end:function(name){
- var current = this.current;
- var run = current.run;
- this.current = null;
- current.end = new Date().getTime();
- current.time = current.end - current.start;
- run.find(".time").text(current.time);
- run.find(".state").text(current.error ? "FAIL" : "PASS");
- run.addClass(current.error ? "fail" : "pass");
- if (current.error)
- run.find(".run").append('').text(current.error);
- current.scenario.find(".log").hide();
- },
- log:function(level) {
- var buf = [];
- for ( var i = 1; i < arguments.length; i++) {
- var arg = arguments[i];
- buf.push(typeof arg == "string" ?arg:toJson(arg));
- }
- var log = jQuery('');
- log.text(buf.join(" "));
- this.current.log.append(log);
- this.console.scrollTop(this.console[0].scrollHeight);
- if (level == "error")
- this.current.error = buf.join(" ");
- }
-};
-
-test.Scenario = function(name, scenario){
- this.name = name;
- this.scenario = scenario;
-};
-test.Scenario.prototype = {
- run:function(runner, callback) {
- var self = this;
- _.stepper(this.scenario, function(next, steps, name){
- if (name.charAt(0) == '$') {
- next();
- } else {
- runner.start(self.name + "::" + name);
- var allSteps = (self.scenario.$before||[]).concat(steps);
- _.stepper(allSteps, function(next, step){
- self.executeStep(runner, step, next);
- }, function(){
- runner.end();
- next();
- });
- }
- }, callback);
- },
- verb:function(step){
- var fn = null;
- if (!step) fn = function (){ throw "Step is null!"; };
- else if (step.Given) fn = angular.test.GIVEN[step.Given];
- else if (step.When) fn = angular.test.WHEN[step.When];
- else if (step.Then) fn = angular.test.THEN[step.Then];
- return fn || function (){
- throw "ERROR: Need Given/When/Then got: " + toJson(step);
- };
- },
- context: function(runner) {
- var frame = runner.frame;
- var window = frame[0].contentWindow;
- var document;
- if (window.jQuery)
- document = window.jQuery(window.document);
- var context = {
- frame:frame,
- window:window,
- log:_.bind(runner.log, runner, "info"),
- document:document,
- assert:function(element, path){
- if (element.size() != 1) {
- throw "Expected to find '1' found '"+
- element.size()+"' for '"+path+"'.";
- }
- return element;
- },
- element:function(path){
- var exp = path.replace("{{","[ng-bind=").replace("}}", "]");
- var element = document.find(exp);
- return context.assert(element, path);
- }
- };
- return context;
- },
- executeStep:function(runner, step, callback) {
- if (!step) {
- callback();
- return;
- }
- runner.log("info", toJson(step));
- var fn = this.verb(step);
- var context = this.context(runner);
- _.extend(context, step);
- try {
- (fn.call(context)||function(c){c();})(callback);
- } catch (e) {
- runner.log("error", "ERROR: " + toJson(e));
- }
- }
-};
diff --git a/src/test/Steps.js b/src/test/Steps.js
deleted file mode 100644
index cc9ff549..00000000
--- a/src/test/Steps.js
+++ /dev/null
@@ -1,57 +0,0 @@
-angular.test.GIVEN = {
- browser:function(){
- var self = this;
- if (jQuery.browser.safari && this.frame.attr('src') == this.at) {
- this.window.location.reload();
- } else {
- this.frame.attr('src', this.at);
- }
- return function(done){
- self.frame.load(function(){
- self.frame.unbind();
- done();
- });
- };
- },
- dataset:function(){
- this.frame.name="$DATASET:" + toJson({dataset:this.dataset});
- }
-};
-angular.test.WHEN = {
- enter:function(){
- var element = this.element(this.at);
- element.attr('value', this.text);
- element.change();
- },
- click:function(){
- var element = this.element(this.at);
- var input = element[0];
- // emulate the browser behavior which causes it
- // to be overridden at the end.
- var checked = input.checked = !input.checked;
- element.click();
- input.checked = checked;
- },
- select:function(){
- var element = this.element(this.at);
- var path = "option[value=" + this.option + "]";
- var option = this.assert(element.find(path));
- option[0].selected = !option[0].selected;
- element.change();
- }
-};
-angular.test.THEN = {
- text:function(){
- var element = this.element(this.at);
- if (typeof this.should_be != undefined ) {
- var should_be = this.should_be;
- if (_.isArray(this.should_be))
- should_be = JSON.stringify(should_be);
- if (element.text() != should_be)
- throw "Expected " + should_be +
- " but was " + element.text() + ".";
- }
- },
- drainRequestQueue:function(){
- }
-};
diff --git a/src/test/_namespace.js b/src/test/_namespace.js
deleted file mode 100644
index e29ae72a..00000000
--- a/src/test/_namespace.js
+++ /dev/null
@@ -1,5 +0,0 @@
-if (!angular) var angular = window['angular'] = {};
-if (!angular['test']) var angularTest = angular['test'] = {};
-if (!angular['test']['GIVEN']) angularTest['GIVEN'] = {};
-if (!angular['test']['WHEN']) angularTest['WHEN'] = {};
-if (!angular['test']['THEN']) angularTest['THEN'] = {};
--
cgit v1.2.3
From 923289112e34c2d426f6b2e687e93601894fb088 Mon Sep 17 00:00:00 2001
From: Adam Abrons
Date: Tue, 16 Mar 2010 10:30:26 -0700
Subject: spike on directives
---
src/directives.js | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 121 insertions(+)
create mode 100644 src/directives.js
(limited to 'src')
diff --git a/src/directives.js b/src/directives.js
new file mode 100644
index 00000000..0e99d633
--- /dev/null
+++ b/src/directives.js
@@ -0,0 +1,121 @@
+
+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]);
+ });
+ };
+});
+
+
+angular.directive("init", function(expression, element){
+ return function(){
+ this.$eval(expresssion);
+ }
+});
+
+
+//translation of {{ }} to ng-bind is external to this
+angular.directive("bind", function(expression, element){
+ return function() {
+ this.$watch(expression, function(value){
+ element.innerText = value;
+ });
+ };
+});
+
+
+// translation of {{ }} to ng-bind-attr is external to this
+// link
+// becomes
+// link
+angular.directive("bind-attr", function(expression, element){
+ var jElement = jQuery(element);
+ return function(){
+ this.$watch(expression, _(jElement.attr).bind(jElement));
+ };
+});
+
+angular.directive("repeat", function(expression, element){
+ var anchor = document.createComment(expression);
+ jQuery(element).replace(anchor);
+ var template = this.compile(element);
+ var lhs = "item";
+ var rhs = "items";
+ var children = [];
+ return function(){
+ this.$watch(rhs, function(items){
+ foreach(children, function(child){
+ child.element.remove();
+ });
+ foreach(items, function(item){
+ var child = template(item); // create scope
+ element.addChild(child.element, anchor);
+ children.push(child);
+ });
+ });
+ };
+});
+
+
+//ng-non-bindable
+angular.directive("non-bindable", function(expression, element){
+ return false;
+});
+
+//Styling
+//
+//ng-class
+//ng-class-odd, ng-class-even
+//ng-style
+//ng-show, ng-hide
+
+
+angular.directive("action", function(expression, element){
+ return function(){
+ var self = this;
+ jQuery(element).click(function(){
+ self.$eval(expression);
+ });
+ };
+});
+
+//ng-eval
+angular.directive("eval", function(expression, element){
+ return function(){
+ this.$onUpdate( expression);
+ }
+});
+//ng-watch
+//
+angular.directive("watch", function(expression, element){
+ var watches = {
+ 'lhs':'rhs'
+ }; // parse
+ return function(){
+ this.$watch(watches);
+ }
+});
+
+//widget related
+//ng-validate, ng-required, ng-formatter
+//ng-error
--
cgit v1.2.3
From 5119c8a86fa2b8ce9d0f0c343b57dd96aa88ce8c Mon Sep 17 00:00:00 2001
From: Adam Abrons
Date: Tue, 16 Mar 2010 13:50:47 -0700
Subject: spike widgets in new style
---
src/directives.js | 2 ++
src/widgets2.js | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 87 insertions(+)
create mode 100644 src/widgets2.js
(limited to 'src')
diff --git a/src/directives.js b/src/directives.js
index 0e99d633..13cd4b59 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -119,3 +119,5 @@ angular.directive("watch", function(expression, element){
//widget related
//ng-validate, ng-required, ng-formatter
//ng-error
+
+//ng-scope ng-controller????
diff --git a/src/widgets2.js b/src/widgets2.js
new file mode 100644
index 00000000..0d7bbd49
--- /dev/null
+++ b/src/widgets2.js
@@ -0,0 +1,85 @@
+// ->
+angular.widget("colorpicker", function(element) {
+ var name = element.attr('datasource');
+ var formatter = this.formatter(element.attr('ng-formatter'));
+
+ element.colorPicker(this.withScope(function(selectedColor){
+ this.$evalSet(name, formatter.parse(selectedColor));
+ }));
+
+ return function(){
+ this.$watch(expression, function(cmyk){
+ element.setColor(formatter.format(cmyk));
+ });
+ }
+});
+
+angular.widget("template", function(element) {
+ var srcExpression = element.attr('src');
+ var self = this;
+ return {watch:srcExpression, apply:function(src){
+ $.load(src, function(html){
+ self.destroy(element);
+ element.html(html);
+ self.compile(element);
+ });
+ }};
+});
+
+
+/**
+ *
+ * {
+ * withScope: //safely executes, with a try/catch. applies scope
+ * compile:
+ * widget:
+ * directive:
+ * validator:
+ * formatter:
+ *
+ *
+ * config:
+ * loadCSS:
+ * loadScript:
+ * loadTemplate:
+ * }
+ *
+ **/
--
cgit v1.2.3
From 2df072e3f89e8998b06b5a9e5ffb10fa32155136 Mon Sep 17 00:00:00 2001
From: Adam Abrons
Date: Tue, 16 Mar 2010 14:38:56 -0700
Subject: twitter using resources
---
src/Resource.js | 2 +-
src/angular-bootstrap.js | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Resource.js b/src/Resource.js
index c0c7934c..0ff46726 100644
--- a/src/Resource.js
+++ b/src/Resource.js
@@ -49,7 +49,7 @@ ResourceFactory.prototype = {
actions = $.extend({}, ResourceFactory.DEFAULT_ACTIONS, actions);
function extractParams(data){
var ids = {};
- foreach(paramDefaults, function(value, key){
+ foreach(paramDefaults || {}, function(value, key){
ids[key] = value.charAt && value.charAt(0) == '@' ? Scope.getter(data, value.substr(1)) : value;
});
return ids;
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index 0f7cd2ea..d2b2ff9c 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -46,6 +46,7 @@
addScript("/JSON.js");
addScript("/Model.js");
addScript("/Parser.js");
+ addScript("/Resource.js");
addScript("/Scope.js");
addScript("/Server.js");
addScript("/Users.js");
--
cgit v1.2.3
From c9aba8b442adce496f0600c88764f7ffcc166879 Mon Sep 17 00:00:00 2001
From: Adam Abrons
Date: Tue, 16 Mar 2010 14:48:11 -0700
Subject: make xhr just a method
---
src/Resource.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Resource.js b/src/Resource.js
index 0ff46726..587c331e 100644
--- a/src/Resource.js
+++ b/src/Resource.js
@@ -83,7 +83,7 @@ ResourceFactory.prototype = {
}
var value = action.isArray ? [] : new Resource(data);
- self.xhr.method(action.method, route.url($.extend({}, action.params || {}, extractParams(data), params)), data, function(response) {
+ self.xhr(action.method, route.url($.extend({}, action.params || {}, extractParams(data), params)), data, function(response) {
if (action.isArray) {
foreach(response, function(item){
value.push(new Resource(item));
--
cgit v1.2.3
From 7634a3ed5227f8bc2a2ba83752d0e2c78adb6051 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 18 Mar 2010 12:20:06 -0700
Subject: initial revision of new plugable compiler
---
src/Angular.js | 10 ++++++++--
src/DataStore.js | 32 ++++++++++++++++----------------
src/Resource.js | 4 ++--
src/Scope.js | 5 +++++
src/directives.js | 14 +++++++-------
5 files changed, 38 insertions(+), 27 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 9b3634be..39a6e91d 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -24,9 +24,14 @@ var consoleNode, msie,
jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
foreach = _.each,
extend = _.extend,
+ slice = Array.prototype.slice,
identity = _.identity,
angular = window['angular'] || (window['angular'] = {}),
angularValidator = angular['validator'] || (angular['validator'] = {}),
+ angularDirective = angular['directive'] || (angular['directive'] = function(name, fn){
+ if (fn) {angularDirective[name] = fn;};
+ return angularDirective[name];
+ }),
angularFilter = angular['filter'] || (angular['filter'] = {}),
angularFormatter = angular['formatter'] || (angular['formatter'] = {}),
angularCallbacks = angular['callbacks'] || (angular['callbacks'] = {}),
@@ -37,7 +42,7 @@ angular['copy'] = copy;
var isVisible = isVisible || function (element) {
return jQuery(element).is(":visible");
-}
+};
function log(a, b, c){
var console = window['console'];
@@ -154,12 +159,13 @@ function escapeAttr(html) {
}
function bind(_this, _function) {
+ var curryArgs = slice.call(arguments, 2, arguments.length);
if (!_this)
throw "Missing this";
if (!_.isFunction(_function))
throw "Missing function";
return function() {
- return _function.apply(_this, arguments);
+ return _function.apply(_this, curryArgs.concat(slice.call(arguments, 0, arguments.length)));
};
}
diff --git a/src/DataStore.js b/src/DataStore.js
index 789b8f71..70bcc623 100644
--- a/src/DataStore.js
+++ b/src/DataStore.js
@@ -29,7 +29,7 @@ DataStore.prototype = {
}
return cachedDocument;
},
-
+
load: function(instance, id, callback, failure) {
if (id && id !== '*') {
var self = this;
@@ -43,7 +43,7 @@ DataStore.prototype = {
}
return instance;
},
-
+
loadMany: function(entity, ids, callback) {
var self=this;
var list = [];
@@ -58,7 +58,7 @@ DataStore.prototype = {
});
return list;
},
-
+
loadOrCreate: function(instance, id, callback) {
var self=this;
return this.load(instance, id, callback, function(response){
@@ -70,7 +70,7 @@ DataStore.prototype = {
}
});
},
-
+
loadAll: function(entity, callback) {
var self = this;
var list = [];
@@ -89,7 +89,7 @@ DataStore.prototype = {
});
return list;
},
-
+
save: function(document, callback) {
var self = this;
var data = {};
@@ -109,7 +109,7 @@ DataStore.prototype = {
callback(document);
});
},
-
+
remove: function(document, callback) {
var self = this;
var data = {};
@@ -127,7 +127,7 @@ DataStore.prototype = {
(callback||noop)(response);
});
},
-
+
_jsonRequest: function(request, callback, failure) {
request['$$callback'] = callback;
request['$$failure'] = failure||function(response){
@@ -135,7 +135,7 @@ DataStore.prototype = {
};
this.bulkRequest.push(request);
},
-
+
flush: function() {
if (this.bulkRequest.length === 0) return;
var self = this;
@@ -169,7 +169,7 @@ DataStore.prototype = {
}
this.post(bulkRequest, callback);
},
-
+
saveScope: function(scope, callback) {
var saveCounter = 1;
function onSaveDone() {
@@ -186,7 +186,7 @@ DataStore.prototype = {
}
onSaveDone();
},
-
+
query: function(type, query, arg, callback){
var self = this;
var queryList = [];
@@ -205,7 +205,7 @@ DataStore.prototype = {
});
return queryList;
},
-
+
entities: function(callback) {
var entities = [];
var self = this;
@@ -218,7 +218,7 @@ DataStore.prototype = {
});
return entities;
},
-
+
documentCountsByUser: function(){
var counts = {};
var self = this;
@@ -227,7 +227,7 @@ DataStore.prototype = {
});
return counts;
},
-
+
userDocumentIdsByEntity: function(user){
var ids = {};
var self = this;
@@ -236,7 +236,7 @@ DataStore.prototype = {
});
return ids;
},
-
+
entity: function(name, defaults){
if (!name) {
return DataStore.NullEntity;
@@ -271,7 +271,7 @@ DataStore.prototype = {
});
return entity;
},
-
+
join: function(join){
function fn(){
throw "Joined entities can not be instantiated into a document.";
@@ -327,4 +327,4 @@ DataStore.prototype = {
};
return fn;
}
-};
\ No newline at end of file
+};
diff --git a/src/Resource.js b/src/Resource.js
index 587c331e..971ad6e5 100644
--- a/src/Resource.js
+++ b/src/Resource.js
@@ -79,7 +79,7 @@ ResourceFactory.prototype = {
case 1: if (isPost) data = a1; else params = a1; break;
case 0: break;
default:
- throw "Expected between 0-3 arguments [params, data, callback], got " + arguments.length + " arguments."
+ throw "Expected between 0-3 arguments [params, data, callback], got " + arguments.length + " arguments.";
}
var value = action.isArray ? [] : new Resource(data);
@@ -109,7 +109,7 @@ ResourceFactory.prototype = {
case 1: if (typeof a1 == 'function') callback = a1; else params = a1;
case 0: break;
default:
- throw "Expected between 1-3 arguments [params, data, callback], got " + arguments.length + " arguments."
+ throw "Expected between 1-3 arguments [params, data, callback], got " + arguments.length + " arguments.";
}
var self = this;
Resource[name](params, this, function(response){
diff --git a/src/Scope.js b/src/Scope.js
index daf4b36c..442477b4 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -10,6 +10,7 @@ function Scope(initialState, name) {
if (name == "ROOT") {
this.state['$root'] = this.state;
}
+ this.set('$watch', bind(this, this.addWatchListener));
};
Scope.expressionCache = {};
@@ -202,5 +203,9 @@ Scope.prototype = {
}
});
return fired;
+ },
+
+ apply: function(fn) {
+ fn.apply(this.state, slice(arguments, 0, arguments.length));
}
};
diff --git a/src/directives.js b/src/directives.js
index 0e99d633..7c5cc257 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -4,7 +4,7 @@ angular.directive("auth", function(expression, element){
if(expression == "eager") {
this.$users.fetchCurrent();
}
- }
+ };
});
@@ -30,7 +30,7 @@ angular.directive("entity", function(expression, element){
angular.directive("init", function(expression, element){
return function(){
this.$eval(expresssion);
- }
+ };
});
@@ -49,8 +49,8 @@ angular.directive("bind", function(expression, element){
// becomes
// link
angular.directive("bind-attr", function(expression, element){
- var jElement = jQuery(element);
- return function(){
+ return function(expression, element){
+ var jElement = jQuery(element);
this.$watch(expression, _(jElement.attr).bind(jElement));
};
});
@@ -58,7 +58,7 @@ angular.directive("bind-attr", function(expression, element){
angular.directive("repeat", function(expression, element){
var anchor = document.createComment(expression);
jQuery(element).replace(anchor);
- var template = this.compile(element);
+ var template = this.templetize(element);
var lhs = "item";
var rhs = "items";
var children = [];
@@ -103,7 +103,7 @@ angular.directive("action", function(expression, element){
angular.directive("eval", function(expression, element){
return function(){
this.$onUpdate( expression);
- }
+ };
});
//ng-watch
//
@@ -113,7 +113,7 @@ angular.directive("watch", function(expression, element){
}; // parse
return function(){
this.$watch(watches);
- }
+ };
});
//widget related
--
cgit v1.2.3
From df607da0d1b9726bce6584238fe3ad7e9b65a966 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 18 Mar 2010 14:43:49 -0700
Subject: support for templates
---
src/Scope.js | 15 +++++++++++----
src/directives.js | 8 ++++----
2 files changed, 15 insertions(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/Scope.js b/src/Scope.js
index 442477b4..3633f960 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -1,5 +1,6 @@
function Scope(initialState, name) {
this.widgets = [];
+ this.evals = [];
this.watchListeners = {};
this.name = name;
initialState = initialState || {};
@@ -11,6 +12,7 @@ function Scope(initialState, name) {
this.state['$root'] = this.state;
}
this.set('$watch', bind(this, this.addWatchListener));
+ this.set('$eval', bind(this, this.addEval));
};
Scope.expressionCache = {};
@@ -48,17 +50,23 @@ Scope.prototype = {
updateView: function() {
var self = this;
this.fireWatchers();
- _.each(this.widgets, function(widget){
+ 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
+ this.evals.push(fn);
+ },
+
isProperty: function(exp) {
for ( var i = 0; i < exp.length; i++) {
var ch = exp.charAt(i);
@@ -190,8 +198,7 @@ Scope.prototype = {
},
fireWatchers: function() {
- var self = this;
- var fired = false;
+ var self = this, fired = false;
foreach(this.watchListeners, function(watcher) {
var value = self.eval(watcher.expression);
if (value !== watcher.lastValue) {
@@ -206,6 +213,6 @@ Scope.prototype = {
},
apply: function(fn) {
- fn.apply(this.state, slice(arguments, 0, arguments.length));
+ fn.apply(this.state, slice.call(arguments, 1, arguments.length));
}
};
diff --git a/src/directives.js b/src/directives.js
index 7c5cc257..26cbfe2c 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -58,12 +58,12 @@ angular.directive("bind-attr", function(expression, element){
angular.directive("repeat", function(expression, element){
var anchor = document.createComment(expression);
jQuery(element).replace(anchor);
- var template = this.templetize(element);
+ var template = this.compile(element);
var lhs = "item";
var rhs = "items";
- var children = [];
return function(){
- this.$watch(rhs, function(items){
+ var children = [];
+ this.$eval(rhs, function(items){
foreach(children, function(child){
child.element.remove();
});
@@ -102,7 +102,7 @@ angular.directive("action", function(expression, element){
//ng-eval
angular.directive("eval", function(expression, element){
return function(){
- this.$onUpdate( expression);
+ this.$eval(expression);
};
});
//ng-watch
--
cgit v1.2.3
From c3eac13aa7106d099e8f09c39518051ccf939060 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 19 Mar 2010 16:41:02 -0700
Subject: showing off problem to corry
---
src/Compiler.js | 188 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 188 insertions(+)
create mode 100644 src/Compiler.js
(limited to 'src')
diff --git a/src/Compiler.js b/src/Compiler.js
new file mode 100644
index 00000000..f4d901fb
--- /dev/null
+++ b/src/Compiler.js
@@ -0,0 +1,188 @@
+/**
+ * Template provides directions an how to bind to a given element.
+ * It contains a list of init functions which need to be called to
+ * bind to a new instance of elements. It also provides a list
+ * of child paths which contain child templates
+ */
+function Template() {
+ this.paths = [];
+ this.children = [];
+ this.inits = [];
+}
+
+Template.prototype = {
+ init: function(element, scope) {
+ foreach(this.inits, function(fn) {
+ scope.apply(fn, nodeLite(element));
+ });
+
+ var i,
+ childNodes = element.childNodes,
+ children = this.children,
+ paths = this.paths,
+ length = paths.length;
+ for (i = 0; i < length; i++) {
+ children[i].init(childNodes[paths[i]], scope);
+ }
+ },
+
+ addInit:function(init) {
+ if (init) {
+ this.inits.push(init);
+ }
+ },
+
+ setExclusiveInit: function(init) {
+ this.inits = [init];
+ this.addInit = noop;
+ },
+
+
+ addChild: function(index, template) {
+ this.paths.push(index);
+ this.children.push(template);
+ }
+};
+
+///////////////////////////////////
+//NodeLite
+//////////////////////////////////
+
+function NodeLite(element) {
+ this.element = element;
+}
+
+function nodeLite(element) {
+ return element instanceof NodeLite ? element : new NodeLite(element);
+}
+
+NodeLite.prototype = {
+ eachTextNode: function(fn){
+ var i, chldNodes = this.element.childNodes || [], size = chldNodes.length, chld;
+ for (i = 0; i < size; i++) {
+ if((chld = new NodeLite(chldNodes[i])).isText()) {
+ fn(chld, i);
+ }
+ }
+ },
+
+ eachNode: function(fn){
+ var i, chldNodes = this.element.childNodes || [], size = chldNodes.length, chld;
+ for (i = 0; i < size; i++) {
+ if(!(chld = new NodeLite(chldNodes[i])).isText()) {
+ fn(chld, i);
+ }
+ }
+ },
+
+ eachAttribute: function(fn){
+ var i, attrs = this.element.attributes || [], size = attrs.length, chld, attr;
+ for (i = 0; i < size; i++) {
+ var attr = attrs[i];
+ fn(attr.name, attr.value);
+ }
+ },
+
+ replaceWith: function(replaceNode) {
+ this.element.parentNode.replaceChild(nodeLite(replaceNode).element, this.element);
+ },
+
+ removeAttribute: function(name) {
+ this.element.removeAttribute(name);
+ },
+
+ after: function(element) {
+ this.element.parentNode.insertBefore(element, this.element.nextSibling);
+ },
+
+ attr: function(name, value){
+ if (typeof value == 'undefined') {
+ return this.element.getAttribute(name);
+ } else {
+ this.element.setAttribute(name);
+ }
+ },
+
+ isText: function() { return this.element.nodeType == Node.TEXT_NODE; },
+ text: function() { return this.element.nodeValue; },
+ clone: function() { return nodeLite(this.element.cloneNode(true)); }
+};
+
+///////////////////////////////////
+//Compiler
+//////////////////////////////////
+
+function Compiler(markup, directives, widgets){
+ this.markup = markup;
+ this.directives = directives;
+ this.widgets = widgets;
+}
+
+DIRECTIVE = /^ng-(.*)$/;
+
+Compiler.prototype = {
+ compile: function(element) {
+ var template = this.templetize(nodeLite(element)) || new Template();
+ return function(element){
+ var scope = new Scope();
+ scope.element = element;
+ return {
+ scope: scope,
+ element:element,
+ init: bind(template, template.init, element, scope)
+ };
+ };
+ },
+
+ templetize: function(element){
+ var self = this,
+ markup = self.markup,
+ markupSize = markup.length,
+ directives = self.directives,
+ widgets = self.widgets,
+ recurse = true,
+ exclusive = false,
+ template;
+
+ // process markup for text nodes only
+ element.eachTextNode(function(textNode){
+ for (var i = 0, text = textNode.text(); i < markupSize; i++) {
+ markup[i].call(self, text, textNode, element);
+ }
+ });
+
+ // Process attributes/directives
+ element.eachAttribute(function(name, value){
+ var match = name.match(DIRECTIVE),
+ directive, init;
+ if (!exclusive && match) {
+ directive = directives[match[1]];
+ if (directive) {
+ init = directive.call(self, value, element);
+ template = template || new Template();
+ if (directive.exclusive) {
+ template.setExclusiveInit(init);
+ exclusive = true;
+ } else {
+ template.addInit(init);
+ }
+ recurse = recurse && init;
+ } else {
+ error("Directive '" + match[0] + "' is not recognized.");
+ }
+ }
+ });
+
+ // Process non text child nodes
+ if (recurse) {
+ element.eachNode(function(child, i){
+ var childTemplate = self.templetize(child);
+ if(childTemplate) {
+ template = template || new Template();
+ template.addChild(i, childTemplate);
+ }
+ });
+ }
+ return template;
+ }
+};
--
cgit v1.2.3
From f6664ed7f6f6dd1f4f9756f57611a316089149cb Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 19 Mar 2010 22:18:39 -0700
Subject: tests fixed, still missing widgets
---
src/Angular.js | 4 ++++
src/Compiler.js | 49 +++++++++++++++++++++++++++++--------------------
2 files changed, 33 insertions(+), 20 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 39a6e91d..8793274c 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -44,6 +44,10 @@ var isVisible = isVisible || function (element) {
return jQuery(element).is(":visible");
};
+function isDefined(value){
+ return typeof value !== 'undefined';
+}
+
function log(a, b, c){
var console = window['console'];
switch(arguments.length) {
diff --git a/src/Compiler.js b/src/Compiler.js
index f4d901fb..3c757dd0 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -26,21 +26,21 @@ Template.prototype = {
}
},
+
addInit:function(init) {
if (init) {
this.inits.push(init);
}
},
- setExclusiveInit: function(init) {
- this.inits = [init];
- this.addInit = noop;
- },
-
addChild: function(index, template) {
this.paths.push(index);
this.children.push(template);
+ },
+
+ empty: function() {
+ return this.inits.length == 0 && this.paths.length == 0;
}
};
@@ -92,19 +92,25 @@ NodeLite.prototype = {
},
after: function(element) {
- this.element.parentNode.insertBefore(element, this.element.nextSibling);
+ this.element.parentNode.insertBefore(nodeLite(element).element, this.element.nextSibling);
},
attr: function(name, value){
- if (typeof value == 'undefined') {
- return this.element.getAttribute(name);
+ if (isDefined(value)) {
+ this.element.setAttribute(name, value);
} else {
- this.element.setAttribute(name);
+ return this.element.getAttribute(name);
+ }
+ },
+
+ text: function(value) {
+ if (isDefined(value)) {
+ this.element.nodeValue = value;
}
+ return this.element.nodeValue;
},
isText: function() { return this.element.nodeType == Node.TEXT_NODE; },
- text: function() { return this.element.nodeValue; },
clone: function() { return nodeLite(this.element.cloneNode(true)); }
};
@@ -142,7 +148,8 @@ Compiler.prototype = {
widgets = self.widgets,
recurse = true,
exclusive = false,
- template;
+ directiveQueue = [],
+ template = new Template();
// process markup for text nodes only
element.eachTextNode(function(textNode){
@@ -154,35 +161,37 @@ Compiler.prototype = {
// Process attributes/directives
element.eachAttribute(function(name, value){
var match = name.match(DIRECTIVE),
- directive, init;
+ directive;
if (!exclusive && match) {
directive = directives[match[1]];
if (directive) {
- init = directive.call(self, value, element);
- template = template || new Template();
if (directive.exclusive) {
- template.setExclusiveInit(init);
exclusive = true;
- } else {
- template.addInit(init);
+ directiveQueue = [];
}
- recurse = recurse && init;
+ directiveQueue.push(bind(self, directive, value, element));
} else {
error("Directive '" + match[0] + "' is not recognized.");
}
}
});
+ // Execute directives
+ foreach(directiveQueue, function(directive){
+ var init = directive();
+ template.addInit(init);
+ recurse = recurse && init;
+ });
+
// Process non text child nodes
if (recurse) {
element.eachNode(function(child, i){
var childTemplate = self.templetize(child);
if(childTemplate) {
- template = template || new Template();
template.addChild(i, childTemplate);
}
});
}
- return template;
+ return template.empty() ? null : template;
}
};
--
cgit v1.2.3
From 84552f7f8ac3f39c4dbd7d946ae2938d63302840 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 22 Mar 2010 13:58:04 -0700
Subject: got few directives working
---
src/Angular.js | 37 ++++++++---
src/Compiler.js | 149 ++++++++++++++++++++++++++------------------
src/Parser.js | 107 +++++++++++++++----------------
src/Scope.js | 52 +++++++++++-----
src/directives.js | 124 +++++++++++++++++-------------------
src/directivesAngularCom.js | 29 +++++++++
6 files changed, 290 insertions(+), 208 deletions(-)
create mode 100644 src/directivesAngularCom.js
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 8793274c..cfffab04 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -18,23 +18,32 @@ if (typeof Node == 'undefined') {
}
function noop() {}
+function identity($) {return $;}
if (!window['console']) window['console']={'log':noop, 'error':noop};
+function extension(angular, name) {
+ var extPoint;
+ return angular[name] || (extPoint = angular[name] = function (name, fn, prop){
+ if (isDefined(fn)) {
+ extPoint[name] = extend(fn, prop || {});
+ }
+ return extPoint[name];
+ });
+}
+
var consoleNode, msie,
jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
foreach = _.each,
extend = _.extend,
slice = Array.prototype.slice,
- identity = _.identity,
angular = window['angular'] || (window['angular'] = {}),
- angularValidator = angular['validator'] || (angular['validator'] = {}),
- angularDirective = angular['directive'] || (angular['directive'] = function(name, fn){
- if (fn) {angularDirective[name] = fn;};
- return angularDirective[name];
- }),
- angularFilter = angular['filter'] || (angular['filter'] = {}),
- angularFormatter = angular['formatter'] || (angular['formatter'] = {}),
- angularCallbacks = angular['callbacks'] || (angular['callbacks'] = {}),
+ angularDirective = extension(angular, 'directive'),
+ angularMarkup = extension(angular, 'markup'),
+ angularWidget = extension(angular, 'widget'),
+ angularValidator = extension(angular, 'validator'),
+ angularFilter = extension(angular, 'filter'),
+ angularFormatter = extension(angular, 'formatter'),
+ angularCallbacks = extension(angular, 'callbacks'),
angularAlert = angular['alert'] || (angular['alert'] = function(){
log(arguments); window.alert.apply(window, arguments);
});
@@ -45,7 +54,15 @@ var isVisible = isVisible || function (element) {
};
function isDefined(value){
- return typeof value !== 'undefined';
+ return typeof value != 'undefined';
+}
+
+function isObject(value){
+ return typeof value == 'object';
+}
+
+function isFunction(value){
+ return typeof value == 'function';
}
function log(a, b, c){
diff --git a/src/Compiler.js b/src/Compiler.js
index 3c757dd0..5c650204 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -13,7 +13,7 @@ function Template() {
Template.prototype = {
init: function(element, scope) {
foreach(this.inits, function(fn) {
- scope.apply(fn, nodeLite(element));
+ scope.apply(fn, jqLite(element));
});
var i,
@@ -35,8 +35,10 @@ Template.prototype = {
addChild: function(index, template) {
- this.paths.push(index);
- this.children.push(template);
+ if (template) {
+ this.paths.push(index);
+ this.children.push(template);
+ }
},
empty: function() {
@@ -45,31 +47,37 @@ Template.prototype = {
};
///////////////////////////////////
-//NodeLite
+//JQLite
//////////////////////////////////
-function NodeLite(element) {
+function JQLite(element) {
this.element = element;
}
-function nodeLite(element) {
- return element instanceof NodeLite ? element : new NodeLite(element);
+function jqLite(element) {
+ if (typeof element == 'string') {
+ var div = document.createElement('div');
+ div.innerHTML = element;
+ element = div.childNodes[0];
+ }
+ return element instanceof JQLite ? element : new JQLite(element);
}
-NodeLite.prototype = {
+JQLite.prototype = {
eachTextNode: function(fn){
var i, chldNodes = this.element.childNodes || [], size = chldNodes.length, chld;
for (i = 0; i < size; i++) {
- if((chld = new NodeLite(chldNodes[i])).isText()) {
+ if((chld = new JQLite(chldNodes[i])).isText()) {
fn(chld, i);
}
}
},
+
eachNode: function(fn){
var i, chldNodes = this.element.childNodes || [], size = chldNodes.length, chld;
for (i = 0; i < size; i++) {
- if(!(chld = new NodeLite(chldNodes[i])).isText()) {
+ if(!(chld = new JQLite(chldNodes[i])).isText()) {
fn(chld, i);
}
}
@@ -84,34 +92,51 @@ NodeLite.prototype = {
},
replaceWith: function(replaceNode) {
- this.element.parentNode.replaceChild(nodeLite(replaceNode).element, this.element);
+ this.element.parentNode.replaceChild(jqLite(replaceNode).element, this.element);
},
- removeAttribute: function(name) {
+ remove: function() {
+ this.element.parentNode.removeChild(this.element);
+ },
+
+ removeAttr: function(name) {
this.element.removeAttribute(name);
},
after: function(element) {
- this.element.parentNode.insertBefore(nodeLite(element).element, this.element.nextSibling);
+ this.element.parentNode.insertBefore(jqLite(element).element, this.element.nextSibling);
},
attr: function(name, value){
- if (isDefined(value)) {
- this.element.setAttribute(name, value);
+ var e = this.element;
+ if (isObject(name)) {
+ foreach(name, function(value, name){
+ e.setAttribute(name, value);
+ });
+ } else if (isDefined(value)) {
+ e.setAttribute(name, value);
} else {
- return this.element.getAttribute(name);
+ return e.getAttribute(name);
}
},
text: function(value) {
if (isDefined(value)) {
- this.element.nodeValue = value;
+ this.element.textContent = value;
}
- return this.element.nodeValue;
+ return this.element.textContent;
},
+ html: function(value) {
+ if (isDefined(value)) {
+ this.element.innerHTML = value;
+ }
+ return this.element.innerHTML;
+ },
+
+ parent: function() { return jqLite(this.element.parentNode);},
isText: function() { return this.element.nodeType == Node.TEXT_NODE; },
- clone: function() { return nodeLite(this.element.cloneNode(true)); }
+ clone: function() { return jqLite(this.element.cloneNode(true)); }
};
///////////////////////////////////
@@ -124,14 +149,14 @@ function Compiler(markup, directives, widgets){
this.widgets = widgets;
}
-DIRECTIVE = /^ng-(.*)$/;
-
Compiler.prototype = {
- compile: function(element) {
- var template = this.templetize(nodeLite(element)) || new Template();
- return function(element){
- var scope = new Scope();
+ compile: function(rawElement) {
+ rawElement = jqLite(rawElement);
+ var template = this.templatize(rawElement) || new Template();
+ return function(element, parentScope){
+ var scope = new Scope(parentScope);
scope.element = element;
+ // todo return should be a scope with everything already set on it as element
return {
scope: scope,
element:element,
@@ -140,57 +165,57 @@ Compiler.prototype = {
};
},
- templetize: function(element){
+ templatize: function(element){
var self = this,
+ elementName = element.element.nodeName,
+ widgets = self.widgets,
+ widget = widgets[elementName],
markup = self.markup,
markupSize = markup.length,
directives = self.directives,
- widgets = self.widgets,
- recurse = true,
+ descend = true,
exclusive = false,
directiveQueue = [],
- template = new Template();
-
- // process markup for text nodes only
- element.eachTextNode(function(textNode){
- for (var i = 0, text = textNode.text(); i < markupSize; i++) {
- markup[i].call(self, text, textNode, element);
- }
- });
+ template = new Template(),
+ selfApi = {
+ compile: bind(self, self.compile),
+ reference:function(name) {return jqLite(document.createComment(name));},
+ descend: function(value){ if(isDefined(value)) descend = value; return descend;}
+ };
+
+ if (widget) {
+ template.addInit(widget.call(selfApi, element));
+ } else {
+ // process markup for text nodes only
+ element.eachTextNode(function(textNode){
+ for (var i = 0, text = textNode.text(); i < markupSize; i++) {
+ markup[i].call(selfApi, text, textNode, element);
+ }
+ });
- // Process attributes/directives
- element.eachAttribute(function(name, value){
- var match = name.match(DIRECTIVE),
- directive;
- if (!exclusive && match) {
- directive = directives[match[1]];
- if (directive) {
+ // Process attributes/directives
+ element.eachAttribute(function(name, value){
+ var directive = directives[name];
+ if (!exclusive && directive) {
if (directive.exclusive) {
exclusive = true;
directiveQueue = [];
}
- directiveQueue.push(bind(self, directive, value, element));
- } else {
- error("Directive '" + match[0] + "' is not recognized.");
+ directiveQueue.push(bind(selfApi, directive, value, element));
}
- }
- });
-
- // Execute directives
- foreach(directiveQueue, function(directive){
- var init = directive();
- template.addInit(init);
- recurse = recurse && init;
- });
+ });
- // Process non text child nodes
- if (recurse) {
- element.eachNode(function(child, i){
- var childTemplate = self.templetize(child);
- if(childTemplate) {
- template.addChild(i, childTemplate);
- }
+ // Execute directives
+ foreach(directiveQueue, function(directive){
+ template.addInit(directive());
});
+
+ // Process non text child nodes
+ if (descend) {
+ element.eachNode(function(child, i){
+ template.addChild(i, self.templatize(child));
+ });
+ }
}
return template.empty() ? null : template;
}
diff --git a/src/Parser.js b/src/Parser.js
index b59b21a7..c18a6250 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -40,7 +40,7 @@ Lexer.prototype = {
return false;
}
},
-
+
parse: function() {
var tokens = this.tokens;
var OPERATORS = Lexer.OPERATORS;
@@ -103,22 +103,22 @@ Lexer.prototype = {
}
return tokens;
},
-
+
isNumber: function(ch) {
return '0' <= ch && ch <= '9';
},
-
+
isWhitespace: function(ch) {
return ch == ' ' || ch == '\r' || ch == '\t' ||
ch == '\n' || ch == '\v';
},
-
+
isIdent: function(ch) {
return 'a' <= ch && ch <= 'z' ||
'A' <= ch && ch <= 'Z' ||
'_' == ch || ch == '$';
},
-
+
readNumber: function() {
var number = "";
var start = this.index;
@@ -135,7 +135,7 @@ Lexer.prototype = {
this.tokens.push({index:start, text:number,
fn:function(){return number;}});
},
-
+
readIdent: function() {
var ident = "";
var start = this.index;
@@ -157,15 +157,17 @@ Lexer.prototype = {
}
this.tokens.push({index:start, text:ident, fn:fn});
},
-
+
readString: function(quote) {
var start = this.index;
var dateParseLength = this.dateParseLength;
this.index++;
var string = "";
+ var rawString = quote;
var escape = false;
while (this.index < this.text.length) {
var ch = this.text.charAt(this.index);
+ rawString += ch;
if (escape) {
if (ch == 'u') {
var hex = this.text.substring(this.index + 1, this.index + 5);
@@ -184,7 +186,7 @@ Lexer.prototype = {
escape = true;
} else if (ch == quote) {
this.index++;
- this.tokens.push({index:start, text:string,
+ this.tokens.push({index:start, text:rawString, string:string,
fn:function(){
return (string.length == dateParseLength) ?
angular['String']['toDate'](string) : string;
@@ -199,7 +201,7 @@ Lexer.prototype = {
this.text.substring(start) + "] starting at column '" +
(start+1) + "' in expression '" + this.text + "'.";
},
-
+
readRegexp: function(quote) {
var start = this.index;
this.index++;
@@ -249,18 +251,18 @@ Parser.ZERO = function(){
Parser.prototype = {
error: function(msg, token) {
- throw "Token '" + token.text +
- "' is " + msg + " at column='" +
- (token.index + 1) + "' of expression '" +
+ throw "Token '" + token.text +
+ "' is " + msg + " at column='" +
+ (token.index + 1) + "' of expression '" +
this.text + "' starting at '" + this.text.substring(token.index) + "'.";
},
-
+
peekToken: function() {
- if (this.tokens.length === 0)
+ if (this.tokens.length === 0)
throw "Unexpected end of expression: " + this.text;
return this.tokens[0];
},
-
+
peek: function(e1, e2, e3, e4) {
var tokens = this.tokens;
if (tokens.length > 0) {
@@ -273,7 +275,7 @@ Parser.prototype = {
}
return false;
},
-
+
expect: function(e1, e2, e3, e4){
var token = this.peek(e1, e2, e3, e4);
if (token) {
@@ -283,7 +285,7 @@ Parser.prototype = {
}
return false;
},
-
+
consume: function(e1){
if (!this.expect(e1)) {
var token = this.peek();
@@ -293,30 +295,30 @@ Parser.prototype = {
this.text.substring(token.index) + "'.";
}
},
-
+
_unary: function(fn, right) {
return function(self) {
return fn(self, right(self));
};
},
-
+
_binary: function(left, fn, right) {
return function(self) {
return fn(self, left(self), right(self));
};
},
-
+
hasTokens: function () {
return this.tokens.length > 0;
},
-
+
assertAllConsumed: function(){
if (this.tokens.length !== 0) {
throw "Did not understand '" + this.text.substring(this.tokens[0].index) +
"' while evaluating '" + this.text + "'.";
}
},
-
+
statements: function(){
var statements = [];
while(true) {
@@ -335,7 +337,7 @@ Parser.prototype = {
}
}
},
-
+
filterChain: function(){
var left = this.expression();
var token;
@@ -347,15 +349,15 @@ Parser.prototype = {
}
}
},
-
+
filter: function(){
return this._pipeFunction(angularFilter);
},
-
+
validator: function(){
return this._pipeFunction(angularValidator);
},
-
+
_pipeFunction: function(fnScope){
var fn = this.functionIdent(fnScope);
var argsFn = [];
@@ -373,7 +375,7 @@ Parser.prototype = {
var _this = this;
foreach(self, function(v, k) {
if (k.charAt(0) == '$') {
- _this[k] = v;
+ _this[k] = v;
}
});
};
@@ -386,11 +388,11 @@ Parser.prototype = {
}
}
},
-
+
expression: function(){
return this.throwStmt();
},
-
+
throwStmt: function(){
if (this.expect('throw')) {
var throwExp = this.assignment();
@@ -401,7 +403,7 @@ Parser.prototype = {
return this.assignment();
}
},
-
+
assignment: function(){
var left = this.logicalOR();
var token;
@@ -417,7 +419,7 @@ Parser.prototype = {
return left;
}
},
-
+
logicalOR: function(){
var left = this.logicalAND();
var token;
@@ -429,7 +431,7 @@ Parser.prototype = {
}
}
},
-
+
logicalAND: function(){
var left = this.equality();
var token;
@@ -438,7 +440,7 @@ Parser.prototype = {
}
return left;
},
-
+
equality: function(){
var left = this.relational();
var token;
@@ -447,7 +449,7 @@ Parser.prototype = {
}
return left;
},
-
+
relational: function(){
var left = this.additive();
var token;
@@ -456,7 +458,7 @@ Parser.prototype = {
}
return left;
},
-
+
additive: function(){
var left = this.multiplicative();
var token;
@@ -465,7 +467,7 @@ Parser.prototype = {
}
return left;
},
-
+
multiplicative: function(){
var left = this.unary();
var token;
@@ -474,7 +476,7 @@ Parser.prototype = {
}
return left;
},
-
+
unary: function(){
var token;
if (this.expect('+')) {
@@ -487,7 +489,7 @@ Parser.prototype = {
return this.primary();
}
},
-
+
functionIdent: function(fnScope) {
var token = this.expect();
var element = token.text.split('.');
@@ -504,7 +506,7 @@ Parser.prototype = {
}
return instance;
},
-
+
primary: function() {
var primary;
if (this.expect('(')) {
@@ -540,7 +542,7 @@ Parser.prototype = {
}
return primary;
},
-
+
closure: function(hasArgs) {
var args = [];
if (hasArgs) {
@@ -566,7 +568,7 @@ Parser.prototype = {
};
};
},
-
+
fieldAccess: function(object) {
var field = this.expect().text;
var fn = function (self){
@@ -575,7 +577,7 @@ Parser.prototype = {
fn.isAssignable = field;
return fn;
},
-
+
objectIndex: function(obj) {
var indexFn = this.expression();
this.consume(']');
@@ -592,7 +594,7 @@ Parser.prototype = {
};
}
},
-
+
functionCall: function(fn) {
var argsFn = [];
if (this.peekToken().text != ')') {
@@ -614,7 +616,7 @@ Parser.prototype = {
}
};
},
-
+
// This is used with json array declaration
arrayDeclaration: function () {
var elementFns = [];
@@ -632,12 +634,13 @@ Parser.prototype = {
return array;
};
},
-
+
object: function () {
var keyValues = [];
if (this.peekToken().text != '}') {
do {
- var key = this.expect().text;
+ var token = this.expect(),
+ key = token.string || token.text;
this.consume(":");
var value = this.expression();
keyValues.push({key:key, value:value});
@@ -654,7 +657,7 @@ Parser.prototype = {
return object;
};
},
-
+
entityDeclaration: function () {
var decl = [];
while(this.hasTokens()) {
@@ -671,7 +674,7 @@ Parser.prototype = {
return code;
};
},
-
+
entityDecl: function () {
var entity = this.expect().text;
var instance;
@@ -690,16 +693,16 @@ Parser.prototype = {
var document = Entity();
document['$$anchor'] = instance;
self.scope.set(instance, document);
- return "$anchor." + instance + ":{" +
+ return "$anchor." + instance + ":{" +
instance + "=" + entity + ".load($anchor." + instance + ");" +
- instance + ".$$anchor=" + angular['String']['quote'](instance) + ";" +
+ instance + ".$$anchor=" + angular['String']['quote'](instance) + ";" +
"};";
} else {
return "";
}
};
},
-
+
watch: function () {
var decl = [];
while(this.hasTokens()) {
@@ -716,7 +719,7 @@ Parser.prototype = {
}
};
},
-
+
watchDecl: function () {
var anchorName = this.expect().text;
this.consume(":");
diff --git a/src/Scope.js b/src/Scope.js
index 3633f960..d22604fd 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -1,18 +1,23 @@
function Scope(initialState, name) {
- this.widgets = [];
- this.evals = [];
- this.watchListeners = {};
- this.name = name;
+ var self = this;
+ self.widgets = [];
+ self.evals = [];
+ self.watchListeners = {};
+ self.name = name;
initialState = initialState || {};
var State = function(){};
State.prototype = initialState;
- this.state = new State();
- this.state['$parent'] = initialState;
+ self.state = new State();
+ extend(self.state, {
+ '$parent': initialState,
+ '$watch': bind(self, self.addWatchListener),
+ '$eval': bind(self, self.eval),
+ // change name to onEval?
+ '$addEval': bind(self, self.addEval)
+ });
if (name == "ROOT") {
- this.state['$root'] = this.state;
+ self.state['$root'] = self.state;
}
- this.set('$watch', bind(this, this.addWatchListener));
- this.set('$eval', bind(this, this.addEval));
};
Scope.expressionCache = {};
@@ -47,6 +52,7 @@ Scope.getter = function(instance, path) {
};
Scope.prototype = {
+ // TODO: rename to update? or eval?
updateView: function() {
var self = this;
this.fireWatchers();
@@ -64,7 +70,13 @@ Scope.prototype = {
addEval: function(fn, listener) {
// todo: this should take a function/string and a listener
- this.evals.push(fn);
+ // todo: this is a hack, which will need to be cleaned up.
+ var self = this,
+ listenFn = listener || noop,
+ expr = bind(self, self.compile(fn), {scope: self, self: self.state});
+ this.evals.push(function(){
+ self.apply(listenFn, expr());
+ });
},
isProperty: function(exp) {
@@ -103,15 +115,21 @@ Scope.prototype = {
this.eval(expressionText + "=" + toJson(value));
},
- eval: function(expressionText, context) {
-// log('Scope.eval', expressionText);
- var expression = Scope.expressionCache[expressionText];
- if (!expression) {
- var parser = new Parser(expressionText);
- expression = parser.statements();
+ compile: function(exp) {
+ if (isFunction(exp)) return exp;
+ var expFn = Scope.expressionCache[exp];
+ if (!expFn) {
+ var parser = new Parser(exp);
+ expFn = parser.statements();
parser.assertAllConsumed();
- Scope.expressionCache[expressionText] = expression;
+ Scope.expressionCache[exp] = expFn;
}
+ return expFn;
+ },
+
+ eval: function(expressionText, context) {
+// log('Scope.eval', expressionText);
+ var expression = this.compile(expressionText);
context = context || {};
context.scope = this;
context.self = this.state;
diff --git a/src/directives.js b/src/directives.js
index 26cbfe2c..66a5e864 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -1,86 +1,82 @@
-
-angular.directive("auth", function(expression, element){
+angularDirective("ng-init", function(expression){
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]);
- });
+ this.$eval(expression);
};
});
-
-angular.directive("init", function(expression, element){
+angularDirective("ng-eval", function(expression){
return function(){
- this.$eval(expresssion);
+ this.$addEval(expression);
};
});
-
-//translation of {{ }} to ng-bind is external to this
-angular.directive("bind", function(expression, element){
- return function() {
+angular.directive("ng-bind", function(expression){
+ return function(element) {
this.$watch(expression, function(value){
- element.innerText = value;
+ element.text(value);
});
};
});
-
-// translation of {{ }} to ng-bind-attr is external to this
-// link
-// becomes
-// link
-angular.directive("bind-attr", function(expression, element){
- return function(expression, element){
- var jElement = jQuery(element);
- this.$watch(expression, _(jElement.attr).bind(jElement));
+angular.directive("ng-bind-attr", function(expression){
+ return function(element){
+ this.$watch(expression, bind(element, element.attr));
};
});
-angular.directive("repeat", function(expression, element){
- var anchor = document.createComment(expression);
- jQuery(element).replace(anchor);
- var template = this.compile(element);
- var lhs = "item";
- var rhs = "items";
+angular.directive("ng-non-bindable", function(){
+ this.descend(false);
+});
+
+angular.directive("ng-repeat", function(expression, element){
+ var reference = this.reference("ng-repeat: " + expression),
+ r = element.removeAttr('ng-repeat'),
+ template = this.compile(element),
+ path = expression.split(' in '),
+ lhs = path[0],
+ rhs = path[1];
+ var parent = element.parent();
+ element.replaceWith(reference);
return function(){
- var children = [];
- this.$eval(rhs, function(items){
- foreach(children, function(child){
- child.element.remove();
- });
- foreach(items, function(item){
- var child = template(item); // create scope
- element.addChild(child.element, anchor);
- children.push(child);
+ var children = [],
+ currentScope = this;
+ this.$addEval(rhs, function(items){
+ var index = 0, childCount = children.length, childScope, lastElement = reference;
+ foreach(items, function(value, key){
+ if (index < childCount) {
+ // reuse existing child
+ childScope = children[index];
+ } else {
+ // grow children
+ childScope = template(element.clone(), currentScope);
+ childScope.init();
+ childScope.scope.set('$index', index);
+ childScope.element.attr('ng-index', index);
+ lastElement.after(childScope.element);
+ children.push(childScope);
+ }
+ childScope.scope.set(lhs, value);
+ childScope.scope.updateView();
+ lastElement = childScope.element;
+ index ++;
});
+ // shrink children
+ while(children.length > index) {
+ children.pop().element.remove();
+ }
});
};
-});
+}, {exclusive: true});
+
+
+/////////////////////////////////////////
+/////////////////////////////////////////
+/////////////////////////////////////////
+/////////////////////////////////////////
+/////////////////////////////////////////
+
-//ng-non-bindable
-angular.directive("non-bindable", function(expression, element){
- return false;
-});
//Styling
//
@@ -99,12 +95,6 @@ angular.directive("action", function(expression, element){
};
});
-//ng-eval
-angular.directive("eval", function(expression, element){
- return function(){
- this.$eval(expression);
- };
-});
//ng-watch
//
angular.directive("watch", function(expression, element){
diff --git a/src/directivesAngularCom.js b/src/directivesAngularCom.js
new file mode 100644
index 00000000..84032bdd
--- /dev/null
+++ b/src/directivesAngularCom.js
@@ -0,0 +1,29 @@
+
+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]);
+ });
+ };
+});
+
+
--
cgit v1.2.3
From b4561ff951ff452e55e820f6f8344dc2668cfd90 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 22 Mar 2010 15:46:34 -0700
Subject: ng-repeat works
---
src/Angular.js | 25 +++++++++++++++++++++----
src/Compiler.js | 16 +++++++++++++++-
src/directives.js | 36 +++++++++++++++++++++++++-----------
3 files changed, 61 insertions(+), 16 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index cfffab04..1549e7a7 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -181,15 +181,32 @@ function escapeAttr(html) {
function bind(_this, _function) {
var curryArgs = slice.call(arguments, 2, arguments.length);
- if (!_this)
- throw "Missing this";
- if (!_.isFunction(_function))
- throw "Missing function";
return function() {
return _function.apply(_this, curryArgs.concat(slice.call(arguments, 0, arguments.length)));
};
}
+function bindTry(_this, _function) {
+ var args = arguments,
+ last = args.length - 1,
+ curryArgs = slice.call(args, 2, last),
+ exceptionHandler = args[last];
+ return function() {
+ try {
+ return _function.apply(_this, curryArgs.concat(slice.call(arguments, 0, arguments.length)));
+ } catch (e) {
+ if (e = exceptionHandler(e)) throw e;
+ }
+ };
+}
+
+function errorHandlerFor(element) {
+ return function(error){
+ element.attr('ng-error', angular.toJson(error));
+ element.addClass('ng-exception');
+ };
+}
+
function outerHTML(node) {
var temp = document.createElement('div');
temp.appendChild(node);
diff --git a/src/Compiler.js b/src/Compiler.js
index 5c650204..ece44805 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -107,6 +107,20 @@ JQLite.prototype = {
this.element.parentNode.insertBefore(jqLite(element).element, this.element.nextSibling);
},
+ hasClass: function(selector) {
+ var className = " " + selector + " ";
+ if ( (" " + this.element.className + " ").replace(/[\n\t]/g, " ").indexOf( className ) > -1 ) {
+ return true;
+ }
+ return false;
+ },
+
+ addClass: function( selector ) {
+ if (!this.hasClass(selector)) {
+ this.element.className += ' ' + selector;
+ }
+ },
+
attr: function(name, value){
var e = this.element;
if (isObject(name)) {
@@ -201,7 +215,7 @@ Compiler.prototype = {
exclusive = true;
directiveQueue = [];
}
- directiveQueue.push(bind(selfApi, directive, value, element));
+ directiveQueue.push(bindTry(selfApi, directive, value, element, errorHandlerFor(element)));
}
});
diff --git a/src/directives.js b/src/directives.js
index 66a5e864..8047cdbd 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -10,7 +10,7 @@ angularDirective("ng-eval", function(expression){
};
});
-angular.directive("ng-bind", function(expression){
+angularDirective("ng-bind", function(expression){
return function(element) {
this.$watch(expression, function(value){
element.text(value);
@@ -18,23 +18,36 @@ angular.directive("ng-bind", function(expression){
};
});
-angular.directive("ng-bind-attr", function(expression){
+angularDirective("ng-bind-attr", function(expression){
return function(element){
this.$watch(expression, bind(element, element.attr));
};
});
-angular.directive("ng-non-bindable", function(){
+angularDirective("ng-non-bindable", function(){
this.descend(false);
});
-angular.directive("ng-repeat", function(expression, element){
+angularDirective("ng-repeat", function(expression, element){
var reference = this.reference("ng-repeat: " + expression),
r = element.removeAttr('ng-repeat'),
template = this.compile(element),
- path = expression.split(' in '),
- lhs = path[0],
- rhs = path[1];
+ match = expression.match(/^\s*(.+)\s+in\s+(.*)\s*$/),
+ lhs, rhs, valueIdent, keyIdent;
+ if (! match) {
+ throw "Expected ng-repeat in form of 'item in collection' but got '" +
+ expression + "'.";
+ }
+ lhs = match[1];
+ rhs = match[2];
+ match = lhs.match(/^([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\)$/);
+ if (!match) {
+ throw "'item' in 'item in collection' should be identifier or (key, value) but got '" +
+ keyValue + "'.";
+ }
+ valueIdent = match[3] || match[1];
+ keyIdent = match[2];
+
var parent = element.parent();
element.replaceWith(reference);
return function(){
@@ -42,7 +55,7 @@ angular.directive("ng-repeat", function(expression, element){
currentScope = this;
this.$addEval(rhs, function(items){
var index = 0, childCount = children.length, childScope, lastElement = reference;
- foreach(items, function(value, key){
+ foreach(items || [], function(value, key){
if (index < childCount) {
// reuse existing child
childScope = children[index];
@@ -55,7 +68,8 @@ angular.directive("ng-repeat", function(expression, element){
lastElement.after(childScope.element);
children.push(childScope);
}
- childScope.scope.set(lhs, value);
+ childScope.scope.set(valueIdent, value);
+ if (keyIdent) childScope.scope.set(keyIdent, key);
childScope.scope.updateView();
lastElement = childScope.element;
index ++;
@@ -86,7 +100,7 @@ angular.directive("ng-repeat", function(expression, element){
//ng-show, ng-hide
-angular.directive("action", function(expression, element){
+angularDirective("action", function(expression, element){
return function(){
var self = this;
jQuery(element).click(function(){
@@ -97,7 +111,7 @@ angular.directive("action", function(expression, element){
//ng-watch
//
-angular.directive("watch", function(expression, element){
+angularDirective("watch", function(expression, element){
var watches = {
'lhs':'rhs'
}; // parse
--
cgit v1.2.3
From 6f8276a8e3735396999bd158005ca86bb1bb0978 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 22 Mar 2010 16:07:42 -0700
Subject: ng-watch directive
---
src/Scope.js | 4 ++++
src/directives.js | 22 +++++++++++-----------
2 files changed, 15 insertions(+), 11 deletions(-)
(limited to 'src')
diff --git a/src/Scope.js b/src/Scope.js
index d22604fd..7b1d2673 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -207,6 +207,10 @@ Scope.prototype = {
},
addWatchListener: function(watchExpression, listener) {
+ // TODO: clean me up!
+ if (!isFunction(listener)) {
+ listener = bind(this, this.compile(listener), {scope: this, self: this.state});
+ }
var watcher = this.watchListeners[watchExpression];
if (!watcher) {
watcher = {listeners:[], expression:watchExpression};
diff --git a/src/directives.js b/src/directives.js
index 861805fe..e081d179 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -82,6 +82,17 @@ angularDirective("ng-repeat", function(expression, element){
};
}, {exclusive: true});
+angularDirective("ng-watch", function(expression, element){
+ var match = expression.match(/^([^.]*):(.*)$/);
+ if (!match) {
+ throw "Expecting watch expression 'ident_to_watch: watch_statement' got '"
+ + expression + "'";
+ }
+ return function(){
+ this.$watch(match[1], match[2]);
+ };
+});
+
/////////////////////////////////////////
/////////////////////////////////////////
@@ -109,17 +120,6 @@ angularDirective("action", function(expression, element){
};
});
-//ng-watch
-//
-angularDirective("watch", function(expression, element){
- var watches = {
- 'lhs':'rhs'
- }; // parse
- return function(){
- this.$watch(watches);
- };
-});
-
//widget related
//ng-validate, ng-required, ng-formatter
//ng-error
--
cgit v1.2.3
From 7c87c17d08dbba318af1a149c0bbedb696b03458 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 22 Mar 2010 18:20:49 -0700
Subject: upgraded jquery to 1.4.2 and made ng-action work with jquery
---
src/directives.js | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
(limited to 'src')
diff --git a/src/directives.js b/src/directives.js
index e081d179..9f98badb 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -82,6 +82,15 @@ angularDirective("ng-repeat", function(expression, element){
};
}, {exclusive: true});
+angularDirective("ng-action", function(expression, element){
+ return function(){
+ var self = this;
+ jQuery(element.element).click(function(){
+ self.$eval(expression);
+ });
+ };
+});
+
angularDirective("ng-watch", function(expression, element){
var match = expression.match(/^([^.]*):(.*)$/);
if (!match) {
@@ -93,6 +102,12 @@ angularDirective("ng-watch", function(expression, element){
};
});
+//Styling
+//
+//ng-class
+//ng-class-odd, ng-class-even
+//ng-style
+//ng-show, ng-hide
/////////////////////////////////////////
/////////////////////////////////////////
@@ -103,22 +118,6 @@ angularDirective("ng-watch", function(expression, element){
-//Styling
-//
-//ng-class
-//ng-class-odd, ng-class-even
-//ng-style
-//ng-show, ng-hide
-
-
-angularDirective("action", function(expression, element){
- return function(){
- var self = this;
- jQuery(element).click(function(){
- self.$eval(expression);
- });
- };
-});
//widget related
//ng-validate, ng-required, ng-formatter
--
cgit v1.2.3
From a8227086748e37c31c1bb71dec50c96d63c45eef Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 22 Mar 2010 20:20:05 -0700
Subject: rudementary event bind and trigger for jqlite
---
src/Compiler.js | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/Scope.js | 19 +++++------
src/directives.js | 2 +-
3 files changed, 105 insertions(+), 10 deletions(-)
(limited to 'src')
diff --git a/src/Compiler.js b/src/Compiler.js
index ece44805..115ed094 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -50,7 +50,39 @@ Template.prototype = {
//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 removeEventListener = window.document.detachEvent ?
+ function(element, type, fn) {
+ element.detachEvent('on' + type, fn);
+ } : function(element, type, fn) {
+ element.removeEventListener(type, fn, false);
+ };
+
+function jqClearData(element) {
+ var cacheId = element[jqName],
+ cache = jqCache[cacheId];
+ if (cache) {
+ foreach(cache.bind || {}, function(fn, type){
+ removeEventListener(element, type, fn);
+ });
+ delete jqCache[cacheId];
+ delete element[jqName];
+ }
+};
+
function JQLite(element) {
+ //todo: change to this[0];
this.element = element;
}
@@ -64,6 +96,67 @@ function jqLite(element) {
}
JQLite.prototype = {
+ data: function(key, value) {
+ var element = this.element,
+ cacheId = element[jqName],
+ cache = jqCache[cacheId || -1];
+ if (isDefined(value)) {
+ if (!cache) {
+ element[jqName] = cacheId = jqNextId();
+ cache = jqCache[cacheId] = {};
+ }
+ cache[key] = value;
+ } else {
+ return cache ? cache[key] : null;
+ }
+ },
+
+ removeData: function(){
+ jqClearData(this.element);
+ },
+
+ dealoc: function(){
+ (function dealoc(element){
+ jqClearData(element);
+ for ( var i = 0, children = element.childNodes; i < children.length; i++) {
+ dealoc(children[0]);
+ }
+ })(this.element);
+ },
+
+ bind: function(type, fn){
+ var element = this.element,
+ bind = this.data('bind'),
+ eventHandler;
+ if (!bind) this.data('bind', bind = {});
+ eventHandler = bind[type];
+ if (!eventHandler) {
+ bind[type] = eventHandler = function() {
+ var self = this;
+ foreach(eventHandler.fns, function(fn){
+ fn.apply(self, arguments);
+ });
+ };
+ eventHandler.fns = [];
+ addEventListener(element, type, eventHandler);
+ }
+ eventHandler.fns.push(fn);
+ },
+
+ trigger: function(type) {
+ var cache = this.data('bind');
+ if (cache) {
+ (cache[type] || noop)();
+ }
+ },
+
+ click: function(fn) {
+ if (fn)
+ this.bind('click', fn);
+ else
+ this.trigger('click');
+ },
+
eachTextNode: function(fn){
var i, chldNodes = this.element.childNodes || [], size = chldNodes.length, chld;
for (i = 0; i < size; i++) {
@@ -96,6 +189,7 @@ JQLite.prototype = {
},
remove: function() {
+ this.dealoc();
this.element.parentNode.removeChild(this.element);
},
diff --git a/src/Scope.js b/src/Scope.js
index 7b1d2673..a3e128b6 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -73,7 +73,7 @@ Scope.prototype = {
// todo: this is a hack, which will need to be cleaned up.
var self = this,
listenFn = listener || noop,
- expr = bind(self, self.compile(fn), {scope: self, self: self.state});
+ expr = self.compile(fn);
this.evals.push(function(){
self.apply(listenFn, expr());
});
@@ -117,23 +117,24 @@ Scope.prototype = {
compile: function(exp) {
if (isFunction(exp)) return exp;
- var expFn = Scope.expressionCache[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 expFn;
+ return function(context){
+ context = context || {};
+ context.self = self.state;
+ context.scope = self;
+ return expFn.call(self, context);
+ };
},
eval: function(expressionText, context) {
// log('Scope.eval', expressionText);
- var expression = this.compile(expressionText);
- context = context || {};
- context.scope = this;
- context.self = this.state;
- return expression(context);
+ return this.compile(expressionText)(context);
},
//TODO: Refactor. This function needs to be an execution closure for widgets
@@ -209,7 +210,7 @@ Scope.prototype = {
addWatchListener: function(watchExpression, listener) {
// TODO: clean me up!
if (!isFunction(listener)) {
- listener = bind(this, this.compile(listener), {scope: this, self: this.state});
+ listener = this.compile(listener);
}
var watcher = this.watchListeners[watchExpression];
if (!watcher) {
diff --git a/src/directives.js b/src/directives.js
index 9f98badb..adcfa508 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -85,7 +85,7 @@ angularDirective("ng-repeat", function(expression, element){
angularDirective("ng-action", function(expression, element){
return function(){
var self = this;
- jQuery(element.element).click(function(){
+ element.click(function(){
self.$eval(expression);
});
};
--
cgit v1.2.3
From 6ff550cfa9524bbb124d10caf1fc13c911ab3b4b Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 22 Mar 2010 21:29:57 -0700
Subject: all angular.js directives now work
---
src/Angular.js | 16 +++++---------
src/Compiler.js | 65 +++++++++++++++++++++++++++++++++----------------------
src/directives.js | 38 +++++++++++++++++++++++++++-----
3 files changed, 76 insertions(+), 43 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 1549e7a7..ce1038cc 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -53,17 +53,11 @@ var isVisible = isVisible || function (element) {
return jQuery(element).is(":visible");
};
-function isDefined(value){
- return typeof value != 'undefined';
-}
-
-function isObject(value){
- return typeof value == 'object';
-}
-
-function isFunction(value){
- return typeof value == 'function';
-}
+function isDefined(value){ return typeof value != 'undefined'; }
+function isObject(value){ return typeof value == 'object';}
+function isString(value){ return typeof value == 'string';}
+function isArray(value) { return value instanceof Array; }
+function isFunction(value){ return typeof value == 'function';}
function log(a, b, c){
var console = window['console'];
diff --git a/src/Compiler.js b/src/Compiler.js
index 115ed094..ca94c893 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -12,12 +12,13 @@ function Template() {
Template.prototype = {
init: function(element, scope) {
+ element = jqLite(element);
foreach(this.inits, function(fn) {
- scope.apply(fn, jqLite(element));
+ scope.apply(fn, element);
});
var i,
- childNodes = element.childNodes,
+ childNodes = element[0].childNodes,
children = this.children,
paths = this.paths,
length = paths.length;
@@ -82,8 +83,7 @@ function jqClearData(element) {
};
function JQLite(element) {
- //todo: change to this[0];
- this.element = element;
+ this[0] = element;
}
function jqLite(element) {
@@ -97,7 +97,7 @@ function jqLite(element) {
JQLite.prototype = {
data: function(key, value) {
- var element = this.element,
+ var element = this[0],
cacheId = element[jqName],
cache = jqCache[cacheId || -1];
if (isDefined(value)) {
@@ -112,7 +112,7 @@ JQLite.prototype = {
},
removeData: function(){
- jqClearData(this.element);
+ jqClearData(this[0]);
},
dealoc: function(){
@@ -121,11 +121,11 @@ JQLite.prototype = {
for ( var i = 0, children = element.childNodes; i < children.length; i++) {
dealoc(children[0]);
}
- })(this.element);
+ })(this[0]);
},
bind: function(type, fn){
- var element = this.element,
+ var element = this[0],
bind = this.data('bind'),
eventHandler;
if (!bind) this.data('bind', bind = {});
@@ -158,7 +158,7 @@ JQLite.prototype = {
},
eachTextNode: function(fn){
- var i, chldNodes = this.element.childNodes || [], size = chldNodes.length, chld;
+ var i, chldNodes = this[0].childNodes || [], size = chldNodes.length, chld;
for (i = 0; i < size; i++) {
if((chld = new JQLite(chldNodes[i])).isText()) {
fn(chld, i);
@@ -168,7 +168,7 @@ JQLite.prototype = {
eachNode: function(fn){
- var i, chldNodes = this.element.childNodes || [], size = chldNodes.length, chld;
+ var i, chldNodes = this[0].childNodes || [], size = chldNodes.length, chld;
for (i = 0; i < size; i++) {
if(!(chld = new JQLite(chldNodes[i])).isText()) {
fn(chld, i);
@@ -177,7 +177,7 @@ JQLite.prototype = {
},
eachAttribute: function(fn){
- var i, attrs = this.element.attributes || [], size = attrs.length, chld, attr;
+ var i, attrs = this[0].attributes || [], size = attrs.length, chld, attr;
for (i = 0; i < size; i++) {
var attr = attrs[i];
fn(attr.name, attr.value);
@@ -185,25 +185,25 @@ JQLite.prototype = {
},
replaceWith: function(replaceNode) {
- this.element.parentNode.replaceChild(jqLite(replaceNode).element, this.element);
+ this[0].parentNode.replaceChild(jqLite(replaceNode)[0], this[0]);
},
remove: function() {
this.dealoc();
- this.element.parentNode.removeChild(this.element);
+ this[0].parentNode.removeChild(this[0]);
},
removeAttr: function(name) {
- this.element.removeAttribute(name);
+ this[0].removeAttribute(name);
},
after: function(element) {
- this.element.parentNode.insertBefore(jqLite(element).element, this.element.nextSibling);
+ this[0].parentNode.insertBefore(jqLite(element)[0], this[0].nextSibling);
},
hasClass: function(selector) {
var className = " " + selector + " ";
- if ( (" " + this.element.className + " ").replace(/[\n\t]/g, " ").indexOf( className ) > -1 ) {
+ if ( (" " + this[0].className + " ").replace(/[\n\t]/g, " ").indexOf( className ) > -1 ) {
return true;
}
return false;
@@ -211,12 +211,25 @@ JQLite.prototype = {
addClass: function( selector ) {
if (!this.hasClass(selector)) {
- this.element.className += ' ' + selector;
+ this[0].className += ' ' + selector;
+ }
+ },
+
+ css: function(name, value) {
+ var style = this[0].style;
+ if (isString(name)) {
+ if (isDefined(value)) {
+ style[name] = value;
+ } else {
+ return style[name];
+ }
+ } else {
+ extend(style, name);
}
},
attr: function(name, value){
- var e = this.element;
+ var e = this[0];
if (isObject(name)) {
foreach(name, function(value, name){
e.setAttribute(name, value);
@@ -230,21 +243,21 @@ JQLite.prototype = {
text: function(value) {
if (isDefined(value)) {
- this.element.textContent = value;
+ this[0].textContent = value;
}
- return this.element.textContent;
+ return this[0].textContent;
},
html: function(value) {
if (isDefined(value)) {
- this.element.innerHTML = value;
+ this[0].innerHTML = value;
}
- return this.element.innerHTML;
+ return this[0].innerHTML;
},
- parent: function() { return jqLite(this.element.parentNode);},
- isText: function() { return this.element.nodeType == Node.TEXT_NODE; },
- clone: function() { return jqLite(this.element.cloneNode(true)); }
+ parent: function() { return jqLite(this[0].parentNode);},
+ isText: function() { return this[0].nodeType == Node.TEXT_NODE; },
+ clone: function() { return jqLite(this[0].cloneNode(true)); }
};
///////////////////////////////////
@@ -275,7 +288,7 @@ Compiler.prototype = {
templatize: function(element){
var self = this,
- elementName = element.element.nodeName,
+ elementName = element[0].nodeName,
widgets = self.widgets,
widget = widgets[elementName],
markup = self.markup,
diff --git a/src/directives.js b/src/directives.js
index adcfa508..bbf68669 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -102,13 +102,39 @@ angularDirective("ng-watch", function(expression, element){
};
});
-//Styling
-//
-//ng-class
-//ng-class-odd, ng-class-even
-//ng-style
-//ng-show, ng-hide
+function ngClass(selector) {
+ return function(expression, element){
+ var existing = element[0].className + ' ';
+ return function(element){
+ this.$addEval(expression, function(value){
+ if (selector(this.$index)) {
+ if (isArray(value)) value = value.join(' ');
+ element[0].className = (existing + value).replace(/\s\s+/g, ' ');
+ }
+ });
+ };
+ };
+}
+
+angularDirective("ng-class", ngClass(function(){return true;}));
+angularDirective("ng-class-odd", ngClass(function(i){return i % 2 == 1;}));
+angularDirective("ng-class-even", ngClass(function(i){return i % 2 == 0;}));
+angularDirective("ng-show", function(expression, element){
+ return function(element){
+ this.$addEval(expression, function(value){
+ element.css('display', toBoolean(value) ? '' : 'none');
+ });
+ };
+});
+
+angularDirective("ng-hide", function(expression, element){
+ return function(element){
+ this.$addEval(expression, function(value){
+ element.css('display', toBoolean(value) ? 'none' : '');
+ });
+ };
+});
/////////////////////////////////////////
/////////////////////////////////////////
/////////////////////////////////////////
--
cgit v1.2.3
From bb98ae14f2aef74efbd8345e93f62ac67f460f7f Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 23 Mar 2010 14:57:11 -0700
Subject: markup now wroks, some refactorings
---
src/Angular.js | 77 +++++++++++-----
src/Compiler.js | 259 +++++++++---------------------------------------------
src/Filters.js | 52 ++++++-----
src/Scope.js | 2 +-
src/directives.js | 65 ++++++++++----
src/jqLite.js | 185 ++++++++++++++++++++++++++++++++++++++
src/markup.js | 64 ++++++++++++++
src/widgets2.js | 18 +++-
8 files changed, 439 insertions(+), 283 deletions(-)
create mode 100644 src/jqLite.js
create mode 100644 src/markup.js
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index ce1038cc..95f7325a 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -1,6 +1,7 @@
if (typeof document.getAttribute == 'undefined')
document.getAttribute = function() {};
if (typeof Node == 'undefined') {
+ //TODO: can we get rid of this?
Node = {
ELEMENT_NODE : 1,
ATTRIBUTE_NODE : 2,
@@ -21,7 +22,7 @@ function noop() {}
function identity($) {return $;}
if (!window['console']) window['console']={'log':noop, 'error':noop};
-function extension(angular, name) {
+function extensionMap(angular, name) {
var extPoint;
return angular[name] || (extPoint = angular[name] = function (name, fn, prop){
if (isDefined(fn)) {
@@ -31,20 +32,30 @@ function extension(angular, name) {
});
}
+function extensionList(angular, name) {
+ var extPoint, length = 0;
+ return angular[name] || (extPoint = angular[name] = function (fn, prop){
+ if (isDefined(fn)) {
+ extPoint[length] = extend(fn, prop || {});
+ length++;
+ }
+ return extPoint;
+ });
+}
+
var consoleNode, msie,
- jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
- foreach = _.each,
- extend = _.extend,
- slice = Array.prototype.slice,
- angular = window['angular'] || (window['angular'] = {}),
- angularDirective = extension(angular, 'directive'),
- angularMarkup = extension(angular, 'markup'),
- angularWidget = extension(angular, 'widget'),
- angularValidator = extension(angular, 'validator'),
- angularFilter = extension(angular, 'filter'),
- angularFormatter = extension(angular, 'formatter'),
- angularCallbacks = extension(angular, 'callbacks'),
- angularAlert = angular['alert'] || (angular['alert'] = function(){
+ jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
+ slice = Array.prototype.slice,
+ angular = window['angular'] || (window['angular'] = {}),
+ angularTextMarkup = extensionList(angular, 'textMarkup'),
+ angularAttrMarkup = extensionList(angular, 'attrMarkup'),
+ angularDirective = extensionMap(angular, 'directive'),
+ angularWidget = extensionMap(angular, 'widget'),
+ angularValidator = extensionMap(angular, 'validator'),
+ angularFilter = extensionMap(angular, 'filter'),
+ angularFormatter = extensionMap(angular, 'formatter'),
+ angularCallbacks = extensionMap(angular, 'callbacks'),
+ angularAlert = angular['alert'] || (angular['alert'] = function(){
log(arguments); window.alert.apply(window, arguments);
});
angular['copy'] = copy;
@@ -53,6 +64,29 @@ var isVisible = isVisible || function (element) {
return jQuery(element).is(":visible");
};
+function foreach(obj, iterator, context) {
+ var key;
+ if (obj) {
+ if (obj.forEach) {
+ obj.forEach(iterator, context);
+ } else if (obj instanceof Array) {
+ for (key = 0; key < obj.length; key++)
+ iterator.call(context, obj[key], key);
+ } else {
+ for (key in obj)
+ iterator.call(context, obj[key], key);
+ }
+ }
+ return obj;
+}
+
+function extend(dst, obj) {
+ foreach(obj, function(value, key){
+ dst[key] = value;
+ });
+ return dst;
+}
+
function isDefined(value){ return typeof value != 'undefined'; }
function isObject(value){ return typeof value == 'object';}
function isString(value){ return typeof value == 'string';}
@@ -112,14 +146,15 @@ function isNode(inp) {
}
function isLeafNode (node) {
- switch (node.nodeName) {
- case "OPTION":
- case "PRE":
- case "TITLE":
- return true;
- default:
- return false;
+ if (node) {
+ switch (node.nodeName) {
+ case "OPTION":
+ case "PRE":
+ case "TITLE":
+ return true;
+ }
}
+ return false;
}
function copy(source, destination){
diff --git a/src/Compiler.js b/src/Compiler.js
index ca94c893..ba598a43 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -48,224 +48,41 @@ Template.prototype = {
};
///////////////////////////////////
-//JQLite
+//Compiler
//////////////////////////////////
-
-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 removeEventListener = window.document.detachEvent ?
- function(element, type, fn) {
- element.detachEvent('on' + type, fn);
- } : function(element, type, fn) {
- element.removeEventListener(type, fn, false);
- };
-
-function jqClearData(element) {
- var cacheId = element[jqName],
- cache = jqCache[cacheId];
- if (cache) {
- foreach(cache.bind || {}, function(fn, type){
- removeEventListener(element, type, fn);
- });
- delete jqCache[cacheId];
- delete element[jqName];
- }
-};
-
-function JQLite(element) {
- this[0] = element;
+function isTextNode(node) {
+ return node.nodeType == Node.TEXT_NODE;
}
-function jqLite(element) {
- if (typeof element == 'string') {
- var div = document.createElement('div');
- div.innerHTML = element;
- element = div.childNodes[0];
+function eachTextNode(element, fn){
+ var i, chldNodes = element[0].childNodes || [], size = chldNodes.length, chld;
+ for (i = 0; i < size; i++) {
+ if(isTextNode(chld = chldNodes[i])) {
+ fn(jqLite(chld), i);
+ }
}
- return element instanceof JQLite ? element : new JQLite(element);
}
-JQLite.prototype = {
- data: function(key, value) {
- var element = this[0],
- cacheId = element[jqName],
- cache = jqCache[cacheId || -1];
- if (isDefined(value)) {
- if (!cache) {
- element[jqName] = cacheId = jqNextId();
- cache = jqCache[cacheId] = {};
- }
- cache[key] = value;
- } else {
- return cache ? cache[key] : null;
+function eachNode(element, fn){
+ var i, chldNodes = element[0].childNodes || [], size = chldNodes.length, chld;
+ for (i = 0; i < size; i++) {
+ if(!isTextNode(chld = chldNodes[i])) {
+ fn(jqLite(chld), i);
}
- },
-
- removeData: function(){
- jqClearData(this[0]);
- },
-
- dealoc: function(){
- (function dealoc(element){
- jqClearData(element);
- for ( var i = 0, children = element.childNodes; i < children.length; i++) {
- dealoc(children[0]);
- }
- })(this[0]);
- },
-
- bind: function(type, fn){
- var element = this[0],
- bind = this.data('bind'),
- eventHandler;
- if (!bind) this.data('bind', bind = {});
- eventHandler = bind[type];
- if (!eventHandler) {
- bind[type] = eventHandler = function() {
- var self = this;
- foreach(eventHandler.fns, function(fn){
- fn.apply(self, arguments);
- });
- };
- eventHandler.fns = [];
- addEventListener(element, type, eventHandler);
- }
- eventHandler.fns.push(fn);
- },
-
- trigger: function(type) {
- var cache = this.data('bind');
- if (cache) {
- (cache[type] || noop)();
- }
- },
-
- click: function(fn) {
- if (fn)
- this.bind('click', fn);
- else
- this.trigger('click');
- },
-
- eachTextNode: function(fn){
- var i, chldNodes = this[0].childNodes || [], size = chldNodes.length, chld;
- for (i = 0; i < size; i++) {
- if((chld = new JQLite(chldNodes[i])).isText()) {
- fn(chld, i);
- }
- }
- },
-
-
- eachNode: function(fn){
- var i, chldNodes = this[0].childNodes || [], size = chldNodes.length, chld;
- for (i = 0; i < size; i++) {
- if(!(chld = new JQLite(chldNodes[i])).isText()) {
- fn(chld, i);
- }
- }
- },
-
- eachAttribute: function(fn){
- var i, attrs = this[0].attributes || [], size = attrs.length, chld, attr;
- for (i = 0; i < size; i++) {
- var attr = attrs[i];
- fn(attr.name, attr.value);
- }
- },
-
- replaceWith: function(replaceNode) {
- this[0].parentNode.replaceChild(jqLite(replaceNode)[0], this[0]);
- },
-
- remove: function() {
- this.dealoc();
- this[0].parentNode.removeChild(this[0]);
- },
-
- removeAttr: function(name) {
- this[0].removeAttribute(name);
- },
-
- after: function(element) {
- this[0].parentNode.insertBefore(jqLite(element)[0], this[0].nextSibling);
- },
-
- hasClass: function(selector) {
- var className = " " + selector + " ";
- if ( (" " + this[0].className + " ").replace(/[\n\t]/g, " ").indexOf( className ) > -1 ) {
- return true;
- }
- return false;
- },
-
- addClass: function( selector ) {
- if (!this.hasClass(selector)) {
- this[0].className += ' ' + selector;
- }
- },
-
- css: function(name, value) {
- var style = this[0].style;
- if (isString(name)) {
- if (isDefined(value)) {
- style[name] = value;
- } else {
- return style[name];
- }
- } else {
- extend(style, name);
- }
- },
-
- attr: function(name, value){
- var e = this[0];
- if (isObject(name)) {
- foreach(name, function(value, name){
- e.setAttribute(name, value);
- });
- } else if (isDefined(value)) {
- e.setAttribute(name, value);
- } else {
- return e.getAttribute(name);
- }
- },
-
- text: function(value) {
- if (isDefined(value)) {
- this[0].textContent = value;
- }
- return this[0].textContent;
- },
-
- html: function(value) {
- if (isDefined(value)) {
- this[0].innerHTML = value;
- }
- return this[0].innerHTML;
- },
-
- parent: function() { return jqLite(this[0].parentNode);},
- isText: function() { return this[0].nodeType == Node.TEXT_NODE; },
- clone: function() { return jqLite(this[0].cloneNode(true)); }
-};
+ }
+}
-///////////////////////////////////
-//Compiler
-//////////////////////////////////
+function eachAttribute(element, fn){
+ var i, attrs = element[0].attributes || [], size = attrs.length, chld, attr;
+ for (i = 0; i < size; i++) {
+ var attr = attrs[i];
+ fn(attr.name, attr.value);
+ }
+}
-function Compiler(markup, directives, widgets){
- this.markup = markup;
+function Compiler(textMarkup, attrMarkup, directives, widgets){
+ this.textMarkup = textMarkup;
+ this.attrMarkup = attrMarkup;
this.directives = directives;
this.widgets = widgets;
}
@@ -291,8 +108,6 @@ Compiler.prototype = {
elementName = element[0].nodeName,
widgets = self.widgets,
widget = widgets[elementName],
- markup = self.markup,
- markupSize = markup.length,
directives = self.directives,
descend = true,
exclusive = false,
@@ -300,7 +115,9 @@ Compiler.prototype = {
template = new Template(),
selfApi = {
compile: bind(self, self.compile),
- reference:function(name) {return jqLite(document.createComment(name));},
+ comment:function(text) {return jqLite(document.createComment(text));},
+ element:function(type) {return jqLite(document.createElement(type));},
+ text:function(text) {return jqLite(document.createTextNode(text));},
descend: function(value){ if(isDefined(value)) descend = value; return descend;}
};
@@ -308,14 +125,20 @@ Compiler.prototype = {
template.addInit(widget.call(selfApi, element));
} else {
// process markup for text nodes only
- element.eachTextNode(function(textNode){
- for (var i = 0, text = textNode.text(); i < markupSize; i++) {
- markup[i].call(selfApi, text, textNode, element);
- }
+ eachTextNode(element, function(textNode){
+ var text = textNode.text();
+ foreach(self.textMarkup, function(markup){
+ markup.call(selfApi, text, textNode, element);
+ });
});
// Process attributes/directives
- element.eachAttribute(function(name, value){
+ eachAttribute(element, function(name, value){
+ foreach(self.attrMarkup, function(markup){
+ markup.call(selfApi, value, name, element);
+ });
+ });
+ eachAttribute(element, function(name, value){
var directive = directives[name];
if (!exclusive && directive) {
if (directive.exclusive) {
@@ -333,7 +156,7 @@ Compiler.prototype = {
// Process non text child nodes
if (descend) {
- element.eachNode(function(child, i){
+ eachNode(element, function(child, i){
template.addChild(i, self.templatize(child));
});
}
diff --git a/src/Filters.js b/src/Filters.js
index 60d53fb9..dac8d31d 100644
--- a/src/Filters.js
+++ b/src/Filters.js
@@ -27,7 +27,7 @@ foreach({
jQuery(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 '';
@@ -55,15 +55,15 @@ foreach({
}
return text;
},
-
+
'date': function(amount) {
},
-
+
'json': function(object) {
jQuery(this.$element).addClass("ng-monospace");
return toJson(object, true);
},
-
+
'trackPackage': (function(){
var MATCHERS = [
{ name: "UPS",
@@ -89,7 +89,7 @@ foreach({
var returnValue;
foreach(MATCHERS, function(carrier){
foreach(carrier.regexp, function(regexp){
- if (regexp.test(tNo)) {
+ if (!returnValue && regexp.test(tNo)) {
var text = carrier.name + ": " + trackingNo;
var url = carrier.url + trackingNo;
returnValue = new angularFilter.Meta({
@@ -97,19 +97,17 @@ foreach({
url:url,
html: '' + text + '',
trackingNo:trackingNo});
- _.breakLoop();
}
});
- if (returnValue) _.breakLoop();
});
- if (returnValue)
+ if (returnValue)
return returnValue;
else if (trackingNo)
return noMatch || new angularFilter.Meta({text:trackingNo + " is not recognized"});
else
return null;
};})(),
-
+
'link': function(obj, title) {
var text = title || angularFilter.Meta.get(obj);
var url = angularFilter.Meta.get(obj, "url") || angularFilter.Meta.get(obj);
@@ -122,13 +120,13 @@ foreach({
}
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;
@@ -142,7 +140,7 @@ foreach({
return txt + " " + SUFFIX[suffix];
};
})(),
-
+
'image': function(obj, width, height) {
if (obj && obj.url) {
var style = "";
@@ -155,36 +153,36 @@ foreach({
}
return null;
},
-
+
'lowercase': function (obj) {
var text = angularFilter.Meta.get(obj);
return text ? ("" + text).toLowerCase() : text;
},
-
+
'uppercase': function (obj) {
var text = angularFilter.Meta.get(obj);
return text ? ("" + text).toUpperCase() : text;
},
-
+
'linecount': function (obj) {
var text = angularFilter.Meta.get(obj);
if (text==='' || !text) return 1;
return text.split(/\n|\f/).length;
},
-
+
'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,
+ 'cht':type,
'chco':angularFilterGoogleChartApi['collect'](data, 'color'),
'chtt':angularFilterGoogleChartApi['title'](data),
'chdl':angularFilterGoogleChartApi['collect'](data, 'label'),
@@ -210,7 +208,7 @@ foreach({
var values = seriesValues.join('|');
return values === "" ? null : "t:" + values;
},
-
+
'title': function(data){
var titles = [];
var title = data['title'] || [];
@@ -219,7 +217,7 @@ foreach({
});
return titles.join('|');
},
-
+
'collect': function(data, key){
var outterValues = [];
var count = 0;
@@ -234,7 +232,7 @@ foreach({
});
return count?outterValues.join(','):null;
},
-
+
'encode': function(params, width, height) {
width = width || 200;
height = height || width;
@@ -253,8 +251,8 @@ foreach({
}
}
),
-
-
+
+
'qrcode': function(value, width, height) {
return angularFilterGoogleChartApi['encode']({
'cht':'qr', 'chl':encodeURIComponent(value)}, width, height);
@@ -291,11 +289,11 @@ foreach({
return angularFilterGoogleChartApi('s', data, width, height);
}
},
-
+
'html': function(html){
return new angularFilter.Meta({html:html});
},
-
+
'linky': function(text){
if (!text) return text;
function regExpEscape(text) {
diff --git a/src/Scope.js b/src/Scope.js
index a3e128b6..daafabb0 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -116,7 +116,7 @@ Scope.prototype = {
},
compile: function(exp) {
- if (isFunction(exp)) return exp;
+ if (isFunction(exp)) return bind(this.state, exp);
var expFn = Scope.expressionCache[exp], self = this;
if (!expFn) {
var parser = new Parser(exp);
diff --git a/src/directives.js b/src/directives.js
index bbf68669..747da3f5 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -18,9 +18,50 @@ angularDirective("ng-bind", function(expression){
};
});
+var bindTemplateCache = {};
+function compileBindTemplate(template){
+ var fn = bindTemplateCache[template];
+ if (!fn) {
+ var bindings = [];
+ foreach(parseBindings(template), function(text){
+ var exp = binding(text);
+ bindings.push(exp ? function(){
+ return this.$eval(exp);
+ } : function(){
+ return text;
+ });
+ });
+ bindTemplateCache[template] = fn = function(){
+ var parts = [], self = this;
+ foreach(bindings, function(fn){
+ parts.push(fn.call(self));
+ });
+ return parts.join('');
+ };
+ }
+ return fn;
+};
+angularDirective("ng-bind-template", function(expression){
+ var templateFn = compileBindTemplate(expression);
+ return function(element) {
+ var lastValue;
+ this.$addEval(function() {
+ var value = templateFn.call(this);
+ if (value != lastValue) {
+ element.text(value);
+ lastValue = value;
+ }
+ });
+ };
+});
+
angularDirective("ng-bind-attr", function(expression){
return function(element){
- this.$watch(expression, bind(element, element.attr));
+ this.$addEval(function(){
+ foreach(this.$eval(expression), function(value, key){
+ element.attr(key, compileBindTemplate(value).call(this));
+ }, this);
+ });
};
});
@@ -29,7 +70,7 @@ angularDirective("ng-non-bindable", function(){
});
angularDirective("ng-repeat", function(expression, element){
- var reference = this.reference("ng-repeat: " + expression),
+ var reference = this.comment("ng-repeat: " + expression),
r = element.removeAttr('ng-repeat'),
template = this.compile(element),
match = expression.match(/^\s*(.+)\s+in\s+(.*)\s*$/),
@@ -135,18 +176,12 @@ angularDirective("ng-hide", function(expression, element){
});
};
});
-/////////////////////////////////////////
-/////////////////////////////////////////
-/////////////////////////////////////////
-/////////////////////////////////////////
-/////////////////////////////////////////
-
-
-
-
-//widget related
-//ng-validate, ng-required, ng-formatter
-//ng-error
+angularDirective("ng-style", function(expression, element){
+ return function(element){
+ this.$addEval(expression, function(value){
+ element.css(value);
+ });
+ };
+});
-//ng-scope ng-controller????
diff --git a/src/jqLite.js b/src/jqLite.js
new file mode 100644
index 00000000..035a7a1b
--- /dev/null
+++ b/src/jqLite.js
@@ -0,0 +1,185 @@
+
+///////////////////////////////////
+//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 removeEventListener = window.document.detachEvent ?
+ function(element, type, fn) {
+ element.detachEvent('on' + type, fn);
+ } : function(element, type, fn) {
+ element.removeEventListener(type, fn, false);
+ };
+
+function jqClearData(element) {
+ var cacheId = element[jqName],
+ cache = jqCache[cacheId];
+ if (cache) {
+ foreach(cache.bind || {}, function(fn, type){
+ removeEventListener(element, type, fn);
+ });
+ delete jqCache[cacheId];
+ delete element[jqName];
+ }
+};
+
+function JQLite(element) {
+ this[0] = element;
+}
+
+function jqLite(element) {
+ if (typeof element == 'string') {
+ var div = document.createElement('div');
+ div.innerHTML = element;
+ element = div.childNodes[0];
+ }
+ return element instanceof JQLite ? element : new JQLite(element);
+}
+
+JQLite.prototype = {
+ data: function(key, value) {
+ var element = this[0],
+ cacheId = element[jqName],
+ cache = jqCache[cacheId || -1];
+ if (isDefined(value)) {
+ if (!cache) {
+ element[jqName] = cacheId = jqNextId();
+ cache = jqCache[cacheId] = {};
+ }
+ cache[key] = value;
+ } else {
+ return cache ? cache[key] : null;
+ }
+ },
+
+ removeData: function(){
+ jqClearData(this[0]);
+ },
+
+ dealoc: function(){
+ (function dealoc(element){
+ jqClearData(element);
+ for ( var i = 0, children = element.childNodes; i < children.length; i++) {
+ dealoc(children[0]);
+ }
+ })(this[0]);
+ },
+
+ bind: function(type, fn){
+ var element = this[0],
+ bind = this.data('bind'),
+ eventHandler;
+ if (!bind) this.data('bind', bind = {});
+ eventHandler = bind[type];
+ if (!eventHandler) {
+ bind[type] = eventHandler = function() {
+ var self = this;
+ foreach(eventHandler.fns, function(fn){
+ fn.apply(self, arguments);
+ });
+ };
+ eventHandler.fns = [];
+ addEventListener(element, type, eventHandler);
+ }
+ eventHandler.fns.push(fn);
+ },
+
+ trigger: function(type) {
+ var cache = this.data('bind');
+ if (cache) {
+ (cache[type] || noop)();
+ }
+ },
+
+ click: function(fn) {
+ if (fn)
+ this.bind('click', fn);
+ else
+ this.trigger('click');
+ },
+
+ replaceWith: function(replaceNode) {
+ this[0].parentNode.replaceChild(jqLite(replaceNode)[0], this[0]);
+ },
+
+ remove: function() {
+ this.dealoc();
+ this[0].parentNode.removeChild(this[0]);
+ },
+
+ removeAttr: function(name) {
+ this[0].removeAttribute(name);
+ },
+
+ after: function(element) {
+ this[0].parentNode.insertBefore(jqLite(element)[0], this[0].nextSibling);
+ },
+
+ hasClass: function(selector) {
+ var className = " " + selector + " ";
+ if ( (" " + this[0].className + " ").replace(/[\n\t]/g, " ").indexOf( className ) > -1 ) {
+ return true;
+ }
+ return false;
+ },
+
+ addClass: function( selector ) {
+ if (!this.hasClass(selector)) {
+ this[0].className += ' ' + selector;
+ }
+ },
+
+ css: function(name, value) {
+ var style = this[0].style;
+ if (isString(name)) {
+ if (isDefined(value)) {
+ style[name] = value;
+ } else {
+ return style[name];
+ }
+ } else {
+ extend(style, name);
+ }
+ },
+
+ attr: function(name, value){
+ var e = this[0];
+ if (isObject(name)) {
+ foreach(name, function(value, name){
+ e.setAttribute(name, value);
+ });
+ } else if (isDefined(value)) {
+ e.setAttribute(name, value);
+ } else {
+ return e.getAttribute(name);
+ }
+ },
+
+ text: function(value) {
+ if (isDefined(value)) {
+ this[0].textContent = value;
+ }
+ return this[0].textContent;
+ },
+
+ html: function(value) {
+ if (isDefined(value)) {
+ this[0].innerHTML = value;
+ }
+ return this[0].innerHTML;
+ },
+
+ parent: function() { return jqLite(this[0].parentNode);},
+ clone: function() { return jqLite(this[0].cloneNode(true)); }
+};
diff --git a/src/markup.js b/src/markup.js
new file mode 100644
index 00000000..add7ce03
--- /dev/null
+++ b/src/markup.js
@@ -0,0 +1,64 @@
+function parseBindings(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;
+};
+
+function binding(string) {
+ var binding = string.replace(/\n/gm, ' ').match(/^\{\{(.*)\}\}$/);
+ return binding ? binding[1] : null;
+};
+
+function hasBindings(bindings) {
+ return bindings.length > 1 || Binder.binding(bindings[0]) !== null;
+};
+
+angularTextMarkup(function(text, textNode, parentElement) {
+ var bindings = parseBindings(text),
+ self = this;
+ if (isLeafNode(parentElement[0])) {
+ parentElement.attr('ng-bind-template', text);
+ } else {
+ var cursor = textNode, newElement;
+ foreach(parseBindings(text), function(text){
+ var exp = binding(text);
+ if (exp) {
+ newElement = self.element('span');
+ newElement.attr('ng-bind', exp);
+ } else {
+ newElement = self.text(text);
+ }
+ cursor.after(newElement);
+ cursor = newElement;
+ });
+ }
+ textNode.remove();
+});
+
+var NG_BIND_ATTR = 'ng-bind-attr';
+angularAttrMarkup(function(value, name, element){
+ if (name.substr(0, 3) != 'ng-') {
+ var bindings = parseBindings(value),
+ bindAttr;
+ if (hasBindings(bindings)) {
+ element.removeAttr(name);
+ bindAttr = fromJson(element.attr(NG_BIND_ATTR) || "{}");
+ bindAttr[name] = value;
+ element.attr(NG_BIND_ATTR, toJson(bindAttr));
+ }
+ }
+});
diff --git a/src/widgets2.js b/src/widgets2.js
index 0d7bbd49..b0f467d4 100644
--- a/src/widgets2.js
+++ b/src/widgets2.js
@@ -1,3 +1,19 @@
+/////////////////////////////////////////
+/////////////////////////////////////////
+/////////////////////////////////////////
+/////////////////////////////////////////
+/////////////////////////////////////////
+
+
+
+
+
+//widget related
+//ng-validate, ng-required, ng-formatter
+//ng-error
+
+//ng-scope ng-controller????
+
// ->
-angular.widget("colorpicker", function(element) {
- var name = element.attr('datasource');
- var formatter = this.formatter(element.attr('ng-formatter'));
-
- element.colorPicker(this.withScope(function(selectedColor){
- this.$evalSet(name, formatter.parse(selectedColor));
- }));
-
- return function(){
- this.$watch(expression, function(cmyk){
- element.setColor(formatter.format(cmyk));
- });
+ return function(element) {
+ this.$eval(element.attr('ng-init')||'');
+ (INPUT_TYPE[lowercase(element[0].type)] || noop).call(this, element);
};
});
-angular.widget("template", function(element) {
- var srcExpression = element.attr('src');
- var self = this;
- return {watch:srcExpression, apply:function(src){
- $.load(src, function(html){
- self.destroy(element);
- element.html(html);
- self.compile(element);
- });
- }};
+angularWidget('TEXTAREA', function(){
+ return textWidget;
});
-
-
-/**
- *
- * {
- * withScope: //safely executes, with a try/catch. applies scope
- * compile:
- * widget:
- * directive:
- * validator:
- * formatter:
- *
- *
- * config:
- * loadCSS:
- * loadScript:
- * loadTemplate:
- * }
- *
- **/
--
cgit v1.2.3
From 4fa166866b97d4f4dbd21514dbd674347da0a109 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 25 Mar 2010 14:43:05 -0700
Subject: input select-one now works
---
src/Angular.js | 15 ++-------------
src/Compiler.js | 13 +++++++------
src/markup.js | 48 ++++++++++++++++++++++++++++++------------------
src/widgets2.js | 26 ++++++++++++++------------
4 files changed, 53 insertions(+), 49 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index dc530921..0c6d081e 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -32,24 +32,13 @@ function extensionMap(angular, name) {
});
}
-function extensionList(angular, name) {
- var extPoint, length = 0;
- return angular[name] || (extPoint = angular[name] = function (fn, prop){
- if (isDefined(fn)) {
- extPoint[length] = extend(fn, prop || {});
- length++;
- }
- return extPoint;
- });
-}
-
var consoleNode, msie,
NOOP = 'noop',
jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
slice = Array.prototype.slice,
angular = window['angular'] || (window['angular'] = {}),
- angularTextMarkup = extensionList(angular, 'textMarkup'),
- angularAttrMarkup = extensionList(angular, 'attrMarkup'),
+ angularTextMarkup = extensionMap(angular, 'textMarkup'),
+ angularAttrMarkup = extensionMap(angular, 'attrMarkup'),
angularDirective = extensionMap(angular, 'directive'),
angularWidget = extensionMap(angular, 'widget'),
angularValidator = extensionMap(angular, 'validator'),
diff --git a/src/Compiler.js b/src/Compiler.js
index 4423fcef..47ab0c14 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -120,6 +120,7 @@ Compiler.prototype = {
};
if (widget) {
+ descend = false;
template.addInit(widget.call(selfApi, element));
} else {
// process markup for text nodes only
@@ -152,12 +153,12 @@ Compiler.prototype = {
template.addInit(directive());
});
- // Process non text child nodes
- if (descend) {
- eachNode(element, function(child, i){
- template.addChild(i, self.templatize(child));
- });
- }
+ }
+ // Process non text child nodes
+ if (descend) {
+ eachNode(element, function(child, i){
+ template.addChild(i, self.templatize(child));
+ });
}
return template.empty() ? null : template;
}
diff --git a/src/markup.js b/src/markup.js
index add7ce03..5fb10779 100644
--- a/src/markup.js
+++ b/src/markup.js
@@ -27,30 +27,42 @@ function hasBindings(bindings) {
return bindings.length > 1 || Binder.binding(bindings[0]) !== null;
};
-angularTextMarkup(function(text, textNode, parentElement) {
+angularTextMarkup('{{}}', function(text, textNode, parentElement) {
var bindings = parseBindings(text),
self = this;
- if (isLeafNode(parentElement[0])) {
- parentElement.attr('ng-bind-template', text);
- } else {
- var cursor = textNode, newElement;
- foreach(parseBindings(text), function(text){
- var exp = binding(text);
- if (exp) {
- newElement = self.element('span');
- newElement.attr('ng-bind', exp);
- } else {
- newElement = self.text(text);
- }
- cursor.after(newElement);
- cursor = newElement;
- });
+ if (hasBindings(bindings)) {
+ if (isLeafNode(parentElement[0])) {
+ parentElement.attr('ng-bind-template', text);
+ } else {
+ var cursor = textNode, newElement;
+ foreach(parseBindings(text), function(text){
+ var exp = binding(text);
+ if (exp) {
+ newElement = self.element('span');
+ newElement.attr('ng-bind', exp);
+ } else {
+ newElement = self.text(text);
+ }
+ cursor.after(newElement);
+ cursor = newElement;
+ });
+ }
+ textNode.remove();
+ }
+});
+
+angularTextMarkup('OPTION', function(text, textNode, parentElement){
+ if (parentElement[0].nodeName == "OPTION") {
+ var select = document.createElement('select');
+ select.insertBefore(parentElement[0].cloneNode(true), null);
+ if (!select.innerHTML.match(/.*<\/\s*option\s*>/gi)) {
+ parentElement.attr('value', text);
+ }
}
- textNode.remove();
});
var NG_BIND_ATTR = 'ng-bind-attr';
-angularAttrMarkup(function(value, name, element){
+angularAttrMarkup('{{}}', function(value, name, element){
if (name.substr(0, 3) != 'ng-') {
var bindings = parseBindings(value),
bindAttr;
diff --git a/src/widgets2.js b/src/widgets2.js
index b67694b1..a8d17105 100644
--- a/src/widgets2.js
+++ b/src/widgets2.js
@@ -73,8 +73,8 @@ var NG_ERROR = 'ng-error',
'reset': buttonWidget,
'image': buttonWidget,
'checkbox': inputWidget('click', modelAccessor, checkedAccessor, false),
- 'radio': inputWidget('click', modelAccessor, radioAccessor, undefined)
-// 'select-one': [null, 'change'],
+ 'radio': inputWidget('click', modelAccessor, radioAccessor, undefined),
+ 'select-one': inputWidget('click', modelAccessor, valueAccessor, null)
// 'select-multiple': [[], 'change'],
// 'file': [{}, 'click']
};
@@ -84,9 +84,10 @@ function inputWidget(events, modelAccessor, viewAccessor, initValue) {
var scope = this,
model = modelAccessor(scope, element),
view = viewAccessor(element),
- action = element.attr('ng-action') || '';
- var value = view.get() || initValue;
+ action = element.attr('ng-action') || '',
+ value = view.get() || initValue;
if (isDefined(value)) model.set(value);
+ this.$eval(element.attr('ng-init')||'');
element.bind(events, function(){
model.set(view.get());
scope.$eval(action);
@@ -95,13 +96,14 @@ function inputWidget(events, modelAccessor, viewAccessor, initValue) {
};
}
-angularWidget('INPUT', function input(element){
- return function(element) {
- this.$eval(element.attr('ng-init')||'');
- (INPUT_TYPE[lowercase(element[0].type)] || noop).call(this, element);
- };
-});
+function inputWidgetSelector(element){
+ return INPUT_TYPE[lowercase(element[0].type)] || noop;
+}
-angularWidget('TEXTAREA', function(){
- return textWidget;
+angularWidget('INPUT', inputWidgetSelector);
+angularWidget('TEXTAREA', inputWidgetSelector);
+angularWidget('BUTTON', inputWidgetSelector);
+angularWidget('SELECT', function(element){
+ this.descend(true);
+ return inputWidgetSelector.call(this, element);
});
--
cgit v1.2.3
From 0cc9b0732003451537a5bfc444fb6590f4ed103a Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 25 Mar 2010 14:51:42 -0700
Subject: input select-multiple now works
---
src/widgets2.js | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/widgets2.js b/src/widgets2.js
index a8d17105..c4b39bc1 100644
--- a/src/widgets2.js
+++ b/src/widgets2.js
@@ -57,6 +57,26 @@ function radioAccessor(element) {
};
}
+function optionsAccessor(element) {
+ var options = element[0].options;
+ return {
+ get: function(){
+ var values = [];
+ foreach(options, function(option){
+ if (option.selected) values.push(option.value);
+ });
+ return values;
+ },
+ set: function(values){
+ var keys = {};
+ foreach(values, function(value){ keys[value] = true; });
+ foreach(options, function(option){
+ option.selected = keys[option.value];
+ });
+ }
+ };
+}
+
function noopAccessor() { return { get: noop, set: noop }; }
var NG_ERROR = 'ng-error',
@@ -74,8 +94,8 @@ var NG_ERROR = 'ng-error',
'image': buttonWidget,
'checkbox': inputWidget('click', modelAccessor, checkedAccessor, false),
'radio': inputWidget('click', modelAccessor, radioAccessor, undefined),
- 'select-one': inputWidget('click', modelAccessor, valueAccessor, null)
-// 'select-multiple': [[], 'change'],
+ 'select-one': inputWidget('click', modelAccessor, valueAccessor, null),
+ 'select-multiple': inputWidget('click', modelAccessor, optionsAccessor, [])
// 'file': [{}, 'click']
};
@@ -85,7 +105,7 @@ function inputWidget(events, modelAccessor, viewAccessor, initValue) {
model = modelAccessor(scope, element),
view = viewAccessor(element),
action = element.attr('ng-action') || '',
- value = view.get() || initValue;
+ value = view.get() || copy(initValue);
if (isDefined(value)) model.set(value);
this.$eval(element.attr('ng-init')||'');
element.bind(events, function(){
--
cgit v1.2.3
From d934054cfc22325d817eb0643dc061f9d212804d Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 25 Mar 2010 22:03:11 -0700
Subject: major refactoring of scope
---
src/Angular.js | 21 ------
src/Compiler.js | 17 ++---
src/Scope.js | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++----
src/directives.js | 120 +++++++++++++++++-----------------
src/widgets2.js | 2 +-
5 files changed, 245 insertions(+), 107 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 0c6d081e..0cb89bbe 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -208,27 +208,6 @@ function bind(_this, _function) {
};
}
-function bindTry(_this, _function) {
- var args = arguments,
- last = args.length - 1,
- curryArgs = slice.call(args, 2, last),
- exceptionHandler = args[last];
- return function() {
- try {
- return _function.apply(_this, curryArgs.concat(slice.call(arguments, 0, arguments.length)));
- } catch (e) {
- if (e = exceptionHandler(e)) throw e;
- }
- };
-}
-
-function errorHandlerFor(element) {
- return function(error){
- element.attr('ng-error', angular.toJson(error));
- element.addClass('ng-exception');
- };
-}
-
function outerHTML(node) {
var temp = document.createElement('div');
temp.appendChild(node);
diff --git a/src/Compiler.js b/src/Compiler.js
index 47ab0c14..3b492ebe 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -14,7 +14,7 @@ Template.prototype = {
init: function(element, scope) {
element = jqLite(element);
foreach(this.inits, function(fn) {
- scope.apply(fn, element);
+ scope.$tryEval(fn, element, element);
});
var i,
@@ -92,14 +92,11 @@ Compiler.prototype = {
rawElement = jqLite(rawElement);
var template = this.templatize(rawElement) || new Template();
return function(element, parentScope){
- var scope = new Scope(parentScope);
- scope.element = element;
- // todo return should be a scope with everything already set on it as element
- return {
- scope: scope,
- element:element,
- init: bind(template, template.init, element, scope)
- };
+ var model = scope(parentScope);
+ return extend(model, {
+ $element:element,
+ $init: bind(template, template.init, element, model)
+ });
};
},
@@ -144,7 +141,7 @@ Compiler.prototype = {
exclusive = true;
directiveQueue = [];
}
- directiveQueue.push(bindTry(selfApi, directive, value, element, errorHandlerFor(element)));
+ directiveQueue.push(bind(selfApi, directive, value, element));
}
});
diff --git a/src/Scope.js b/src/Scope.js
index 5f1cfdda..ccf55077 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -53,6 +53,21 @@ Scope.getter = function(instance, path) {
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() {
@@ -98,19 +113,8 @@ Scope.prototype = {
set: function(path, value) {
// log('SCOPE.set', path, value);
- var element = path.split('.');
var instance = this.state;
- 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;
+ return Scope.setter(instance, path, value);
},
setEval: function(expressionText, value) {
@@ -134,9 +138,9 @@ Scope.prototype = {
};
},
- eval: function(expressionText, context) {
+ eval: function(exp, context) {
// log('Scope.eval', expressionText);
- return this.compile(expressionText)(context);
+ return this.compile(exp)(context);
},
//TODO: Refactor. This function needs to be an execution closure for widgets
@@ -241,3 +245,163 @@ Scope.prototype = {
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 scope(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/directives.js b/src/directives.js
index 747da3f5..10476c77 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -1,12 +1,12 @@
angularDirective("ng-init", function(expression){
- return function(){
- this.$eval(expression);
+ return function(element){
+ this.$tryEval(expression, element);
};
});
angularDirective("ng-eval", function(expression){
- return function(){
- this.$addEval(expression);
+ return function(element){
+ this.$onEval(expression, element);
};
});
@@ -14,7 +14,7 @@ angularDirective("ng-bind", function(expression){
return function(element) {
this.$watch(expression, function(value){
element.text(value);
- });
+ }, element);
};
});
@@ -45,23 +45,23 @@ angularDirective("ng-bind-template", function(expression){
var templateFn = compileBindTemplate(expression);
return function(element) {
var lastValue;
- this.$addEval(function() {
+ this.$onEval(function() {
var value = templateFn.call(this);
if (value != lastValue) {
element.text(value);
lastValue = value;
}
- });
+ }, element);
};
});
angularDirective("ng-bind-attr", function(expression){
return function(element){
- this.$addEval(function(){
+ this.$onEval(function(){
foreach(this.$eval(expression), function(value, key){
element.attr(key, compileBindTemplate(value).call(this));
}, this);
- });
+ }, element);
};
});
@@ -70,76 +70,73 @@ angularDirective("ng-non-bindable", function(){
});
angularDirective("ng-repeat", function(expression, element){
- var reference = this.comment("ng-repeat: " + expression),
- r = element.removeAttr('ng-repeat'),
- template = this.compile(element),
- match = expression.match(/^\s*(.+)\s+in\s+(.*)\s*$/),
- lhs, rhs, valueIdent, keyIdent;
- if (! match) {
- throw "Expected ng-repeat in form of 'item in collection' but got '" +
+ element.removeAttr('ng-repeat');
+ element.replaceWith(this.comment("ng-repeat: " + expression));
+ var template = this.compile(element);
+ return function(reference){
+ var match = expression.match(/^\s*(.+)\s+in\s+(.*)\s*$/),
+ lhs, rhs, valueIdent, keyIdent;
+ if (! match) {
+ throw "Expected ng-repeat in form of 'item in collection' but got '" +
expression + "'.";
- }
- lhs = match[1];
- rhs = match[2];
- match = lhs.match(/^([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\)$/);
- if (!match) {
- throw "'item' in 'item in collection' should be identifier or (key, value) but got '" +
+ }
+ lhs = match[1];
+ rhs = match[2];
+ match = lhs.match(/^([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\)$/);
+ if (!match) {
+ throw "'item' in 'item in collection' should be identifier or (key, value) but got '" +
keyValue + "'.";
- }
- valueIdent = match[3] || match[1];
- keyIdent = match[2];
+ }
+ valueIdent = match[3] || match[1];
+ keyIdent = match[2];
- var parent = element.parent();
- element.replaceWith(reference);
- return function(){
- var children = [],
- currentScope = this;
- this.$addEval(rhs, function(items){
+ var children = [], currentScope = this;
+ this.$onEval(function(){
var index = 0, childCount = children.length, childScope, lastElement = reference;
- foreach(items || [], function(value, key){
+ foreach(this.$tryEval(rhs, reference), function(value, key){
if (index < childCount) {
// reuse existing child
childScope = children[index];
} else {
// grow children
childScope = template(element.clone(), currentScope);
- childScope.init();
- childScope.scope.set('$index', index);
- childScope.element.attr('ng-index', index);
- lastElement.after(childScope.element);
+ lastElement.after(childScope.$element);
+ childScope.$index = index;
+ childScope.$element.attr('ng-index', index);
+ childScope.$init();
children.push(childScope);
}
- childScope.scope.set(valueIdent, value);
- if (keyIdent) childScope.scope.set(keyIdent, key);
- childScope.scope.updateView();
- lastElement = childScope.element;
+ childScope[valueIdent] = value;
+ if (keyIdent) childScope[keyIdent] = key;
+ childScope.$eval();
+ lastElement = childScope.$element;
index ++;
});
// shrink children
while(children.length > index) {
- children.pop().element.remove();
+ children.pop().$element.remove();
}
- });
+ }, reference);
};
}, {exclusive: true});
angularDirective("ng-action", function(expression, element){
- return function(){
+ return function(element){
var self = this;
element.click(function(){
- self.$eval(expression);
+ self.$tryEval(expression, element);
});
};
});
angularDirective("ng-watch", function(expression, element){
var match = expression.match(/^([^.]*):(.*)$/);
- if (!match) {
- throw "Expecting watch expression 'ident_to_watch: watch_statement' got '"
- + expression + "'";
- }
- return function(){
- this.$watch(match[1], match[2]);
+ return function(element){
+ if (!match) {
+ throw "Expecting watch expression 'ident_to_watch: watch_statement' got '"
+ + expression + "'";
+ }
+ this.$watch(match[1], match[2], element);
};
});
@@ -147,12 +144,13 @@ function ngClass(selector) {
return function(expression, element){
var existing = element[0].className + ' ';
return function(element){
- this.$addEval(expression, function(value){
+ this.$onEval(function(){
+ var value = this.$eval(expression);
if (selector(this.$index)) {
if (isArray(value)) value = value.join(' ');
element[0].className = (existing + value).replace(/\s\s+/g, ' ');
}
- });
+ }, element);
};
};
}
@@ -163,25 +161,25 @@ angularDirective("ng-class-even", ngClass(function(i){return i % 2 == 0;}));
angularDirective("ng-show", function(expression, element){
return function(element){
- this.$addEval(expression, function(value){
- element.css('display', toBoolean(value) ? '' : 'none');
- });
+ this.$onEval(function(){
+ element.css('display', toBoolean(this.$eval(expression)) ? '' : 'none');
+ }, element);
};
});
angularDirective("ng-hide", function(expression, element){
return function(element){
- this.$addEval(expression, function(value){
- element.css('display', toBoolean(value) ? 'none' : '');
- });
+ this.$onEval(function(){
+ element.css('display', toBoolean(this.$eval(expression)) ? 'none' : '');
+ }, element);
};
});
angularDirective("ng-style", function(expression, element){
return function(element){
- this.$addEval(expression, function(value){
- element.css(value);
- });
+ this.$onEval(function(){
+ element.css(this.$eval(expression));
+ }, element);
};
});
diff --git a/src/widgets2.js b/src/widgets2.js
index c4b39bc1..21da3986 100644
--- a/src/widgets2.js
+++ b/src/widgets2.js
@@ -96,7 +96,7 @@ var NG_ERROR = 'ng-error',
'radio': inputWidget('click', modelAccessor, radioAccessor, undefined),
'select-one': inputWidget('click', modelAccessor, valueAccessor, null),
'select-multiple': inputWidget('click', modelAccessor, optionsAccessor, [])
-// 'file': [{}, 'click']
+// 'file': fileWidget???
};
function inputWidget(events, modelAccessor, viewAccessor, initValue) {
--
cgit v1.2.3
From 1990cbbf2817e04657ccd616da1d9d6b78cc2949 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 25 Mar 2010 22:07:36 -0700
Subject: added few extra tests
---
src/widgets2.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/widgets2.js b/src/widgets2.js
index 21da3986..04045426 100644
--- a/src/widgets2.js
+++ b/src/widgets2.js
@@ -110,7 +110,7 @@ function inputWidget(events, modelAccessor, viewAccessor, initValue) {
this.$eval(element.attr('ng-init')||'');
element.bind(events, function(){
model.set(view.get());
- scope.$eval(action);
+ scope.$tryEval(action, element);
});
scope.$watch(model.get, view.set);
};
--
cgit v1.2.3
From 258ca5f16581f0e8befa493644225a02ae2fc002 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 26 Mar 2010 16:27:18 -0700
Subject: moved all uneeded files out, widgets.html works, tests horribly
broken
---
src/API.js | 325 -------------
src/Angular.js | 234 +---------
src/Binder.js | 356 --------------
src/Compiler.js | 11 +-
src/ControlBar.js | 72 ---
src/DataStore.js | 330 -------------
src/Formatters.js | 11 +-
src/JSON.js | 4 +-
src/Model.js | 65 ---
src/Scope.js | 278 +----------
src/Server.js | 68 ---
src/UrlWatcher.js | 62 +++
src/Users.js | 35 --
src/Widgets.js | 927 ++++++-------------------------------
src/angular-bootstrap.js | 61 ++-
src/apis.js | 328 +++++++++++++
src/delete/Binder.js | 356 ++++++++++++++
src/delete/Scope.js | 407 ++++++++++++++++
src/delete/Widgets.js | 806 ++++++++++++++++++++++++++++++++
src/directives.js | 15 +-
src/jqLite.js | 16 +-
src/markup.js | 76 ---
src/markups.js | 76 +++
src/moveToAngularCom/ControlBar.js | 72 +++
src/moveToAngularCom/DataStore.js | 330 +++++++++++++
src/moveToAngularCom/Model.js | 65 +++
src/moveToAngularCom/Server.js | 68 +++
src/moveToAngularCom/Users.js | 35 ++
src/widgets2.js | 129 ------
29 files changed, 2853 insertions(+), 2765 deletions(-)
delete mode 100644 src/API.js
delete mode 100644 src/Binder.js
delete mode 100644 src/ControlBar.js
delete mode 100644 src/DataStore.js
delete mode 100644 src/Model.js
delete mode 100644 src/Server.js
create mode 100644 src/UrlWatcher.js
delete mode 100644 src/Users.js
create mode 100644 src/apis.js
create mode 100644 src/delete/Binder.js
create mode 100644 src/delete/Scope.js
create mode 100644 src/delete/Widgets.js
delete mode 100644 src/markup.js
create mode 100644 src/markups.js
create mode 100644 src/moveToAngularCom/ControlBar.js
create mode 100644 src/moveToAngularCom/DataStore.js
create mode 100644 src/moveToAngularCom/Model.js
create mode 100644 src/moveToAngularCom/Server.js
create mode 100644 src/moveToAngularCom/Users.js
delete mode 100644 src/widgets2.js
(limited to 'src')
diff --git a/src/API.js b/src/API.js
deleted file mode 100644
index ce690ad1..00000000
--- a/src/API.js
+++ /dev/null
@@ -1,325 +0,0 @@
-var angularGlobal = {
- 'typeOf':function(obj){
- if (obj === null) return "null";
- var type = typeof obj;
- if (type == "object") {
- if (obj instanceof Array) return "array";
- if (obj instanceof Date) return "date";
- if (obj.nodeType == 1) return "element";
- }
- return type;
- }
-};
-
-var angularCollection = {};
-var angularObject = {};
-var angularArray = {
- '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;
- for (var i = 0; i < array.length; i++) {
- var value = 1 * fn(array[i]);
- if (!isNaN(value)){
- sum += value;
- }
- }
- return sum;
- },
- 'remove':function(array, value) {
- var index = _.indexOf(array, value);
- if (index >=0)
- array.splice(index, 1);
- return value;
- },
- 'find':function(array, condition, defaultValue) {
- if (!condition) return undefined;
- var fn = angular['Function']['compile'](condition);
- _.detect(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) {
- for (var j = 0; j < predicates.length; j++) {
- if(!predicates[j](value)) {
- return false;
- }
- }
- return true;
- };
- var getter = Scope.getter;
- var search = function(obj, text){
- if (text.charAt(0) === '!') {
- return !search(obj, text.substr(1));
- }
- switch (typeof obj) {
- case "boolean":
- case "number":
- case "string":
- return ('' + obj).toLowerCase().indexOf(text) > -1;
- case "object":
- for ( var objKey in obj) {
- if (objKey.charAt(0) !== '$' && search(obj[objKey], text)) {
- return true;
- }
- }
- return false;
- case "array":
- for ( var i = 0; i < obj.length; i++) {
- if (search(obj[i], text)) {
- return true;
- }
- }
- return false;
- default:
- return false;
- }
- };
- switch (typeof expression) {
- case "boolean":
- case "number":
- case "string":
- expression = {$:expression};
- case "object":
- for (var key in expression) {
- if (key == '$') {
- (function(){
- var text = (''+expression[key]).toLowerCase();
- if (!text) return;
- predicates.push(function(value) {
- return search(value, text);
- });
- })();
- } else {
- (function(){
- var path = key;
- var text = (''+expression[key]).toLowerCase();
- if (!text) return;
- predicates.push(function(value) {
- return search(getter(value, path), text);
- });
- })();
- }
- }
- break;
- case "function":
- predicates.push(expression);
- break;
- default:
- return array;
- }
- var filtered = [];
- for ( var j = 0; j < array.length; j++) {
- var value = array[j];
- if (predicates.check(value)) {
- filtered.push(value);
- }
- }
- return filtered;
- },
- 'add':function(array, value) {
- array.push(_.isUndefined(value)? {} : value);
- return array;
- },
- 'count':function(array, condition) {
- if (!condition) return array.length;
- var fn = angular['Function']['compile'](condition);
- return _.reduce(array, 0, function(count, $){return count + (fn($)?1:0);});
- },
- 'orderBy':function(array, expression, descend) {
- function reverse(comp, descending) {
- return toBoolean(descending) ?
- function(a,b){return comp(b,a);} : comp;
- }
- function compare(v1, v2){
- var t1 = typeof v1;
- var t2 = typeof v2;
- if (t1 == t2) {
- if (t1 == "string") v1 = v1.toLowerCase();
- if (t1 == "string") v2 = v2.toLowerCase();
- if (v1 === v2) return 0;
- return v1 < v2 ? -1 : 1;
- } else {
- return t1 < t2 ? -1 : 1;
- }
- }
- expression = _.isArray(expression) ? expression: [expression];
- expression = _.map(expression, function($){
- var descending = false;
- if (typeof $ == "string" && ($.charAt(0) == '+' || $.charAt(0) == '-')) {
- descending = $.charAt(0) == '-';
- $ = $.substring(1);
- }
- var get = $ ? angular['Function']['compile']($) : _.identity;
- return reverse(function(a,b){
- return compare(get(a),get(b));
- }, descending);
- });
- var comparator = function(o1, o2){
- for ( var i = 0; i < expression.length; i++) {
- var comp = expression[i](o1, o2);
- if (comp !== 0) return comp;
- }
- return 0;
- };
- return _.clone(array).sort(reverse(comparator, descend));
- },
- 'orderByToggle':function(predicate, attribute) {
- var STRIP = /^([+|-])?(.*)/;
- var ascending = false;
- var index = -1;
- _.detect(predicate, function($, i){
- 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;
- }
-};
-
-var angularString = {
- 'quote':function(string) {
- return '"' + string.replace(/\\/g, '\\\\').
- replace(/"/g, '\\"').
- replace(/\n/g, '\\n').
- replace(/\f/g, '\\f').
- replace(/\r/g, '\\r').
- replace(/\t/g, '\\t').
- replace(/\v/g, '\\v') +
- '"';
- },
- 'quoteUnicode':function(string) {
- var str = angular['String']['quote'](string);
- var chars = [];
- for ( var i = 0; i < str.length; i++) {
- var ch = str.charCodeAt(i);
- if (ch < 128) {
- chars.push(str.charAt(i));
- } else {
- var encode = "000" + ch.toString(16);
- chars.push("\\u" + encode.substring(encode.length - 4));
- }
- }
- return chars.join('');
- },
- 'toDate':function(string){
- var match;
- if (typeof string == 'string' &&
- (match = string.match(/^(\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)Z$/))){
- var date = new Date(0);
- date.setUTCFullYear(match[1], match[2] - 1, match[3]);
- date.setUTCHours(match[4], match[5], match[6], 0);
- return date;
- }
- return string;
- }
-};
-
-var angularDate = {
- 'toString':function(date){
- function pad(n) { return n < 10 ? "0" + n : n; }
- return (date.getUTCFullYear()) + '-' +
- pad(date.getUTCMonth() + 1) + '-' +
- pad(date.getUTCDate()) + 'T' +
- pad(date.getUTCHours()) + ':' +
- pad(date.getUTCMinutes()) + ':' +
- pad(date.getUTCSeconds()) + 'Z';
- }
- };
-
-var angularFunction = {
- 'compile':function(expression) {
- if (_.isFunction(expression)){
- return expression;
- } else if (expression){
- var scope = new Scope();
- return function($) {
- scope.state = $;
- return scope.eval(expression);
- };
- } else {
- return function($){return $;};
- }
- }
-};
-
-function defineApi(dst, chain, underscoreNames){
- var lastChain = _.last(chain);
- foreach(underscoreNames, function(name){
- lastChain[name] = _[name];
- });
- angular[dst] = angular[dst] || {};
- foreach(chain, function(parent){
- extend(angular[dst], parent);
- });
-}
-defineApi('Global', [angularGlobal],
- ['extend', 'clone','isEqual',
- 'isElement', 'isArray', 'isFunction', 'isUndefined']);
-defineApi('Collection', [angularGlobal, angularCollection],
- ['each', 'map', 'reduce', 'reduceRight', 'detect',
- 'select', 'reject', 'all', 'any', 'include',
- 'invoke', 'pluck', 'max', 'min', 'sortBy',
- 'sortedIndex', 'toArray', 'size']);
-defineApi('Array', [angularGlobal, angularCollection, angularArray],
- ['first', 'last', 'compact', 'flatten', 'without',
- 'uniq', 'intersect', 'zip', 'indexOf', 'lastIndexOf']);
-defineApi('Object', [angularGlobal, angularCollection, angularObject],
- ['keys', 'values']);
-defineApi('String', [angularGlobal, angularString], []);
-defineApi('Date', [angularGlobal, angularDate], []);
-//IE bug
-angular['Date']['toString'] = angularDate['toString'];
-defineApi('Function', [angularGlobal, angularCollection, angularFunction],
- ['bind', 'bindAll', 'delay', 'defer', 'wrap', 'compose']);
diff --git a/src/Angular.js b/src/Angular.js
index 0cb89bbe..c3562e84 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -1,22 +1,5 @@
if (typeof document.getAttribute == 'undefined')
document.getAttribute = function() {};
-if (typeof Node == 'undefined') {
- //TODO: can we get rid of this?
- Node = {
- ELEMENT_NODE : 1,
- ATTRIBUTE_NODE : 2,
- TEXT_NODE : 3,
- CDATA_SECTION_NODE : 4,
- ENTITY_REFERENCE_NODE : 5,
- ENTITY_NODE : 6,
- PROCESSING_INSTRUCTION_NODE : 7,
- COMMENT_NODE : 8,
- DOCUMENT_NODE : 9,
- DOCUMENT_TYPE_NODE : 10,
- DOCUMENT_FRAGMENT_NODE : 11,
- NOTATION_NODE : 12
- };
-}
function noop() {}
function identity($) {return $;}
@@ -32,9 +15,11 @@ function extensionMap(angular, name) {
});
}
-var consoleNode, msie,
+var consoleNode,
NOOP = 'noop',
jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
+ _ = window['_'],
+ jqLite = jQuery,
slice = Array.prototype.slice,
angular = window['angular'] || (window['angular'] = {}),
angularTextMarkup = extensionMap(angular, 'textMarkup'),
@@ -77,6 +62,7 @@ function extend(dst, obj) {
return dst;
}
+function isUndefined(value){ return typeof value == 'undefined'; }
function isDefined(value){ return typeof value != 'undefined'; }
function isObject(value){ return typeof value == 'object';}
function isString(value){ return typeof value == 'string';}
@@ -85,6 +71,12 @@ function isFunction(value){ return typeof value == 'function';}
function lowercase(value){ return isString(value) ? value.toLowerCase() : value; }
function uppercase(value){ return isString(value) ? value.toUpperCase() : value; }
function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; };
+function includes(array, obj) {
+ for ( var i = 0; i < array.length; i++) {
+ if (obj === array[i]) return true;
+ }
+ return false;
+}
function log(a, b, c){
var console = window['console'];
@@ -154,18 +146,18 @@ function copy(source, destination){
if (!destination) {
if (!source) {
return source;
- } else if (_.isArray(source)) {
+ } else if (isArray(source)) {
return copy(source, []);
} else {
return copy(source, {});
}
} else {
- if (_.isArray(source)) {
+ if (isArray(source)) {
while(destination.length) {
destination.pop();
}
} else {
- _(destination).each(function(value, key){
+ foreach(function(value, key){
delete destination[key];
});
}
@@ -236,201 +228,19 @@ function merge(src, dst) {
}
}
-// ////////////////////////////
-// UrlWatcher
-// ////////////////////////////
-
-function UrlWatcher(location) {
- this.location = location;
- this.delay = 25;
- this.setTimeout = function(fn, delay) {
- window.setTimeout(fn, delay);
- };
- this.listener = function(url) {
- return url;
- };
- this.expectedUrl = location.href;
-}
-
-UrlWatcher.prototype = {
- listen: function(fn){
- this.listener = fn;
- },
- watch: function() {
- var self = this;
- var pull = function() {
- if (self.expectedUrl !== self.location.href) {
- var notify = self.location.hash.match(/^#\$iframe_notify=(.*)$/);
- if (notify) {
- if (!self.expectedUrl.match(/#/)) {
- self.expectedUrl += "#";
- }
- self.location.href = self.expectedUrl;
- var id = '_iframe_notify_' + notify[1];
- var notifyFn = angularCallbacks[id];
- delete angularCallbacks[id];
- try {
- (notifyFn||noop)();
- } catch (e) {
- alert(e);
- }
- } else {
- self.listener(self.location.href);
- self.expectedUrl = self.location.href;
- }
- }
- self.setTimeout(pull, self.delay);
- };
- pull();
- },
-
- set: function(url) {
- var existingURL = this.location.href;
- if (!existingURL.match(/#/))
- existingURL += '#';
- if (existingURL != url)
- this.location.href = url;
- this.existingURL = url;
- },
-
- get: function() {
- return window.location.href;
- }
-};
-
/////////////////////////////////////////////////
-function configureJQueryPlugins() {
- var fn = jQuery['fn'];
- fn['scope'] = function() {
- var element = this;
- while (element && element.get(0)) {
- var scope = element.data("scope");
- if (scope)
- return scope;
- element = element.parent();
- }
- return null;
- };
- fn['controller'] = function() {
- return this.data('controller') || NullController.instance;
- };
-}
-
-function configureLogging(config) {
- if (config.debug == 'console' && !consoleNode) {
- consoleNode = document.createElement("div");
- consoleNode.id = 'ng-console';
- document.getElementsByTagName('body')[0].appendChild(consoleNode);
- log = function() {
- consoleLog('ng-console-info', arguments);
- };
- console.error = function() {
- consoleLog('ng-console-error', arguments);
- };
- }
-}
-
-function exposeMethods(obj, methods){
- var bound = {};
- foreach(methods, function(fn, name){
- bound[name] = _(fn).bind(obj);
- });
- return bound;
-}
-
-function wireAngular(element, config) {
- var widgetFactory = new WidgetFactory(config['server'], config['database']);
- var binder = new Binder(element[0], widgetFactory, datastore, config['location'], config);
- binder.updateListeners.push(config.onUpdateView);
- var controlBar = new ControlBar(element.find('body'), config['server'], config['database']);
- var onUpdate = function(){binder.updateView();};
- var server = config['database'] =="$MEMORY" ?
- new FrameServer(window) :
- new Server(config['server'], jQuery['getScript']);
- server = new VisualServer(server, new NullStatus(element.find('body')), onUpdate);
- var users = new Users(server, controlBar);
- var databasePath = '/data/' + config['database'];
- var post = function(request, callback){
- server.request("POST", databasePath, request, callback);
- };
- var datastore = new DataStore(post, users, binder.anchor);
- binder.datastore = datastore;
- binder.updateListeners.push(function(){datastore.flush();});
- var scope = new Scope({
- '$anchor' : binder.anchor,
- '$updateView': _(binder.updateView).bind(binder),
- '$config' : config,
- '$invalidWidgets': [],
- '$console' : window.console,
- '$datastore' : exposeMethods(datastore, {
- 'load': datastore.load,
- 'loadMany': datastore.loadMany,
- 'loadOrCreate': datastore.loadOrCreate,
- 'loadAll': datastore.loadAll,
- 'save': datastore.save,
- 'remove': datastore.remove,
- 'flush': datastore.flush,
- 'query': datastore.query,
- 'entity': datastore.entity,
- 'entities': datastore.entities,
- 'documentCountsByUser': datastore.documentCountsByUser,
- 'userDocumentIdsByEntity': datastore.userDocumentIdsByEntity,
- 'join': datastore.join
- }),
- '$save' : function(callback) {
- datastore.saveScope(scope.state, callback, binder.anchor);
- },
- '$window' : window,
- '$uid' : function() {
- return "" + new Date().getTime();
- },
- '$users' : users
- }, "ROOT");
-
- element.data('scope', scope);
- binder.entity(scope);
- binder.compile();
- controlBar.bind();
-
- //TODO: remove this code
- new PopUp(element).bind();
-
- var self = _(exposeMethods(scope, {
- 'set': scope.set,
- 'get': scope.get,
- 'eval': scope.eval
- })).extend({
- 'init':function(){
- config['location']['listen'](_(binder.onUrlChange).bind(binder));
- binder.parseAnchor();
- binder.executeInit();
- binder.updateView();
- return self;
- },
- 'element':element[0],
- 'updateView': _(binder.updateView).bind(binder),
- 'config':config
- });
- return self;
-}
-
-angular['startUrlWatcher'] = function(){
- var watcher = new UrlWatcher(window['location']);
- watcher.watch();
- return exposeMethods(watcher, {'listen':watcher.listen, 'set':watcher.set, 'get':watcher.get});
-};
angular['compile'] = function(element, config) {
- jQuery = window['jQuery'];
- msie = jQuery['browser']['msie'];
- config = _({
+ config = extend({
'onUpdateView': noop,
'server': "",
'location': {'get':noop, 'set':noop, 'listen':noop}
- }).extend(config||{});
-
- configureLogging(config);
- configureJQueryPlugins();
-
- return wireAngular(jQuery(element), config);
+ }, config||{});
+
+ var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget);
+ $element = jqLite(element),
+ rootScope = {
+ '$window': window
+ };
+ return rootScope['$root'] = compiler.compile($element)($element, rootScope);
};
diff --git a/src/Binder.js b/src/Binder.js
deleted file mode 100644
index 9fc32513..00000000
--- a/src/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 = ' ' + 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('').append(jQuery(node).clone()).html();
- if (!html.match(/.*<\/\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/Compiler.js b/src/Compiler.js
index 3b492ebe..4f30521b 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -51,7 +51,7 @@ Template.prototype = {
//Compiler
//////////////////////////////////
function isTextNode(node) {
- return node.nodeType == Node.TEXT_NODE;
+ return node.nodeName == '#text';
}
function eachTextNode(element, fn){
@@ -92,10 +92,13 @@ Compiler.prototype = {
rawElement = jqLite(rawElement);
var template = this.templatize(rawElement) || new Template();
return function(element, parentScope){
- var model = scope(parentScope);
- return extend(model, {
+ var scope = createScope(parentScope);
+ return extend(scope, {
$element:element,
- $init: bind(template, template.init, element, model)
+ $init: function() {
+ template.init(element, scope);
+ scope.$eval();
+ }
});
};
},
diff --git a/src/ControlBar.js b/src/ControlBar.js
deleted file mode 100644
index 685beeb2..00000000
--- a/src/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 =
- ' 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(
- ".*<\/\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/Scope.js b/src/delete/Scope.js
new file mode 100644
index 00000000..ae3f9f11
--- /dev/null
+++ b/src/delete/Scope.js
@@ -0,0 +1,407 @@
+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
new file mode 100644
index 00000000..74f70f21
--- /dev/null
+++ b/src/delete/Widgets.js
@@ -0,0 +1,806 @@
+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('');
+};
+
+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 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(
+ ".*<\/\s*option\s*>/gi)) {
- parentElement.attr('value', text);
- }
- }
-});
-
-var NG_BIND_ATTR = 'ng-bind-attr';
-angularAttrMarkup('{{}}', function(value, name, element){
- if (name.substr(0, 3) != 'ng-') {
- var bindings = parseBindings(value),
- bindAttr;
- if (hasBindings(bindings)) {
- element.removeAttr(name);
- bindAttr = fromJson(element.attr(NG_BIND_ATTR) || "{}");
- bindAttr[name] = value;
- element.attr(NG_BIND_ATTR, toJson(bindAttr));
- }
- }
-});
diff --git a/src/markups.js b/src/markups.js
new file mode 100644
index 00000000..6bc27c85
--- /dev/null
+++ b/src/markups.js
@@ -0,0 +1,76 @@
+function parseBindings(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;
+};
+
+function binding(string) {
+ var binding = string.replace(/\n/gm, ' ').match(/^\{\{(.*)\}\}$/);
+ return binding ? binding[1] : null;
+};
+
+function hasBindings(bindings) {
+ return bindings.length > 1 || binding(bindings[0]) !== null;
+};
+
+angularTextMarkup('{{}}', function(text, textNode, parentElement) {
+ var bindings = parseBindings(text),
+ self = this;
+ if (hasBindings(bindings)) {
+ if (isLeafNode(parentElement[0])) {
+ parentElement.attr('ng-bind-template', text);
+ } else {
+ var cursor = textNode, newElement;
+ foreach(parseBindings(text), function(text){
+ var exp = binding(text);
+ if (exp) {
+ newElement = self.element('span');
+ newElement.attr('ng-bind', exp);
+ } else {
+ newElement = self.text(text);
+ }
+ cursor.after(newElement);
+ cursor = newElement;
+ });
+ }
+ textNode.remove();
+ }
+});
+
+angularTextMarkup('OPTION', function(text, textNode, parentElement){
+ if (parentElement[0].nodeName == "OPTION") {
+ var select = document.createElement('select');
+ select.insertBefore(parentElement[0].cloneNode(true), null);
+ if (!select.innerHTML.match(/.*<\/\s*option\s*>/gi)) {
+ parentElement.attr('value', text);
+ }
+ }
+});
+
+var NG_BIND_ATTR = 'ng-bind-attr';
+angularAttrMarkup('{{}}', function(value, name, element){
+ if (name.substr(0, 3) != 'ng-') {
+ var bindings = parseBindings(value),
+ bindAttr;
+ if (hasBindings(bindings)) {
+ element.removeAttr(name);
+ bindAttr = fromJson(element.attr(NG_BIND_ATTR) || "{}");
+ bindAttr[name] = value;
+ element.attr(NG_BIND_ATTR, toJson(bindAttr));
+ }
+ }
+});
diff --git a/src/moveToAngularCom/ControlBar.js b/src/moveToAngularCom/ControlBar.js
new file mode 100644
index 00000000..685beeb2
--- /dev/null
+++ b/src/moveToAngularCom/ControlBar.js
@@ -0,0 +1,72 @@
+function ControlBar(document, serverUrl, database) {
+ this._document = document;
+ this.serverUrl = serverUrl;
+ this.database = database;
+ this._window = window;
+ this.callbacks = [];
+};
+
+ControlBar.HTML =
+ ''});
- }
- return null;
- },
-
- 'lowercase': function (obj) {
- var text = angularFilter.Meta.get(obj);
- return text ? ("" + text).toLowerCase() : text;
- },
-
- 'uppercase': function (obj) {
- var text = angularFilter.Meta.get(obj);
- return text ? ("" + text).toUpperCase() : text;
- },
-
- 'linecount': function (obj) {
- var text = angularFilter.Meta.get(obj);
- if (text==='' || !text) return 1;
- return text.split(/\n|\f/).length;
- },
-
- '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('|');
- },
-
- '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;
- },
-
- 'encode': function(params, width, height) {
- width = width || 200;
- height = height || width;
- var url = "http://chart.apis.google.com/chart?";
- var urlParam = [];
- params['chs'] = width + "x" + height;
- foreach(params, function(value, key){
- if (value) {
- urlParam.push(key + "=" + value);
- }
- });
- urlParam.sort();
- url += urlParam.join("&");
- return new angularFilter.Meta({url:url,
- html:''});
- }
- }
- ),
-
-
- '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);
- }
- },
-
- 'html': function(html){
- return new angularFilter.Meta({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('');
- html.push(url);
- html.push('');
- raw = raw.substring(i + url.length);
- }
- html.push(escapeHtml(raw));
- return new angularFilter.Meta({text:text, html:html.join('')});
- }
-}, function(v,k){angularFilter[k] = v;});
-
-angularFilterGoogleChartApi = angularFilter['googleChartApi'];
diff --git a/src/Formatters.js b/src/Formatters.js
deleted file mode 100644
index ee63c1a5..00000000
--- a/src/Formatters.js
+++ /dev/null
@@ -1,23 +0,0 @@
-function formater(format, parse) {return {'format':format, 'parse':parse || format};}
-function toString(obj) {return isDefined(obj) ? "" + obj : obj;}
-extend(angularFormatter, {
- 'noop':formater(identity, identity),
- 'boolean':formater(toString, toBoolean),
- 'number':formater(toString, function(obj){return 1*obj;}),
-
- 'list':formater(
- 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':formater(
- function(obj) { return obj ? trim("" + obj) : ""; }
- )
-});
diff --git a/src/Scope.js b/src/Scope.js
index b41f7436..0bc551c4 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -17,7 +17,7 @@ function getter(instance, path, unboundFn) {
type = angular[type.charAt(0).toUpperCase()+type.substring(1)];
var fn = type ? type[[key.substring(1)]] : undefined;
if (fn) {
- instance = bind(fn, lastInstance, lastInstance);
+ instance = bind(lastInstance, fn, lastInstance);
return instance;
}
}
diff --git a/src/Validators.js b/src/Validators.js
deleted file mode 100644
index e3da0a81..00000000
--- a/src/Validators.js
+++ /dev/null
@@ -1,113 +0,0 @@
-foreach({
- 'noop': noop,
-
- 'regexp': function(value, regexp, msg) {
- if (!value.match(regexp)) {
- return msg ||
- "Value does not match expected format " + regexp + ".";
- } else {
- return null;
- }
- },
-
- 'number': function(value, min, max) {
- var num = 1 * value;
- if (num == value) {
- if (typeof min != 'undefined' && num < min) {
- return "Value can not be less than " + min + ".";
- }
- if (typeof min != 'undefined' && num > max) {
- return "Value can not be greater than " + max + ".";
- }
- return null;
- } else {
- return "Not a number";
- }
- },
-
- 'integer': function(value, min, max) {
- var numberError = angularValidator['number'](value, min, max);
- if (numberError) return numberError;
- if (!("" + value).match(/^\s*[\d+]*\s*$/) || value != Math.round(value)) {
- return "Not a whole number";
- }
- return null;
- },
-
- 'date': function(value, min, max) {
- if (value.match(/^\d\d?\/\d\d?\/\d\d\d\d$/)) {
- return null;
- }
- return "Value is not a date. (Expecting format: 12/31/2009).";
- },
-
- 'ssn': function(value) {
- if (value.match(/^\d\d\d-\d\d-\d\d\d\d$/)) {
- return null;
- }
- return "SSN needs to be in 999-99-9999 format.";
- },
-
- 'email': function(value) {
- if (value.match(/^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$/)) {
- return null;
- }
- return "Email needs to be in username@host.com format.";
- },
-
- 'phone': function(value) {
- if (value.match(/^1\(\d\d\d\)\d\d\d-\d\d\d\d$/)) {
- return null;
- }
- if (value.match(/^\+\d{2,3} (\(\d{1,5}\))?[\d ]+\d$/)) {
- return null;
- }
- return "Phone number needs to be in 1(987)654-3210 format in North America or +999 (123) 45678 906 internationaly.";
- },
-
- 'url': function(value) {
- if (value.match(/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/)) {
- return null;
- }
- return "URL needs to be in http://server[:port]/path format.";
- },
-
- 'json': function(value) {
- try {
- fromJson(value);
- return null;
- } catch (e) {
- return e.toString();
- }
- },
-
- 'asynchronous': function(text, asynchronousFn) {
- var element = this['$element'];
- var cache = element.data('$validateState');
- if (!cache) {
- cache = { state: {}};
- element.data('$validateState', cache);
- }
- var state = cache.state[text];
- cache.lastKey = text;
- if (state === undefined) {
- // we have never seen this before, Request it
- element.addClass('ng-input-indicator-wait');
- state = cache.state[text] = null;
- (asynchronousFn || noop)(text, function(error){
- state = cache.state[text] = error ? error : false;
- if (cache.state[cache.lastKey] !== null) {
- element.removeClass('ng-input-indicator-wait');
- }
- elementError(element, NG_VALIDATION_ERROR, error);
- });
- }
-
- if (state === null){
- // request in flight, mark widget invalid, but don't show it to user
- (this['$invalidWidgets']||[]).push(this.$element);
- }
- return state;
- }
-
-}, function(v,k) {angularValidator[k] = v;});
diff --git a/src/Widgets.js b/src/Widgets.js
deleted file mode 100644
index 8e668c8f..00000000
--- a/src/Widgets.js
+++ /dev/null
@@ -1,204 +0,0 @@
-function modelAccessor(scope, element) {
- var expr = element.attr('name'),
- farmatterName = element.attr('ng-format') || NOOP,
- formatter = angularFormatter(farmatterName);
- if (!expr) throw "Required field 'name' not found.";
- if (!formatter) throw "Formatter named '" + farmatterName + "' not found.";
- return {
- get: function() {
- return formatter['format'](scope.$eval(expr));
- },
- set: function(value) {
- scope.$tryEval(expr + '=' + toJson(formatter['parse'](value)), element);
- }
- };
-}
-
-function compileValidator(expr) {
- return new Parser(expr).validator()();
-}
-
-function valueAccessor(scope, element) {
- var validatorName = element.attr('ng-validate') || NOOP,
- validator = compileValidator(validatorName),
- required = element.attr('ng-required'),
- lastError;
- required = required || required === '';
- if (!validator) throw "Validator named '" + validatorName + "' not found.";
- function validate(value) {
- var error = required && !trim(value) ? "Required" : validator({self:scope, scope:{get:scope.$get, set:scope.$set}}, value);
- if (error !== lastError) {
- elementError(element, NG_VALIDATION_ERROR, error);
- lastError = error;
- }
- return value;
- }
- return {
- get: function(){ return validate(element.val()); },
- set: function(value){ element.val(validate(value)); }
- };
-}
-
-function checkedAccessor(scope, element) {
- var domElement = element[0];
- return {
- get: function(){
- return !!domElement.checked;
- },
- set: function(value){
- domElement.checked = !!value;
- }
- };
-}
-
-function radioAccessor(scope, element) {
- var domElement = element[0];
- return {
- get: function(){
- return domElement.checked ? domElement.value : null;
- },
- set: function(value){
- domElement.checked = value == domElement.value;
- }
- };
-}
-
-function optionsAccessor(scope, element) {
- var options = element[0].options;
- return {
- get: function(){
- var values = [];
- foreach(options, function(option){
- if (option.selected) values.push(option.value);
- });
- return values;
- },
- set: function(values){
- var keys = {};
- foreach(values, function(value){ keys[value] = true; });
- foreach(options, function(option){
- option.selected = keys[option.value];
- });
- }
- };
-}
-
-function noopAccessor() { return { get: noop, set: noop }; }
-
-var textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, initWidgetValue('')),
- buttonWidget = inputWidget('click', noopAccessor, noopAccessor, noop),
- INPUT_TYPE = {
- 'text': textWidget,
- 'textarea': textWidget,
- 'hidden': textWidget,
- 'password': textWidget,
- 'button': buttonWidget,
- 'submit': buttonWidget,
- 'reset': buttonWidget,
- 'image': buttonWidget,
- 'checkbox': inputWidget('click', modelAccessor, checkedAccessor, initWidgetValue(false)),
- 'radio': inputWidget('click', modelAccessor, radioAccessor, radioInit),
- 'select-one': inputWidget('change', modelAccessor, valueAccessor, initWidgetValue(null)),
- 'select-multiple': inputWidget('change', modelAccessor, optionsAccessor, initWidgetValue([]))
-// 'file': fileWidget???
- };
-
-function initWidgetValue(initValue) {
- return function (model, view) {
- var value = view.get() || copy(initValue);
- if (isUndefined(model.get()) && isDefined(value))
- model.set(value);
- };
-}
-
-function radioInit(model, view, element) {
- var modelValue = model.get(), viewValue = view.get(), input = element[0];
- input.name = this.$id + '@' + input.name;
- if (isUndefined(modelValue)) model.set(null);
- if (viewValue !== null) model.set(viewValue);
-}
-
-function inputWidget(events, modelAccessor, viewAccessor, initFn) {
- return function(element) {
- var scope = this,
- model = modelAccessor(scope, element),
- view = viewAccessor(scope, element),
- action = element.attr('ng-change') || '';
- initFn.call(scope, model, view, element);
- 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(){
- model.set(view.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;
- });
- }
- view.set(model.get());
- scope.$watch(model.get, view.set);
- };
-}
-
-function inputWidgetSelector(element){
- this.directives(true);
- return INPUT_TYPE[lowercase(element[0].type)] || noop;
-}
-
-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){
- var compiler = this,
- src = element.attr("src");
- return element.attr('switch-instance') ? null : function(element){
- var scope = this, childScope;
- element.attr('switch-instance', 'compiled');
- scope.$browser.xhr('GET', src, function(code, response){
- element.html(response);
- childScope = createScope(scope);
- compiler.compile(element)(element, childScope);
- childScope.$init();
- });
- scope.$onEval(function(){ if (childScope) childScope.$eval(); });
- };
-});
-
-angularWidget('NG:SWITCH', function(element){
- var compiler = this,
- watchExpr = element.attr("on"),
- cases = [];
- eachNode(element, function(caseElement){
- var when = caseElement.attr('ng-switch-when');
- if (when) {
- cases.push({
- when: function(value){ return value == when; },
- element: caseElement,
- template: compiler.compile(caseElement)
- });
- }
- });
- element.html('');
- return function(element){
- var scope = this;
- this.$watch(watchExpr, function(value){
- element.html('');
- foreach(cases, function(switchCase){
- if (switchCase.when(value)) {
- element.append(switchCase.element);
- var childScope = createScope(scope);
- switchCase.template(switchCase.element, childScope);
- childScope.$init();
- }
- });
- });
- };
-});
diff --git a/src/angular.prefix b/src/angular.prefix
index 0552b2ed..a1b4e151 100644
--- a/src/angular.prefix
+++ b/src/angular.prefix
@@ -21,4 +21,4 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-(function(window, document, onLoadDelegate){
+(function(window, document, previousOnLoad){
diff --git a/src/angular.suffix b/src/angular.suffix
index c5754df2..36d73df2 100644
--- a/src/angular.suffix
+++ b/src/angular.suffix
@@ -1 +1,9 @@
+
+ window.onload = function(){
+ try {
+ if (previousOnLoad) previousOnLoad();
+ } catch(e) {}
+ angularInit(parseKeyValue(angularJsConfig(document)));
+ };
+
})(window, document, window.onload);
diff --git a/src/directives.js b/src/directives.js
index d1b1dba3..5cee0978 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -12,6 +12,7 @@ angularDirective("ng-controller", function(expression){
if (!isFunction(controller))
throw "Reference '"+expression+"' is not a class.";
this.$become(controller);
+ (this.init || noop)();
};
});
diff --git a/src/filters.js b/src/filters.js
new file mode 100644
index 00000000..dac8d31d
--- /dev/null
+++ b/src/filters.js
@@ -0,0 +1,320 @@
+angularFilter.Meta = function(obj){
+ if (obj) {
+ for ( var key in obj) {
+ this[key] = obj[key];
+ }
+ }
+};
+angularFilter.Meta.get = function(obj, attr){
+ attr = attr || 'text';
+ switch(typeof obj) {
+ case "string":
+ return attr == "text" ? obj : undefined;
+ case "object":
+ if (obj && typeof obj[attr] !== "undefined") {
+ return obj[attr];
+ }
+ return undefined;
+ default:
+ return obj;
+ }
+};
+
+var angularFilterGoogleChartApi;
+
+foreach({
+ 'currency': function(amount){
+ jQuery(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) {
+ jQuery(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 = new angularFilter.Meta({
+ text:text,
+ url:url,
+ html: '' + text + '',
+ trackingNo:trackingNo});
+ }
+ });
+ });
+ if (returnValue)
+ return returnValue;
+ else if (trackingNo)
+ return noMatch || new angularFilter.Meta({text:trackingNo + " is not recognized"});
+ else
+ return null;
+ };})(),
+
+ 'link': function(obj, title) {
+ var text = title || angularFilter.Meta.get(obj);
+ var url = angularFilter.Meta.get(obj, "url") || angularFilter.Meta.get(obj);
+ if (url) {
+ if (angular.validator.email(url) === null) {
+ url = "mailto:" + url;
+ }
+ var html = '' + text + '';
+ return new angularFilter.Meta({text:text, url:url, html:html});
+ }
+ 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 = "";
+ if (width) {
+ style = ' style="max-width: ' + width +
+ 'px; max-height: ' + (height || width) + 'px;"';
+ }
+ return new angularFilter.Meta({url:obj.url, text:obj.url,
+ html:''});
+ }
+ return null;
+ },
+
+ 'lowercase': function (obj) {
+ var text = angularFilter.Meta.get(obj);
+ return text ? ("" + text).toLowerCase() : text;
+ },
+
+ 'uppercase': function (obj) {
+ var text = angularFilter.Meta.get(obj);
+ return text ? ("" + text).toUpperCase() : text;
+ },
+
+ 'linecount': function (obj) {
+ var text = angularFilter.Meta.get(obj);
+ if (text==='' || !text) return 1;
+ return text.split(/\n|\f/).length;
+ },
+
+ '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('|');
+ },
+
+ '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;
+ },
+
+ 'encode': function(params, width, height) {
+ width = width || 200;
+ height = height || width;
+ var url = "http://chart.apis.google.com/chart?";
+ var urlParam = [];
+ params['chs'] = width + "x" + height;
+ foreach(params, function(value, key){
+ if (value) {
+ urlParam.push(key + "=" + value);
+ }
+ });
+ urlParam.sort();
+ url += urlParam.join("&");
+ return new angularFilter.Meta({url:url,
+ html:''});
+ }
+ }
+ ),
+
+
+ '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);
+ }
+ },
+
+ 'html': function(html){
+ return new angularFilter.Meta({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('');
+ html.push(url);
+ html.push('');
+ raw = raw.substring(i + url.length);
+ }
+ html.push(escapeHtml(raw));
+ return new angularFilter.Meta({text:text, html:html.join('')});
+ }
+}, function(v,k){angularFilter[k] = v;});
+
+angularFilterGoogleChartApi = angularFilter['googleChartApi'];
diff --git a/src/formatters.js b/src/formatters.js
new file mode 100644
index 00000000..ee63c1a5
--- /dev/null
+++ b/src/formatters.js
@@ -0,0 +1,23 @@
+function formater(format, parse) {return {'format':format, 'parse':parse || format};}
+function toString(obj) {return isDefined(obj) ? "" + obj : obj;}
+extend(angularFormatter, {
+ 'noop':formater(identity, identity),
+ 'boolean':formater(toString, toBoolean),
+ 'number':formater(toString, function(obj){return 1*obj;}),
+
+ 'list':formater(
+ 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':formater(
+ function(obj) { return obj ? trim("" + obj) : ""; }
+ )
+});
diff --git a/src/validators.js b/src/validators.js
new file mode 100644
index 00000000..e3da0a81
--- /dev/null
+++ b/src/validators.js
@@ -0,0 +1,113 @@
+foreach({
+ 'noop': noop,
+
+ 'regexp': function(value, regexp, msg) {
+ if (!value.match(regexp)) {
+ return msg ||
+ "Value does not match expected format " + regexp + ".";
+ } else {
+ return null;
+ }
+ },
+
+ 'number': function(value, min, max) {
+ var num = 1 * value;
+ if (num == value) {
+ if (typeof min != 'undefined' && num < min) {
+ return "Value can not be less than " + min + ".";
+ }
+ if (typeof min != 'undefined' && num > max) {
+ return "Value can not be greater than " + max + ".";
+ }
+ return null;
+ } else {
+ return "Not a number";
+ }
+ },
+
+ 'integer': function(value, min, max) {
+ var numberError = angularValidator['number'](value, min, max);
+ if (numberError) return numberError;
+ if (!("" + value).match(/^\s*[\d+]*\s*$/) || value != Math.round(value)) {
+ return "Not a whole number";
+ }
+ return null;
+ },
+
+ 'date': function(value, min, max) {
+ if (value.match(/^\d\d?\/\d\d?\/\d\d\d\d$/)) {
+ return null;
+ }
+ return "Value is not a date. (Expecting format: 12/31/2009).";
+ },
+
+ 'ssn': function(value) {
+ if (value.match(/^\d\d\d-\d\d-\d\d\d\d$/)) {
+ return null;
+ }
+ return "SSN needs to be in 999-99-9999 format.";
+ },
+
+ 'email': function(value) {
+ if (value.match(/^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$/)) {
+ return null;
+ }
+ return "Email needs to be in username@host.com format.";
+ },
+
+ 'phone': function(value) {
+ if (value.match(/^1\(\d\d\d\)\d\d\d-\d\d\d\d$/)) {
+ return null;
+ }
+ if (value.match(/^\+\d{2,3} (\(\d{1,5}\))?[\d ]+\d$/)) {
+ return null;
+ }
+ return "Phone number needs to be in 1(987)654-3210 format in North America or +999 (123) 45678 906 internationaly.";
+ },
+
+ 'url': function(value) {
+ if (value.match(/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/)) {
+ return null;
+ }
+ return "URL needs to be in http://server[:port]/path format.";
+ },
+
+ 'json': function(value) {
+ try {
+ fromJson(value);
+ return null;
+ } catch (e) {
+ return e.toString();
+ }
+ },
+
+ 'asynchronous': function(text, asynchronousFn) {
+ var element = this['$element'];
+ var cache = element.data('$validateState');
+ if (!cache) {
+ cache = { state: {}};
+ element.data('$validateState', cache);
+ }
+ var state = cache.state[text];
+ cache.lastKey = text;
+ if (state === undefined) {
+ // we have never seen this before, Request it
+ element.addClass('ng-input-indicator-wait');
+ state = cache.state[text] = null;
+ (asynchronousFn || noop)(text, function(error){
+ state = cache.state[text] = error ? error : false;
+ if (cache.state[cache.lastKey] !== null) {
+ element.removeClass('ng-input-indicator-wait');
+ }
+ elementError(element, NG_VALIDATION_ERROR, error);
+ });
+ }
+
+ if (state === null){
+ // request in flight, mark widget invalid, but don't show it to user
+ (this['$invalidWidgets']||[]).push(this.$element);
+ }
+ return state;
+ }
+
+}, function(v,k) {angularValidator[k] = v;});
diff --git a/src/widgets.js b/src/widgets.js
new file mode 100644
index 00000000..3e9ba236
--- /dev/null
+++ b/src/widgets.js
@@ -0,0 +1,229 @@
+function modelAccessor(scope, element) {
+ var expr = element.attr('name'),
+ farmatterName = element.attr('ng-format') || NOOP,
+ formatter = angularFormatter(farmatterName);
+ if (!expr) throw "Required field 'name' not found.";
+ if (!formatter) throw "Formatter named '" + farmatterName + "' not found.";
+ return {
+ get: function() {
+ return formatter['format'](scope.$eval(expr));
+ },
+ set: function(value) {
+ scope.$tryEval(expr + '=' + toJson(formatter['parse'](value)), element);
+ }
+ };
+}
+
+function compileValidator(expr) {
+ return new Parser(expr).validator()();
+}
+
+function valueAccessor(scope, element) {
+ var validatorName = element.attr('ng-validate') || NOOP,
+ validator = compileValidator(validatorName),
+ required = element.attr('ng-required'),
+ lastError;
+ required = required || required === '';
+ if (!validator) throw "Validator named '" + validatorName + "' not found.";
+ function validate(value) {
+ var error = required && !trim(value) ? "Required" : validator({self:scope, scope:{get:scope.$get, set:scope.$set}}, value);
+ if (error !== lastError) {
+ elementError(element, NG_VALIDATION_ERROR, error);
+ lastError = error;
+ }
+ return value;
+ }
+ return {
+ get: function(){ return validate(element.val()); },
+ set: function(value){ element.val(validate(value)); }
+ };
+}
+
+function checkedAccessor(scope, element) {
+ var domElement = element[0];
+ return {
+ get: function(){
+ return !!domElement.checked;
+ },
+ set: function(value){
+ domElement.checked = !!value;
+ }
+ };
+}
+
+function radioAccessor(scope, element) {
+ var domElement = element[0];
+ return {
+ get: function(){
+ return domElement.checked ? domElement.value : null;
+ },
+ set: function(value){
+ domElement.checked = value == domElement.value;
+ }
+ };
+}
+
+function optionsAccessor(scope, element) {
+ var options = element[0].options;
+ return {
+ get: function(){
+ var values = [];
+ foreach(options, function(option){
+ if (option.selected) values.push(option.value);
+ });
+ return values;
+ },
+ set: function(values){
+ var keys = {};
+ foreach(values, function(value){ keys[value] = true; });
+ foreach(options, function(option){
+ option.selected = keys[option.value];
+ });
+ }
+ };
+}
+
+function noopAccessor() { return { get: noop, set: noop }; }
+
+var textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, initWidgetValue('')),
+ buttonWidget = inputWidget('click', noopAccessor, noopAccessor, noop),
+ INPUT_TYPE = {
+ 'text': textWidget,
+ 'textarea': textWidget,
+ 'hidden': textWidget,
+ 'password': textWidget,
+ 'button': buttonWidget,
+ 'submit': buttonWidget,
+ 'reset': buttonWidget,
+ 'image': buttonWidget,
+ 'checkbox': inputWidget('click', modelAccessor, checkedAccessor, initWidgetValue(false)),
+ 'radio': inputWidget('click', modelAccessor, radioAccessor, radioInit),
+ 'select-one': inputWidget('change', modelAccessor, valueAccessor, initWidgetValue(null)),
+ 'select-multiple': inputWidget('change', modelAccessor, optionsAccessor, initWidgetValue([]))
+// 'file': fileWidget???
+ };
+
+function initWidgetValue(initValue) {
+ return function (model, view) {
+ var value = view.get() || copy(initValue);
+ if (isUndefined(model.get()) && isDefined(value))
+ model.set(value);
+ };
+}
+
+function radioInit(model, view, element) {
+ var modelValue = model.get(), viewValue = view.get(), input = element[0];
+ input.name = this.$id + '@' + input.name;
+ if (isUndefined(modelValue)) model.set(null);
+ if (viewValue !== null) model.set(viewValue);
+}
+
+function inputWidget(events, modelAccessor, viewAccessor, initFn) {
+ return function(element) {
+ var scope = this,
+ model = modelAccessor(scope, element),
+ view = viewAccessor(scope, element),
+ action = element.attr('ng-change') || '';
+ initFn.call(scope, model, view, element);
+ 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(){
+ model.set(view.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;
+ });
+ }
+ view.set(model.get());
+ scope.$watch(model.get, view.set);
+ };
+}
+
+function inputWidgetSelector(element){
+ this.directives(true);
+ return INPUT_TYPE[lowercase(element[0].type)] || noop;
+}
+
+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){
+ var compiler = this,
+ src = element.attr("src");
+ if (element.attr('switch-instance')) {
+ this.descend(true);
+ this.directives(true);
+ } else {
+ return function(element){
+ var scope = this, childScope;
+ element.attr('switch-instance', 'compiled');
+ scope.$browser.xhr('GET', src, function(code, response){
+ element.html(response);
+ childScope = createScope(scope);
+ compiler.compile(element)(element, childScope);
+ childScope.$init();
+ scope.$root.$eval();
+ });
+ scope.$onEval(function(){
+ if (childScope) childScope.$eval();
+ });
+ };
+ }
+});
+
+angularWidget('NG:SWITCH', function ngSwitch(element){
+ var compiler = this,
+ watchExpr = element.attr("on"),
+ whenFn = ngSwitch[element.attr("using") || 'equals'];
+ changeExpr = element.attr('change') || '',
+ cases = [];
+ if (!whenFn) throw "Using expression '" + usingExpr + "' unknown.";
+ eachNode(element, function(caseElement){
+ var when = caseElement.attr('ng-switch-when');
+ if (when) {
+ cases.push({
+ when: function(scope, value){
+ return whenFn.call(scope, value, when);
+ },
+ change: changeExpr,
+ element: caseElement,
+ template: compiler.compile(caseElement)
+ });
+ }
+ });
+ element.html('');
+ return function(element){
+ var scope = this, childScope;
+ this.$watch(watchExpr, function(value){
+ element.html('');
+ childScope = null;
+ foreach(cases, function(switchCase){
+ if (switchCase.when(childScope, value)) {
+ element.append(switchCase.element);
+ childScope = createScope(scope);
+ childScope.$tryEval(switchCase.change, element);
+ switchCase.template(switchCase.element, childScope);
+ childScope.$init();
+ }
+ });
+ });
+ scope.$onEval(function(){
+ if (childScope) childScope.$eval();
+ });
+ };
+}, {
+ equals: function(on, when) {
+ return on == when;
+ },
+ route: function(on, when) {
+ }
+});
--
cgit v1.2.3
From 29309e0e5a5f5eafd0f948100417d63127d3332d Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 7 Apr 2010 10:35:54 -0700
Subject: jstd failing test case for cory
---
src/widgets.js | 2 ++
1 file changed, 2 insertions(+)
(limited to 'src')
diff --git a/src/widgets.js b/src/widgets.js
index 3e9ba236..012f13e2 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -225,5 +225,7 @@ angularWidget('NG:SWITCH', function ngSwitch(element){
return on == when;
},
route: function(on, when) {
+ this.name = 'misko';
+ return true;
}
});
--
cgit v1.2.3
From 6ea1ac7b05a4079bcda0356e095703d36ccdf6b3 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 7 Apr 2010 14:13:10 -0700
Subject: added $invalidWidget service
---
src/Widgets.js | 7 ++++++-
src/services.js | 15 +++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Widgets.js b/src/Widgets.js
index 8e668c8f..703fb376 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -22,7 +22,8 @@ function valueAccessor(scope, element) {
var validatorName = element.attr('ng-validate') || NOOP,
validator = compileValidator(validatorName),
required = element.attr('ng-required'),
- lastError;
+ lastError,
+ invalidWidgets = scope.$invalidWidgets || {markValid:noop, markInvalid:noop};
required = required || required === '';
if (!validator) throw "Validator named '" + validatorName + "' not found.";
function validate(value) {
@@ -30,6 +31,10 @@ function valueAccessor(scope, element) {
if (error !== lastError) {
elementError(element, NG_VALIDATION_ERROR, error);
lastError = error;
+ if (error)
+ invalidWidgets.markInvalid(element);
+ else
+ invalidWidgets.markValid(element);
}
return value;
}
diff --git a/src/services.js b/src/services.js
index 173cee98..9d60f795 100644
--- a/src/services.js
+++ b/src/services.js
@@ -87,3 +87,18 @@ angularService("$hover", function(browser) {
}
});
}, {inject:['$browser']});
+
+angularService("$invalidWidgets", function(){
+ var invalidWidgets = [];
+ invalidWidgets.markValid = function(element){
+ var index = indexOf(invalidWidgets, element);
+ if (index != -1)
+ invalidWidgets.splice(index, 1);
+ };
+ invalidWidgets.markInvalid = function(element){
+ var index = indexOf(invalidWidgets, element);
+ if (index === -1)
+ invalidWidgets.push(element);
+ };
+ return invalidWidgets;
+});
--
cgit v1.2.3
From ab7b7dbf76d25401c4862171b3e54c9748b5098c Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 7 Apr 2010 14:14:25 -0700
Subject: ngswitch using
---
src/widgets.js | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/widgets.js b/src/widgets.js
index 012f13e2..0f781f2c 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -206,10 +206,12 @@ angularWidget('NG:SWITCH', function ngSwitch(element){
this.$watch(watchExpr, function(value){
element.html('');
childScope = null;
+ var params = {};
foreach(cases, function(switchCase){
- if (switchCase.when(childScope, value)) {
+ if (switchCase.when(params, value)) {
element.append(switchCase.element);
childScope = createScope(scope);
+ extend(childScope, params);
childScope.$tryEval(switchCase.change, element);
switchCase.template(switchCase.element, childScope);
childScope.$init();
@@ -225,7 +227,23 @@ angularWidget('NG:SWITCH', function ngSwitch(element){
return on == when;
},
route: function(on, when) {
- this.name = 'misko';
- return true;
+ var regex = '^' + when.replace(/[\.\\\(\)\^\$]/g, "\$1") + '$', params = [], self = this;
+ foreach(when.split(/\W/), function(param){
+ if (param) {
+ var paramRegExp = new RegExp(":" + param + "([\\W])");
+ if (regex.match(paramRegExp)) {
+ regex = regex.replace(paramRegExp, "(.*)$1");
+ params.push(param);
+ }
+ }
+ });
+ console.log(regex);
+ var match = on.match(new RegExp(regex));
+ if (match) {
+ foreach(params, function(name, index){
+ self[name] = match[index + 1];
+ });
+ }
+ return match;
}
});
--
cgit v1.2.3
From a8aa5af413c068608aa28ef0d48cef1d5ad66485 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 7 Apr 2010 16:36:33 -0700
Subject: fixed filter this
---
src/Parser.js | 11 +----------
src/widgets.js | 3 +--
2 files changed, 2 insertions(+), 12 deletions(-)
(limited to 'src')
diff --git a/src/Parser.js b/src/Parser.js
index 8e42f18a..dfe56cc9 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -372,16 +372,7 @@ Parser.prototype = {
for ( var i = 0; i < argsFn.length; i++) {
args.push(argsFn[i](self));
}
- var pipeThis = function(){
- var _this = this;
- foreach(self, function(v, k) {
- if (k.charAt(0) == '$') {
- _this[k] = v;
- }
- });
- };
- pipeThis.prototype = self.self;
- return fn.apply(new pipeThis(), args);
+ return fn.apply(self.state, args);
};
return function(){
return fnInvoke;
diff --git a/src/widgets.js b/src/widgets.js
index 376518e9..e89e8ca4 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -27,7 +27,7 @@ function valueAccessor(scope, element) {
required = required || required === '';
if (!validator) throw "Validator named '" + validatorName + "' not found.";
function validate(value) {
- var error = required && !trim(value) ? "Required" : validator({self:scope, scope:{get:scope.$get, set:scope.$set}}, value);
+ var error = required && !trim(value) ? "Required" : validator({state:scope, scope:{get:scope.$get, set:scope.$set}}, value);
if (error !== lastError) {
elementError(element, NG_VALIDATION_ERROR, error);
lastError = error;
@@ -242,7 +242,6 @@ angularWidget('NG:SWITCH', function ngSwitch(element){
}
}
});
- console.log(regex);
var match = on.match(new RegExp(regex));
if (match) {
foreach(params, function(name, index){
--
cgit v1.2.3
From e0ad7dfcd47196d0aa9271e84b2c4ac26cfda3f4 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 7 Apr 2010 17:24:24 -0700
Subject: seperatio validation and exception handling
---
src/Angular.js | 5 ++---
src/directives.js | 7 ++++++-
src/services.js | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 3b5e1c90..d8b03464 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -10,7 +10,6 @@ var consoleNode,
PRIORITY_WATCH = -1000,
PRIORITY_LAST = 99999,
NOOP = 'noop',
- NG_ERROR = 'ng-error',
NG_EXCEPTION = 'ng-exception',
NG_VALIDATION_ERROR = 'ng-validation-error',
jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
@@ -259,10 +258,10 @@ function elementError(element, type, error) {
}
if (error) {
element.addClass(type);
- element.attr(NG_ERROR, error);
+ element.attr(type, error);
} else {
element.removeClass(type);
- element.removeAttr(NG_ERROR);
+ element.removeAttr(type);
}
}
diff --git a/src/directives.js b/src/directives.js
index 5cee0978..22ff7544 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -80,12 +80,17 @@ angularDirective("ng-bind-template", function(expression){
};
});
+var REMOVE_ATTRIBUTES = {
+ 'disabled':true,
+ 'readonly':true,
+ 'checked':true
+};
angularDirective("ng-bind-attr", function(expression){
return function(element){
this.$onEval(function(){
foreach(this.$eval(expression), function(bindExp, key) {
var value = compileBindTemplate(bindExp).call(this, element);
- if (key == 'disabled' && !toBoolean(value)) {
+ if (REMOVE_ATTRIBUTES[lowercase(key)] && !toBoolean(value)) {
element.removeAttr('disabled');
} else {
element.attr(key, value);
diff --git a/src/services.js b/src/services.js
index 9d60f795..291e1704 100644
--- a/src/services.js
+++ b/src/services.js
@@ -47,7 +47,7 @@ angularService("$location", function(browser){
angularService("$hover", function(browser) {
var tooltip, self = this, error, width = 300, arrowWidth = 10;
browser.hover(function(element, show){
- if (show && (error = element.attr('ng-error'))) {
+ if (show && (error = element.attr(NG_EXCEPTION) || element.attr(NG_VALIDATION_ERROR))) {
if (!tooltip) {
tooltip = {
callout: jqLite(''),
--
cgit v1.2.3
From c4ef1f2fdd73bdaeda879e596d3d96e4e68cb6fd Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 8 Apr 2010 13:43:40 -0700
Subject: tests failing jstd to show cory
---
src/Angular.js | 8 +++++++-
src/filters.js | 4 ++--
src/jqLite.js | 5 +++++
src/widgets.js | 12 ++++++++----
4 files changed, 22 insertions(+), 7 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index d8b03464..7fb59f86 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -83,7 +83,7 @@ function extensionMap(angular, name) {
}
function jqLiteWrap(element) {
- if (typeof element == 'string') {
+ if (isString(element)) {
var div = document.createElement('div');
div.innerHTML = element;
element = div.childNodes[0];
@@ -102,6 +102,12 @@ function lowercase(value){ return isString(value) ? value.toLowerCase() : value;
function uppercase(value){ return isString(value) ? value.toUpperCase() : value; }
function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; }
function nodeName(element) { return (element[0] || element).nodeName; }
+
+function isVisible(element) {
+ var rect = element[0].getBoundingClientRect();
+ return rect.width !=0 && rect.height !=0;
+}
+
function map(obj, iterator, context) {
var results = [];
foreach(obj, function(value, index, list) {
diff --git a/src/filters.js b/src/filters.js
index dac8d31d..0259f69c 100644
--- a/src/filters.js
+++ b/src/filters.js
@@ -24,7 +24,7 @@ var angularFilterGoogleChartApi;
foreach({
'currency': function(amount){
- jQuery(this.$element).toggleClass('ng-format-negative', amount < 0);
+ this.$element.toggleClass('ng-format-negative', amount < 0);
return '$' + angularFilter['number'].apply(this, [amount, 2]);
},
@@ -60,7 +60,7 @@ foreach({
},
'json': function(object) {
- jQuery(this.$element).addClass("ng-monospace");
+ this.$element.addClass("ng-monospace");
return toJson(object, true);
},
diff --git a/src/jqLite.js b/src/jqLite.js
index e9407987..6fc16e57 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -140,6 +140,11 @@ JQLite.prototype = {
this[0].className = trim((" " + this[0].className + " ").replace(/[\n\t]/g, " ").replace(" " + selector + " ", ""));
},
+ toggleClass: function(selector, condition) {
+ var self = this;
+ (condition ? self.addClass : self.removeClass).call(self, selector);
+ },
+
addClass: function( selector ) {
if (!this.hasClass(selector)) {
this[0].className = trim(this[0].className + ' ' + selector);
diff --git a/src/widgets.js b/src/widgets.js
index e89e8ca4..faa60043 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -22,16 +22,20 @@ function valueAccessor(scope, element) {
var validatorName = element.attr('ng-validate') || NOOP,
validator = compileValidator(validatorName),
required = element.attr('ng-required'),
- lastError,
+ lastError, lastVisible,
invalidWidgets = scope.$invalidWidgets || {markValid:noop, markInvalid:noop};
required = required || required === '';
if (!validator) throw "Validator named '" + validatorName + "' not found.";
function validate(value) {
- var error = required && !trim(value) ? "Required" : validator({state:scope, scope:{get:scope.$get, set:scope.$set}}, value);
- if (error !== lastError) {
+ var error = required && !trim(value) ?
+ "Required" :
+ validator({state:scope, scope:{get:scope.$get, set:scope.$set}}, value),
+ visible = isVisible(element);
+ if (error !== lastError || visible !== lastVisible) {
elementError(element, NG_VALIDATION_ERROR, error);
lastError = error;
- if (error)
+ lastVisible = visible;
+ if (error && visible)
invalidWidgets.markInvalid(element);
else
invalidWidgets.markValid(element);
--
cgit v1.2.3
From 41a5c408c242269bf31bc0b774c7304fdf7c2f1c Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 8 Apr 2010 15:05:05 -0700
Subject: tests pass jstd has issues
---
src/services.js | 7 +++++++
src/widgets.js | 10 ++++------
2 files changed, 11 insertions(+), 6 deletions(-)
(limited to 'src')
diff --git a/src/services.js b/src/services.js
index 291e1704..6e1a1945 100644
--- a/src/services.js
+++ b/src/services.js
@@ -100,5 +100,12 @@ angularService("$invalidWidgets", function(){
if (index === -1)
invalidWidgets.push(element);
};
+ invalidWidgets.visible = function() {
+ var count = 0;
+ foreach(invalidWidgets, function(widget){
+ count = count + (isVisible(widget) ? 1 : 0);
+ });
+ return count;
+ };
return invalidWidgets;
});
diff --git a/src/widgets.js b/src/widgets.js
index faa60043..f87c1d02 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -22,20 +22,18 @@ function valueAccessor(scope, element) {
var validatorName = element.attr('ng-validate') || NOOP,
validator = compileValidator(validatorName),
required = element.attr('ng-required'),
- lastError, lastVisible,
+ lastError,
invalidWidgets = scope.$invalidWidgets || {markValid:noop, markInvalid:noop};
required = required || required === '';
if (!validator) throw "Validator named '" + validatorName + "' not found.";
function validate(value) {
var error = required && !trim(value) ?
"Required" :
- validator({state:scope, scope:{get:scope.$get, set:scope.$set}}, value),
- visible = isVisible(element);
- if (error !== lastError || visible !== lastVisible) {
+ validator({state:scope, scope:{get:scope.$get, set:scope.$set}}, value);
+ if (error !== lastError) {
elementError(element, NG_VALIDATION_ERROR, error);
lastError = error;
- lastVisible = visible;
- if (error && visible)
+ if (error)
invalidWidgets.markInvalid(element);
else
invalidWidgets.markValid(element);
--
cgit v1.2.3
From 843bd355d25ebf2369aec79f98cb6704d38497e9 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 9 Apr 2010 16:20:15 -0700
Subject: various bug fixes
---
src/Angular.js | 2 +-
src/Compiler.js | 14 +++++++-------
src/Scope.js | 5 ++++-
src/angular-bootstrap.js | 2 +-
src/apis.js | 4 +++-
src/services.js | 26 +++++++++++++++++---------
src/widgets.js | 35 +++++++++++++++++++++--------------
7 files changed, 54 insertions(+), 34 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 7fb59f86..11ebc4bc 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -319,7 +319,7 @@ function merge(src, dst) {
}
function compile(element, parentScope, overrides) {
- var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget);
+ var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget),
$element = jqLite(element),
parent = extend({}, parentScope);
parent.$element = $element;
diff --git a/src/Compiler.js b/src/Compiler.js
index ae2bcdb6..8c95ee8e 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -143,8 +143,8 @@ Compiler.prototype = {
};
function eachTextNode(element, fn){
- var i, chldNodes = element[0].childNodes || [], size = chldNodes.length, chld;
- for (i = 0; i < size; i++) {
+ var i, chldNodes = element[0].childNodes || [], chld;
+ for (i = 0; i < chldNodes.length; i++) {
if(isTextNode(chld = chldNodes[i])) {
fn(jqLite(chld), i);
}
@@ -152,8 +152,8 @@ function eachTextNode(element, fn){
}
function eachNode(element, fn){
- var i, chldNodes = element[0].childNodes || [], size = chldNodes.length, chld;
- for (i = 0; i < size; i++) {
+ var i, chldNodes = element[0].childNodes || [], chld;
+ for (i = 0; i < chldNodes.length; i++) {
if(!isTextNode(chld = chldNodes[i])) {
fn(jqLite(chld), i);
}
@@ -161,11 +161,11 @@ function eachNode(element, fn){
}
function eachAttribute(element, fn){
- var i, attrs = element[0].attributes || [], size = attrs.length, chld, attr, attrValue = {};
- for (i = 0; i < size; i++) {
+ var i, attrs = element[0].attributes || [], chld, attr, attrValue = {};
+ for (i = 0; i < attrs.length; i++) {
attr = attrs[i];
attrValue[attr.name] = attr.value;
}
- foreach(attrValue, fn);
+ foreachSorted(attrValue, fn);
}
diff --git a/src/Scope.js b/src/Scope.js
index 0bc551c4..7529d726 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -179,7 +179,10 @@ function createScope(parent, services, existing) {
}
foreach(services, function(_, name){
- instance[name] = inject(name);
+ var service = inject(name);
+ if (service) {
+ instance[name] = service;
+ }
});
return instance;
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index d9633854..704c50e2 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -43,7 +43,7 @@
addScript("/JSON.js");
addScript("/Compiler.js");
addScript("/Scope.js");
- addScript("/jqlite.js");
+ addScript("/jqLite.js");
addScript("/Parser.js");
addScript("/Resource.js");
addScript("/Browser.js");
diff --git a/src/apis.js b/src/apis.js
index 3d0c5db3..5864ad60 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -14,7 +14,9 @@ var angularGlobal = {
var angularCollection = {
'size': size
};
-var angularObject = {};
+var angularObject = {
+ 'extend': extend
+};
var angularArray = {
'indexOf': indexOf,
'include': includes,
diff --git a/src/services.js b/src/services.js
index 6e1a1945..e2132f1c 100644
--- a/src/services.js
+++ b/src/services.js
@@ -7,6 +7,7 @@ var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.]*)(:([0-9]+))
var DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp':21};
angularService("$location", function(browser){
var scope = this, location = {parse:parse, toString:toString};
+ var lastHash;
function parse(url){
if (isDefined(url)) {
var match = URL_MATCH.exec(url);
@@ -18,16 +19,25 @@ angularService("$location", function(browser){
location.path = match[6];
location.search = parseKeyValue(match[8]);
location.hash = match[9];
- if (location.hash) location.hash = location.hash.substr(1);
+ if (location.hash)
+ location.hash = location.hash.substr(1);
+ lastHash = location.hash;
location.hashPath = match[11] || '';
location.hashSearch = parseKeyValue(match[13]);
}
}
}
function toString() {
- var hashKeyValue = toKeyValue(location.hashSearch),
- hash = (location.hashPath ? location.hashPath : '') + (hashKeyValue ? '?' + hashKeyValue : '');
- return location.href.split('#')[0] + '#' + (hash ? hash : '');
+ 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) parse(url);
+ return url;
+ } else {
+ parse(location.href.split('#')[0] + '#' + location.hash);
+ return toString();
+ }
}
browser.watchUrl(function(url){
parse(url);
@@ -35,11 +45,7 @@ angularService("$location", function(browser){
});
parse(browser.getUrl());
this.$onEval(PRIORITY_LAST, function(){
- var href = toString();
- if (href != location.href) {
- browser.setUrl(href);
- location.href = href;
- }
+ browser.setUrl(toString());
});
return location;
}, {inject: ['$browser']});
@@ -69,6 +75,7 @@ angularService("$hover", function(browser) {
tooltip.arrow.addClass('ng-arrow-right');
tooltip.arrow.css({left: (width + 1)+'px'});
tooltip.callout.css({
+ position: 'fixed',
left: (elementRect.left - arrowWidth - width - 4) + "px",
top: (elementRect.top - 3) + "px",
width: width + "px"
@@ -76,6 +83,7 @@ angularService("$hover", function(browser) {
} else {
tooltip.arrow.addClass('ng-arrow-left');
tooltip.callout.css({
+ position: 'fixed',
left: (elementRect.right + arrowWidth) + "px",
top: (elementRect.top - 3) + "px",
width: width + "px"
diff --git a/src/widgets.js b/src/widgets.js
index f87c1d02..f5f02813 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -27,9 +27,11 @@ function valueAccessor(scope, element) {
required = required || required === '';
if (!validator) throw "Validator named '" + validatorName + "' not found.";
function validate(value) {
- var error = required && !trim(value) ?
- "Required" :
- validator({state:scope, scope:{get:scope.$get, set:scope.$set}}, value);
+ var error,
+ validateScope = extend(new (extend(function(){}, {prototype:scope}))(), {$element:element});
+ error = required && !trim(value) ?
+ "Required" :
+ validator({state:validateScope, scope:{get:validateScope.$get, set:validateScope.$set}}, value);
if (error !== lastError) {
elementError(element, NG_VALIDATION_ERROR, error);
lastError = error;
@@ -190,7 +192,8 @@ angularWidget('NG:INCLUDE', function(element){
angularWidget('NG:SWITCH', function ngSwitch(element){
var compiler = this,
watchExpr = element.attr("on"),
- whenFn = ngSwitch[element.attr("using") || 'equals'];
+ whenExpr = (element.attr("using") || 'equals').split(":");
+ whenFn = ngSwitch[whenExpr.shift()];
changeExpr = element.attr('change') || '',
cases = [];
if (!whenFn) throw "Using expression '" + usingExpr + "' unknown.";
@@ -199,7 +202,11 @@ angularWidget('NG:SWITCH', function ngSwitch(element){
if (when) {
cases.push({
when: function(scope, value){
- return whenFn.call(scope, value, when);
+ var args = [value, when];
+ foreach(whenExpr, function(arg){
+ args.push(arg);
+ });
+ return whenFn.apply(scope, args);
},
change: changeExpr,
element: caseElement,
@@ -212,13 +219,10 @@ angularWidget('NG:SWITCH', function ngSwitch(element){
var scope = this, childScope;
this.$watch(watchExpr, function(value){
element.html('');
- childScope = null;
- var params = {};
+ childScope = createScope(scope);
foreach(cases, function(switchCase){
- if (switchCase.when(params, value)) {
+ if (switchCase.when(childScope, value)) {
element.append(switchCase.element);
- childScope = createScope(scope);
- extend(childScope, params);
childScope.$tryEval(switchCase.change, element);
switchCase.template(switchCase.element, childScope);
childScope.$init();
@@ -233,13 +237,15 @@ angularWidget('NG:SWITCH', function ngSwitch(element){
equals: function(on, when) {
return on == when;
},
- route: function(on, when) {
- var regex = '^' + when.replace(/[\.\\\(\)\^\$]/g, "\$1") + '$', params = [], self = this;
+ route: function(on, when, dstName) {
+ var regex = '^' + when.replace(/[\.\\\(\)\^\$]/g, "\$1") + '$',
+ params = [],
+ dst = {};
foreach(when.split(/\W/), function(param){
if (param) {
var paramRegExp = new RegExp(":" + param + "([\\W])");
if (regex.match(paramRegExp)) {
- regex = regex.replace(paramRegExp, "(.*)$1");
+ regex = regex.replace(paramRegExp, "([^\/]*)$1");
params.push(param);
}
}
@@ -247,8 +253,9 @@ angularWidget('NG:SWITCH', function ngSwitch(element){
var match = on.match(new RegExp(regex));
if (match) {
foreach(params, function(name, index){
- self[name] = match[index + 1];
+ dst[name] = match[index + 1];
});
+ if (dstName) this.$set(dstName, dst);
}
return match;
}
--
cgit v1.2.3
From 2637d4e90c8a43436d21a4b9e790b00ae461c438 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 12 Apr 2010 14:28:15 -0700
Subject: removed Meta and allowed binding of HTML
---
src/Angular.js | 19 ++++++------
src/directives.js | 24 +++++++++++----
src/filters.js | 92 +++++++++++++++++++++----------------------------------
src/jqLite.js | 16 ++++++++--
4 files changed, 76 insertions(+), 75 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 11ebc4bc..d60e1b85 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -86,9 +86,12 @@ function jqLiteWrap(element) {
if (isString(element)) {
var div = document.createElement('div');
div.innerHTML = element;
- element = div.childNodes[0];
+ element = new JQLite(div.childNodes);
+ } else if (element instanceof JQLite) {
+ } else if (isElement(element)) {
+ element = new JQLite(element);
}
- return element instanceof JQLite ? element : new JQLite(element);
+ return element;
}
function isUndefined(value){ return typeof value == 'undefined'; }
function isDefined(value){ return typeof value != 'undefined'; }
@@ -102,6 +105,10 @@ function lowercase(value){ return isString(value) ? value.toLowerCase() : value;
function uppercase(value){ return isString(value) ? value.toUpperCase() : value; }
function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; }
function nodeName(element) { return (element[0] || element).nodeName; }
+function isElement(node) {
+ if (node && node[0]) node = node[0];
+ return node && node.nodeName;
+}
function isVisible(element) {
var rect = element[0].getBoundingClientRect();
@@ -185,14 +192,6 @@ function consoleLog(level, objs) {
consoleNode.appendChild(log);
}
-function isNode(inp) {
- return inp &&
- inp.tagName &&
- inp.nodeName &&
- inp.ownerDocument &&
- inp.removeAttribute;
-}
-
function isLeafNode (node) {
if (node) {
switch (node.nodeName) {
diff --git a/src/directives.js b/src/directives.js
index 22ff7544..2ead4979 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -23,14 +23,23 @@ angularDirective("ng-eval", function(expression){
});
angularDirective("ng-bind", function(expression){
- var templateFn = compileBindTemplate("{{" + expression + "}}");
return function(element) {
- var lastValue;
+ var lastValue, lastError;
this.$onEval(function() {
- var value = templateFn.call(this, element);
- if (value != lastValue) {
- element.text(value);
+ var error, value = this.$tryEval(expression, function(e){
+ error = toJson(e);
+ });
+ if (value != lastValue || error != lastError) {
lastValue = value;
+ lastError = error;
+ elementError(element, NG_EXCEPTION, error);
+ if (error) value = error;
+ if (isElement(value)) {
+ element.html('');
+ element.append(value);
+ } else {
+ element.text(value);
+ }
}
}, element);
};
@@ -57,7 +66,10 @@ function compileBindTemplate(template){
var parts = [], self = this;
foreach(bindings, function(fn){
var value = fn.call(self, element);
- if (isObject(value)) value = toJson(value, true);
+ if (isElement(value))
+ value = '';
+ else if (isObject(value))
+ value = toJson(value, true);
parts.push(value);
});
return parts.join('');
diff --git a/src/filters.js b/src/filters.js
index 0259f69c..d0fc2ae7 100644
--- a/src/filters.js
+++ b/src/filters.js
@@ -1,25 +1,3 @@
-angularFilter.Meta = function(obj){
- if (obj) {
- for ( var key in obj) {
- this[key] = obj[key];
- }
- }
-};
-angularFilter.Meta.get = function(obj, attr){
- attr = attr || 'text';
- switch(typeof obj) {
- case "string":
- return attr == "text" ? obj : undefined;
- case "object":
- if (obj && typeof obj[attr] !== "undefined") {
- return obj[attr];
- }
- return undefined;
- default:
- return obj;
- }
-};
-
var angularFilterGoogleChartApi;
foreach({
@@ -92,31 +70,33 @@ foreach({
if (!returnValue && regexp.test(tNo)) {
var text = carrier.name + ": " + trackingNo;
var url = carrier.url + trackingNo;
- returnValue = new angularFilter.Meta({
- text:text,
- url:url,
- html: '' + text + '',
- trackingNo:trackingNo});
+ returnValue = jqLite('');
+ returnValue.text(text);
+ returnValue.attr('href', url);
}
});
});
if (returnValue)
return returnValue;
else if (trackingNo)
- return noMatch || new angularFilter.Meta({text:trackingNo + " is not recognized"});
+ return noMatch || trackingNo + " is not recognized";
else
return null;
};})(),
'link': function(obj, title) {
- var text = title || angularFilter.Meta.get(obj);
- var url = angularFilter.Meta.get(obj, "url") || angularFilter.Meta.get(obj);
- if (url) {
- if (angular.validator.email(url) === null) {
- url = "mailto:" + url;
+ 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.attr('href', url);
+ a.text(text);
+ return a;
}
- var html = '' + text + '';
- return new angularFilter.Meta({text:text, url:url, html:html});
}
return obj;
},
@@ -143,31 +123,27 @@ foreach({
'image': function(obj, width, height) {
if (obj && obj.url) {
- var style = "";
+ var style = "", img = jqLite('![]()
');
if (width) {
- style = ' style="max-width: ' + width +
- 'px; max-height: ' + (height || width) + 'px;"';
+ img.css('max-width', width + 'px');
+ img.css('max-height', (height || width) + 'px');
}
- return new angularFilter.Meta({url:obj.url, text:obj.url,
- html:''});
+ img.attr('src', obj.url);
+ return img;
}
return null;
},
- 'lowercase': function (obj) {
- var text = angularFilter.Meta.get(obj);
- return text ? ("" + text).toLowerCase() : text;
- },
+ 'lowercase': lowercase,
- 'uppercase': function (obj) {
- var text = angularFilter.Meta.get(obj);
- return text ? ("" + text).toUpperCase() : text;
- },
+ 'uppercase': uppercase,
'linecount': function (obj) {
- var text = angularFilter.Meta.get(obj);
- if (text==='' || !text) return 1;
- return text.split(/\n|\f/).length;
+ if (isString(obj)) {
+ if (obj==='') return 1;
+ return obj.split(/\n|\f/).length;
+ }
+ return 1;
},
'if': function (result, expression) {
@@ -236,8 +212,9 @@ foreach({
'encode': function(params, width, height) {
width = width || 200;
height = height || width;
- var url = "http://chart.apis.google.com/chart?";
- var urlParam = [];
+ var url = "http://chart.apis.google.com/chart?",
+ urlParam = [],
+ img = jqLite('![]()
');
params['chs'] = width + "x" + height;
foreach(params, function(value, key){
if (value) {
@@ -246,8 +223,9 @@ foreach({
});
urlParam.sort();
url += urlParam.join("&");
- return new angularFilter.Meta({url:url,
- html:''});
+ img.attr('src', url);
+ img.css({width: width + 'px', height: height + 'px'});
+ return img;
}
}
),
@@ -291,7 +269,7 @@ foreach({
},
'html': function(html){
- return new angularFilter.Meta({html:html});
+ return jqLite(html);
},
'linky': function(text){
@@ -313,7 +291,7 @@ foreach({
raw = raw.substring(i + url.length);
}
html.push(escapeHtml(raw));
- return new angularFilter.Meta({text:text, html:html.join('')});
+ return jqLite(html.join(''));
}
}, function(v,k){angularFilter[k] = v;});
diff --git a/src/jqLite.js b/src/jqLite.js
index 6fc16e57..d4c5492c 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -34,7 +34,15 @@ function jqClearData(element) {
}
function JQLite(element) {
- this[0] = element;
+ if (element.length && element.item) {
+ for(var i=0; i < element.length; i++) {
+ this[i] = element[i];
+ }
+ this.length = element.length;
+ } else {
+ this[0] = element;
+ this.length = 1;
+ }
}
JQLite.prototype = {
@@ -111,7 +119,11 @@ JQLite.prototype = {
},
append: function(node) {
- this[0].appendChild(jqLite(node)[0]);
+ var self = this[0];
+ node = jqLite(node);
+ foreach(node, function(child){
+ self.appendChild(child);
+ });
},
remove: function() {
--
cgit v1.2.3
From 841640e540b5e054a97e650bdd7b560680e94840 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 12 Apr 2010 14:30:57 -0700
Subject: removed Meta and allowed binding of HTML
---
src/validators.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/validators.js b/src/validators.js
index e3da0a81..4544b96c 100644
--- a/src/validators.js
+++ b/src/validators.js
@@ -103,9 +103,9 @@ foreach({
});
}
- if (state === null){
+ if (state === null && this['$invalidWidgets']){
// request in flight, mark widget invalid, but don't show it to user
- (this['$invalidWidgets']||[]).push(this.$element);
+ this['$invalidWidgets'].markInvalid(this.$element);
}
return state;
}
--
cgit v1.2.3
From 713307b6505a56ca7b5423b36e297070d756ff15 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 12 Apr 2010 16:24:28 -0700
Subject: added ng-eval-order attribute
---
src/Angular.js | 1 +
src/Compiler.js | 35 ++++++++++++++++++++++++++++-------
2 files changed, 29 insertions(+), 7 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index d60e1b85..88aab8e7 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -9,6 +9,7 @@ var consoleNode,
PRIORITY_FIRST = -99999,
PRIORITY_WATCH = -1000,
PRIORITY_LAST = 99999,
+ PRIORITY = {'FIRST': PRIORITY_FIRST, 'LAST': PRIORITY_LAST, 'WATCH':PRIORITY_WATCH},
NOOP = 'noop',
NG_EXCEPTION = 'ng-exception',
NG_VALIDATION_ERROR = 'ng-validation-error',
diff --git a/src/Compiler.js b/src/Compiler.js
index 8c95ee8e..a762b5fd 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -4,17 +4,34 @@
* bind to a new instance of elements. It also provides a list
* of child paths which contain child templates
*/
-function Template() {
+function Template(priority) {
this.paths = [];
this.children = [];
this.inits = [];
+ this.priority = priority || 0;
}
Template.prototype = {
init: function(element, scope) {
+ var inits = {};
+ this.collectInits(element, inits);
+ foreachSorted(inits, function(queue){
+ foreach(queue, function(fn){
+ fn(scope);
+ });
+ });
+ },
+
+ collectInits: function(element, inits) {
+ var queue = inits[this.priority];
+ if (!queue) {
+ inits[this.priority] = queue = [];
+ }
element = jqLite(element);
foreach(this.inits, function(fn) {
- scope.$tryEval(fn, element, element);
+ queue.push(function(scope) {
+ scope.$tryEval(fn, element, element);
+ });
});
var i,
@@ -23,7 +40,7 @@ Template.prototype = {
paths = this.paths,
length = paths.length;
for (i = 0; i < length; i++) {
- children[i].init(childNodes[paths[i]], scope);
+ children[i].collectInits(childNodes[paths[i]], inits);
}
},
@@ -78,13 +95,13 @@ Compiler.prototype = {
};
},
- templatize: function(element){
+ templatize: function(element, priority){
var self = this,
widget,
directiveFns = self.directives,
descend = true,
directives = true,
- template = new Template(),
+ template,
selfApi = {
compile: bind(self, self.compile),
comment:function(text) {return jqLite(document.createComment(text));},
@@ -93,7 +110,11 @@ 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;
+ if (isString(priority)) {
+ priority = PRIORITY[uppercase(priority)] || 0;
+ }
+ template = new Template(priority);
eachAttribute(element, function(value, name){
if (!widget) {
if (widget = self.widgets['@' + name]) {
@@ -135,7 +156,7 @@ Compiler.prototype = {
// Process non text child nodes
if (descend) {
eachNode(element, function(child, i){
- template.addChild(i, self.templatize(child));
+ template.addChild(i, self.templatize(child, priority));
});
}
return template.empty() ? null : template;
--
cgit v1.2.3
From 7c49b255483c0381c23de41d108800f93ebc1979 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 12 Apr 2010 19:05:39 -0700
Subject: $invalid widget clear on switch change
---
src/services.js | 15 +++++++++++++++
src/widgets.js | 2 ++
2 files changed, 17 insertions(+)
(limited to 'src')
diff --git a/src/services.js b/src/services.js
index e2132f1c..e91a8eca 100644
--- a/src/services.js
+++ b/src/services.js
@@ -115,5 +115,20 @@ angularService("$invalidWidgets", function(){
});
return count;
};
+ invalidWidgets.clearOrphans = function() {
+ for(var i = 0; i < invalidWidgets.length;) {
+ var widget = invalidWidgets[i];
+ if (isOrphan(widget[0])) {
+ invalidWidgets.splice(i, 1);
+ } else {
+ i++;
+ }
+ }
+ };
+ function isOrphan(widget) {
+ if (widget == window.document) return false;
+ var parent = widget.parentNode;
+ return !parent || isOrphan(parent);
+ }
return invalidWidgets;
});
diff --git a/src/widgets.js b/src/widgets.js
index f5f02813..b281ac2e 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -225,6 +225,8 @@ angularWidget('NG:SWITCH', function ngSwitch(element){
element.append(switchCase.element);
childScope.$tryEval(switchCase.change, element);
switchCase.template(switchCase.element, childScope);
+ if (scope.$invalidWidgets)
+ scope.$invalidWidgets.clearOrphans();
childScope.$init();
}
});
--
cgit v1.2.3
From cd03fe92a5dbd2aba516b64fc8067c5fba1e4a81 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 13 Apr 2010 14:25:12 -0700
Subject: checkbox widget fix
---
src/services.js | 7 ++++++-
src/widgets.js | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/services.js b/src/services.js
index e91a8eca..11453338 100644
--- a/src/services.js
+++ b/src/services.js
@@ -44,8 +44,13 @@ angularService("$location", function(browser){
scope.$root.$eval();
});
parse(browser.getUrl());
+ var lastURL;
this.$onEval(PRIORITY_LAST, function(){
- browser.setUrl(toString());
+ var url = toString();
+ if (lastURL != url) {
+ browser.setUrl(url);
+ lastURL = url;
+ }
});
return location;
}, {inject: ['$browser']});
diff --git a/src/widgets.js b/src/widgets.js
index b281ac2e..28798c1b 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -49,13 +49,13 @@ function valueAccessor(scope, element) {
}
function checkedAccessor(scope, element) {
- var domElement = element[0];
+ var domElement = element[0], elementValue = domElement.value;
return {
get: function(){
return !!domElement.checked;
},
set: function(value){
- domElement.checked = !!value;
+ domElement.checked = toBoolean(value);
}
};
}
--
cgit v1.2.3
From 70e401ef100614295fc808e32f0142f07c315461 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 15 Apr 2010 14:17:33 -0700
Subject: added $route service
---
src/AngularPublic.js | 1 +
src/Scope.js | 2 ++
src/services.js | 40 ++++++++++++++++++++++++++++++++++++++++
src/widgets.js | 2 +-
4 files changed, 44 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/AngularPublic.js b/src/AngularPublic.js
index 176d6a91..1739ac4b 100644
--- a/src/AngularPublic.js
+++ b/src/AngularPublic.js
@@ -16,6 +16,7 @@ extend(angular, {
'extend': extend,
'foreach': foreach,
'noop':noop,
+ 'bind':bind,
'identity':identity,
'isUndefined': isUndefined,
'isDefined': isDefined,
diff --git a/src/Scope.js b/src/Scope.js
index 7529d726..8d44f4ef 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -117,6 +117,8 @@ function createScope(parent, services, existing) {
exceptionHandler(e);
} else if (exceptionHandler) {
errorHandlerFor(exceptionHandler, e);
+ } else if (isFunction(instance.$exceptionHandler)) {
+ instance.$exceptionHandler(e);
}
}
},
diff --git a/src/services.js b/src/services.js
index 11453338..90a5bb85 100644
--- a/src/services.js
+++ b/src/services.js
@@ -137,3 +137,43 @@ angularService("$invalidWidgets", function(){
}
return invalidWidgets;
});
+
+angularService('$route', function(location, params){
+ var routes = {},
+ onChange = [],
+ matcher = angularWidget('NG:SWITCH').route,
+ $route = {
+ routes: routes,
+ onChange: bind(onChange, onChange.push),
+ when:function (path, params){
+ if (angular.isUndefined(path)) return routes;
+ var route = routes[path];
+ if (!route) route = routes[path] = {};
+ if (params) angular.extend(route, params);
+ return route;
+ }
+ };
+ this.$watch(function(){return location.hash;}, function(hash){
+ var parentScope = this, childScope;
+ $route.current = null;
+ angular.foreach(routes, function(routeParams, route) {
+ if (!childScope) {
+ var pathParams = matcher(location.hashPath, route);
+ if (pathParams) {
+ childScope = angular.scope(parentScope);
+ $route.current = angular.extend({}, routeParams, {
+ scope: childScope,
+ params: angular.extend({}, location.hashSearch, pathParams)
+ });
+ }
+ }
+ });
+ angular.foreach(onChange, parentScope.$tryEval);
+ if (childScope) {
+ childScope.$become($route.current.controller);
+ parentScope.$tryEval(childScope.init);
+ }
+ });
+ return $route;
+}, {inject: ['$location']});
+
diff --git a/src/widgets.js b/src/widgets.js
index 28798c1b..09b602af 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -259,6 +259,6 @@ angularWidget('NG:SWITCH', function ngSwitch(element){
});
if (dstName) this.$set(dstName, dst);
}
- return match;
+ return match ? dst : null;
}
});
--
cgit v1.2.3
From deb86fe357a901889bc4289087f0b9e69cb8a302 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 16 Apr 2010 14:01:29 -0700
Subject: lots of small fixes
---
src/Angular.js | 8 +++++++-
src/Browser.js | 9 +++++----
src/Scope.js | 12 +++++++++---
src/directives.js | 9 +++++++--
src/jqLite.js | 2 +-
src/services.js | 50 ++++++++++++++++++++++++++++++------------------
src/validators.js | 57 ++++++++++++++++++++++++++++++++++++-------------------
src/widgets.js | 35 +++++++++++++++++++++++++---------
8 files changed, 125 insertions(+), 57 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 88aab8e7..87a2f3d6 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -38,6 +38,12 @@ function foreach(obj, iterator, context) {
if (obj) {
if (obj.forEach) {
obj.forEach(iterator, context);
+ } else if (isFunction(obj)){
+ for (key in obj) {
+ if (key != 'prototype' && key != 'length' && key != 'name') {
+ iterator.call(context, obj[key], key);
+ }
+ }
} else if (isObject(obj) && isNumber(obj.length)) {
for (key = 0; key < obj.length; key++)
iterator.call(context, obj[key], key);
@@ -113,7 +119,7 @@ function isElement(node) {
function isVisible(element) {
var rect = element[0].getBoundingClientRect();
- return rect.width !=0 && rect.height !=0;
+ return rect.width && rect.height;
}
function map(obj, iterator, context) {
diff --git a/src/Browser.js b/src/Browser.js
index 69f3eb9a..ff8d9775 100644
--- a/src/Browser.js
+++ b/src/Browser.js
@@ -83,10 +83,11 @@ Browser.prototype = {
setUrl: function(url) {
var existingURL = this.location.href;
- if (!existingURL.match(/#/))
- existingURL += '#';
- if (existingURL != url)
- this.location.href = url;
+ if (!existingURL.match(/#/)) existingURL += '#';
+ if (!url.match(/#/)) url += '#';
+ if (existingURL != url) {
+ this.location.href = this.expectedUrl = url;
+ }
},
getUrl: function() {
diff --git a/src/Scope.js b/src/Scope.js
index 8d44f4ef..54e75dbd 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -81,7 +81,7 @@ function createScope(parent, services, existing) {
function API(){}
function Behavior(){}
- var instance, behavior, api, evalLists = {}, servicesCache = extend({}, existing);
+ var instance, behavior, api, evalLists = {sorted:[]}, servicesCache = extend({}, existing);
parent = Parent.prototype = (parent || {});
api = API.prototype = new Parent();
@@ -100,7 +100,7 @@ function createScope(parent, services, existing) {
if (isDefined(exp)) {
return expressionCompile(exp).apply(instance, slice.call(arguments, 1, arguments.length));
} else {
- foreachSorted(evalLists, function(list) {
+ foreach(evalLists.sorted, function(list) {
foreach(list, function(eval) {
instance.$tryEval(eval.fn, eval.handler);
});
@@ -143,7 +143,13 @@ function createScope(parent, services, existing) {
expr = priority;
priority = 0;
}
- var evalList = evalLists[priority] || (evalLists[priority] = []);
+ var evalList = evalLists[priority];
+ if (!evalList) {
+ evalList = evalLists[priority] = [];
+ evalList.priority = priority;
+ evalLists.sorted.push(evalList);
+ evalLists.sorted.sort(function(a,b){return a.priority-b.priority;});
+ }
evalList.push({
fn: expressionCompile(expr),
handler: exceptionHandler
diff --git a/src/directives.js b/src/directives.js
index 2ead4979..a37076d4 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -102,8 +102,13 @@ angularDirective("ng-bind-attr", function(expression){
this.$onEval(function(){
foreach(this.$eval(expression), function(bindExp, key) {
var value = compileBindTemplate(bindExp).call(this, element);
- if (REMOVE_ATTRIBUTES[lowercase(key)] && !toBoolean(value)) {
- element.removeAttr('disabled');
+ if (REMOVE_ATTRIBUTES[lowercase(key)]) {
+ if (!toBoolean(value)) {
+ element.removeAttr('disabled');
+ } else {
+ element.attr(key, value);
+ }
+ (element.data('$validate')||noop)();
} else {
element.attr(key, value);
}
diff --git a/src/jqLite.js b/src/jqLite.js
index d4c5492c..92bc22a7 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -185,7 +185,7 @@ JQLite.prototype = {
} else if (isDefined(value)) {
e.setAttribute(name, value);
} else {
- return e.getAttribute(name);
+ return e.getAttribute ? e.getAttribute(name) : undefined;
}
},
diff --git a/src/services.js b/src/services.js
index 90a5bb85..1d3ba006 100644
--- a/src/services.js
+++ b/src/services.js
@@ -3,12 +3,13 @@ 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 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:parse, toString:toString};
- var lastHash;
- function parse(url){
+ var scope = this, location = {parse:parseUrl, toString:toString};
+ var lastHash, lastUrl;
+ function parseUrl(url){
if (isDefined(url)) {
var match = URL_MATCH.exec(url);
if (match) {
@@ -18,38 +19,46 @@ angularService("$location", function(browser){
location.port = match[5] || DEFAULT_PORTS[location.href] || null;
location.path = match[6];
location.search = parseKeyValue(match[8]);
- location.hash = match[9];
+ location.hash = match[9] || '';
if (location.hash)
location.hash = location.hash.substr(1);
- lastHash = location.hash;
- location.hashPath = match[11] || '';
- location.hashSearch = parseKeyValue(match[13]);
+ parseHash(location.hash);
}
}
}
+ 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) parse(url);
+ if (url !== location.href) parseUrl(url);
return url;
} else {
- parse(location.href.split('#')[0] + '#' + location.hash);
+ parseUrl(location.href.split('#')[0] + '#' + location.hash);
return toString();
}
}
browser.watchUrl(function(url){
- parse(url);
+ parseUrl(url);
scope.$root.$eval();
});
- parse(browser.getUrl());
- var lastURL;
+ 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) {
+ if (lastUrl != url) {
browser.setUrl(url);
- lastURL = url;
+ lastUrl = url;
}
});
return location;
@@ -142,6 +151,7 @@ angularService('$route', function(location, params){
var routes = {},
onChange = [],
matcher = angularWidget('NG:SWITCH').route,
+ parentScope = this,
$route = {
routes: routes,
onChange: bind(onChange, onChange.push),
@@ -150,16 +160,19 @@ angularService('$route', function(location, params){
var route = routes[path];
if (!route) route = routes[path] = {};
if (params) angular.extend(route, params);
+ if (matcher(location.hashPath, path)) updateRoute();
return route;
}
};
- this.$watch(function(){return location.hash;}, function(hash){
- var parentScope = this, childScope;
+ function updateRoute(){
+ console.log('updating route');
+ var childScope;
$route.current = null;
angular.foreach(routes, function(routeParams, route) {
if (!childScope) {
var pathParams = matcher(location.hashPath, route);
if (pathParams) {
+ console.log('new route', routeParams.template, location.hashPath, location.hash);
childScope = angular.scope(parentScope);
$route.current = angular.extend({}, routeParams, {
scope: childScope,
@@ -173,7 +186,8 @@ angularService('$route', function(location, params){
childScope.$become($route.current.controller);
parentScope.$tryEval(childScope.init);
}
- });
+ }
+ this.$watch(function(){return location.hash;}, updateRoute);
return $route;
}, {inject: ['$location']});
diff --git a/src/validators.js b/src/validators.js
index 4544b96c..27b4b404 100644
--- a/src/validators.js
+++ b/src/validators.js
@@ -81,33 +81,52 @@ foreach({
}
},
- 'asynchronous': function(text, asynchronousFn) {
- var element = this['$element'];
- var cache = element.data('$validateState');
+ /*
+ * cache is attached to the element
+ * cache: {
+ * inputs : {
+ * 'user input': {
+ * response: server response,
+ * error: validation error
+ * },
+ * current: 'current input'
+ * }
+ *
+ */
+ 'asynchronous': function(input, asynchronousFn, updateFn) {
+ if (!input) return;
+ var scope = this;
+ var element = scope.$element;
+ var cache = element.data('$asyncValidator');
if (!cache) {
- cache = { state: {}};
- element.data('$validateState', cache);
+ element.data('$asyncValidator', cache = {inputs:{}});
}
- var state = cache.state[text];
- cache.lastKey = text;
- if (state === undefined) {
- // we have never seen this before, Request it
+
+ cache.current = input;
+
+ var inputState = cache.inputs[input];
+ if (!inputState) {
+ cache.inputs[input] = inputState = { inFlight: true };
+ scope.$invalidWidgets.markInvalid(scope.$element);
element.addClass('ng-input-indicator-wait');
- state = cache.state[text] = null;
- (asynchronousFn || noop)(text, function(error){
- state = cache.state[text] = error ? error : false;
- if (cache.state[cache.lastKey] !== null) {
+ asynchronousFn(input, function(error, data) {
+ inputState.response = data;
+ inputState.error = error;
+ inputState.inFlight = false;
+ if (cache.current == input) {
element.removeClass('ng-input-indicator-wait');
+ scope.$invalidWidgets.markValid(element);
}
- elementError(element, NG_VALIDATION_ERROR, error);
+ element.data('$validate')(input);
+ scope.$root.$eval();
});
- }
-
- if (state === null && this['$invalidWidgets']){
+ } else if (inputState.inFlight) {
// request in flight, mark widget invalid, but don't show it to user
- this['$invalidWidgets'].markInvalid(this.$element);
+ scope.$invalidWidgets.markInvalid(scope.$element);
+ } else {
+ (updateFn||noop)(inputState.response);
}
- return state;
+ return inputState.error;
}
}, function(v,k) {angularValidator[k] = v;});
diff --git a/src/widgets.js b/src/widgets.js
index 09b602af..2909aed1 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -27,6 +27,11 @@ function valueAccessor(scope, element) {
required = required || required === '';
if (!validator) throw "Validator named '" + validatorName + "' not found.";
function validate(value) {
+ if (element[0].disabled || isString(element.attr('readonly'))) {
+ elementError(element, NG_VALIDATION_ERROR, null);
+ invalidWidgets.markValid(element);
+ return value;
+ }
var error,
validateScope = extend(new (extend(function(){}, {prototype:scope}))(), {$element:element});
error = required && !trim(value) ?
@@ -42,6 +47,7 @@ function valueAccessor(scope, element) {
}
return value;
}
+ element.data('$validate', validate);
return {
get: function(){ return validate(element.val()); },
set: function(value){ element.val(validate(value)); }
@@ -167,20 +173,31 @@ angularWidget('SELECT', function(element){
angularWidget('NG:INCLUDE', function(element){
var compiler = this,
- src = element.attr("src");
- if (element.attr('switch-instance')) {
+ srcExp = element.attr("src"),
+ scopeExp = element.attr("scope") || '';
+ if (element[0]['ng-compiled']) {
this.descend(true);
this.directives(true);
} else {
+ element[0]['ng-compiled'] = true;
return function(element){
var scope = this, childScope;
- element.attr('switch-instance', 'compiled');
- scope.$browser.xhr('GET', src, function(code, response){
- element.html(response);
- childScope = createScope(scope);
- compiler.compile(element)(element, childScope);
- childScope.$init();
- scope.$root.$eval();
+ var changeCounter = 0;
+ function incrementChange(){ changeCounter++;}
+ this.$watch(srcExp, incrementChange);
+ this.$watch(scopeExp, incrementChange);
+ this.$watch(function(){return changeCounter;}, function(){
+ var src = this.$eval(srcExp),
+ useScope = this.$eval(scopeExp);
+ if (src) {
+ scope.$browser.xhr('GET', src, function(code, response){
+ element.html(response);
+ childScope = useScope || createScope(scope);
+ compiler.compile(element)(element, childScope);
+ childScope.$init();
+ scope.$root.$eval();
+ });
+ }
});
scope.$onEval(function(){
if (childScope) childScope.$eval();
--
cgit v1.2.3
From 6470b48ce022885551e83c9f5fd8a90fbc6ff80e Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 16 Apr 2010 17:03:06 -0700
Subject: validation issues fixed
---
src/services.js | 2 --
src/validators.js | 2 +-
src/widgets.js | 9 +++++++--
3 files changed, 8 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/services.js b/src/services.js
index 1d3ba006..d98c0876 100644
--- a/src/services.js
+++ b/src/services.js
@@ -165,14 +165,12 @@ angularService('$route', function(location, params){
}
};
function updateRoute(){
- console.log('updating route');
var childScope;
$route.current = null;
angular.foreach(routes, function(routeParams, route) {
if (!childScope) {
var pathParams = matcher(location.hashPath, route);
if (pathParams) {
- console.log('new route', routeParams.template, location.hashPath, location.hash);
childScope = angular.scope(parentScope);
$route.current = angular.extend({}, routeParams, {
scope: childScope,
diff --git a/src/validators.js b/src/validators.js
index 27b4b404..81d40264 100644
--- a/src/validators.js
+++ b/src/validators.js
@@ -117,7 +117,7 @@ foreach({
element.removeClass('ng-input-indicator-wait');
scope.$invalidWidgets.markValid(element);
}
- element.data('$validate')(input);
+ element.data('$validate')();
scope.$root.$eval();
});
} else if (inputState.inFlight) {
diff --git a/src/widgets.js b/src/widgets.js
index 2909aed1..828e6d24 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -27,6 +27,11 @@ function valueAccessor(scope, element) {
required = required || required === '';
if (!validator) throw "Validator named '" + validatorName + "' not found.";
function validate(value) {
+ var force = false;
+ if (isUndefined(value)) {
+ value = element.val();
+ force = true;
+ }
if (element[0].disabled || isString(element.attr('readonly'))) {
elementError(element, NG_VALIDATION_ERROR, null);
invalidWidgets.markValid(element);
@@ -36,8 +41,8 @@ function valueAccessor(scope, element) {
validateScope = extend(new (extend(function(){}, {prototype:scope}))(), {$element:element});
error = required && !trim(value) ?
"Required" :
- validator({state:validateScope, scope:{get:validateScope.$get, set:validateScope.$set}}, value);
- if (error !== lastError) {
+ (trim(value) ? validator({state:validateScope, scope:{get:validateScope.$get, set:validateScope.$set}}, value) : null);
+ if (error !== lastError || force) {
elementError(element, NG_VALIDATION_ERROR, error);
lastError = error;
if (error)
--
cgit v1.2.3
From 8394353b8580eadb9502abbcc963b594c9d9f53f Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 16 Apr 2010 20:10:09 -0700
Subject: bettor function iterator
---
src/Angular.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 87a2f3d6..ec1fa49b 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -36,14 +36,14 @@ function angularAlert(){
function foreach(obj, iterator, context) {
var key;
if (obj) {
- if (obj.forEach) {
- obj.forEach(iterator, context);
- } else if (isFunction(obj)){
+ if (isFunction(obj)){
for (key in obj) {
- if (key != 'prototype' && key != 'length' && key != 'name') {
+ if (key != 'prototype' && key != 'length' && key != 'name' && obj.hasOwnProperty(key)) {
iterator.call(context, obj[key], key);
}
}
+ } else if (obj.forEach) {
+ obj.forEach(iterator, context);
} else if (isObject(obj) && isNumber(obj.length)) {
for (key = 0; key < obj.length; key++)
iterator.call(context, obj[key], key);
--
cgit v1.2.3
From 8e1b670d5b262f70fdbf4c4b01d3109d54a12ac5 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 19 Apr 2010 12:54:39 -0700
Subject: fix ie bug with .text() on jqlite
---
src/Compiler.js | 4 ++--
src/jqLite.js | 4 ++--
src/markups.js | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/Compiler.js b/src/Compiler.js
index a762b5fd..376235f7 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -136,7 +136,7 @@ Compiler.prototype = {
// process markup for text nodes only
eachTextNode(element, function(textNode){
var text = textNode.text();
- foreach(self.textMarkup, function(markup){
+ foreach(self.textMarkup, function(markup, name){
markup.call(selfApi, text, textNode, element);
});
});
@@ -144,7 +144,7 @@ Compiler.prototype = {
if (directives) {
// Process attributes/directives
- eachAttribute(element, function(value, name){
+ eachAttribute(element, function(value){
foreach(self.attrMarkup, function(markup){
markup.call(selfApi, value, name, element);
});
diff --git a/src/jqLite.js b/src/jqLite.js
index 92bc22a7..67e1717c 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -191,9 +191,9 @@ JQLite.prototype = {
text: function(value) {
if (isDefined(value)) {
- this[0].textContent = value;
+ this[0].nodeValue = value;
}
- return this[0].textContent;
+ return this[0].nodeValue;
},
val: function(value) {
diff --git a/src/markups.js b/src/markups.js
index 5c069f49..4207d83f 100644
--- a/src/markups.js
+++ b/src/markups.js
@@ -53,7 +53,7 @@ angularTextMarkup('{{}}', function(text, textNode, parentElement) {
// TODO: this should be widget not a markup
angularTextMarkup('OPTION', function(text, textNode, parentElement){
- if (parentElement[0].nodeName == "OPTION") {
+ if (nodeName(parentElement) == "OPTION") {
var select = document.createElement('select');
select.insertBefore(parentElement[0].cloneNode(true), null);
if (!select.innerHTML.match(/.*<\/\s*option\s*>/gi)) {
--
cgit v1.2.3
From 618a2b423d826ab8366a6907e71a4af0e76d6211 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 19 Apr 2010 14:36:41 -0700
Subject: ie fixes
---
src/Angular.js | 6 ++++--
src/jqLite.js | 22 +++++++++++++++++++---
2 files changed, 23 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index ec1fa49b..94853004 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -118,8 +118,10 @@ function isElement(node) {
}
function isVisible(element) {
- var rect = element[0].getBoundingClientRect();
- return rect.width && rect.height;
+ var rect = element[0].getBoundingClientRect(),
+ width = rect.width || (rect.right||0 - rect.left||0),
+ height = rect.height || (rect.bottom||0 - rect.top||0);
+ return width>0 && height>0;
}
function map(obj, iterator, context) {
diff --git a/src/jqLite.js b/src/jqLite.js
index 67e1717c..4dcd9349 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -100,7 +100,6 @@ JQLite.prototype = {
});
},
- //TODO: remove
trigger: function(type) {
var evnt = document.createEvent('MouseEvent');
evnt.initMouseEvent(type, true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
@@ -191,9 +190,9 @@ JQLite.prototype = {
text: function(value) {
if (isDefined(value)) {
- this[0].nodeValue = value;
+ this[0].textContent = value;
}
- return this[0].nodeValue;
+ return this[0].textContent;
},
val: function(value) {
@@ -216,3 +215,20 @@ JQLite.prototype = {
parent: function() { return jqLite(this[0].parentNode);},
clone: function() { return jqLite(this[0].cloneNode(true)); }
};
+
+if (msie) {
+ extend(JQLite.prototype, {
+ text: function(value) {
+ var e = this[0];
+ if (isDefined(value)) {
+ e.innerText = value;
+ }
+ // NodeType == 3 is text node
+ return e.nodeType == 3 ? e.nodeValue : e.innerText;
+ },
+
+ trigger: function(type) {
+ this[0].fireEvent('on' + type);
+ }
+ });
+};
--
cgit v1.2.3
From 9f9bdcf3d16de651f85ccfe9e079cb57baca9eb7 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 19 Apr 2010 14:41:36 -0700
Subject: lint
---
src/Angular.js | 7 +++----
src/jqLite.js | 2 +-
src/scenario/bootstrap.js | 6 ++++--
src/widgets.js | 4 ++--
4 files changed, 10 insertions(+), 9 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 94853004..005eeb19 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -94,8 +94,7 @@ function jqLiteWrap(element) {
var div = document.createElement('div');
div.innerHTML = element;
element = new JQLite(div.childNodes);
- } else if (element instanceof JQLite) {
- } else if (isElement(element)) {
+ } else if (!(element instanceof JQLite) && isElement(element)) {
element = new JQLite(element);
}
return element;
@@ -119,8 +118,8 @@ function isElement(node) {
function isVisible(element) {
var rect = element[0].getBoundingClientRect(),
- width = rect.width || (rect.right||0 - rect.left||0),
- height = rect.height || (rect.bottom||0 - rect.top||0);
+ width = (rect.width || (rect.right||0 - rect.left||0)),
+ height = (rect.height || (rect.bottom||0 - rect.top||0));
return width>0 && height>0;
}
diff --git a/src/jqLite.js b/src/jqLite.js
index 4dcd9349..53f52215 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -231,4 +231,4 @@ if (msie) {
this[0].fireEvent('on' + type);
}
});
-};
+}
diff --git a/src/scenario/bootstrap.js b/src/scenario/bootstrap.js
index b49530df..169f1860 100644
--- a/src/scenario/bootstrap.js
+++ b/src/scenario/bootstrap.js
@@ -12,10 +12,12 @@
})();
function addScript(path) {
document.write('');
- };
+ }
+
function addCSS(path) {
document.write('');
- };
+ }
+
window.onload = function(){
if (!_.stepper) {
_.stepper = function(collection, iterator, done){
diff --git a/src/widgets.js b/src/widgets.js
index 828e6d24..b296c354 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -214,8 +214,8 @@ angularWidget('NG:INCLUDE', function(element){
angularWidget('NG:SWITCH', function ngSwitch(element){
var compiler = this,
watchExpr = element.attr("on"),
- whenExpr = (element.attr("using") || 'equals').split(":");
- whenFn = ngSwitch[whenExpr.shift()];
+ whenExpr = (element.attr("using") || 'equals').split(":"),
+ whenFn = ngSwitch[whenExpr.shift()],
changeExpr = element.attr('change') || '',
cases = [];
if (!whenFn) throw "Using expression '" + usingExpr + "' unknown.";
--
cgit v1.2.3
From 47ec2187776658ad9ee2a9c71a28ddb860bec43a Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 19 Apr 2010 14:53:18 -0700
Subject: fix bug which got introduced by accident
---
src/Compiler.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/Compiler.js b/src/Compiler.js
index 376235f7..a762b5fd 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -136,7 +136,7 @@ Compiler.prototype = {
// process markup for text nodes only
eachTextNode(element, function(textNode){
var text = textNode.text();
- foreach(self.textMarkup, function(markup, name){
+ foreach(self.textMarkup, function(markup){
markup.call(selfApi, text, textNode, element);
});
});
@@ -144,7 +144,7 @@ Compiler.prototype = {
if (directives) {
// Process attributes/directives
- eachAttribute(element, function(value){
+ eachAttribute(element, function(value, name){
foreach(self.attrMarkup, function(markup){
markup.call(selfApi, value, name, element);
});
--
cgit v1.2.3
From 259c2bba4bf1fc4f0d4cf5bcda4ffef0fb5a615a Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 19 Apr 2010 17:02:46 -0700
Subject: last failing ie test remaining
---
src/Compiler.js | 9 +++++++--
src/jqLite.js | 5 ++++-
src/markups.js | 6 ++++++
3 files changed, 17 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/Compiler.js b/src/Compiler.js
index a762b5fd..96df88fb 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -182,10 +182,15 @@ function eachNode(element, fn){
}
function eachAttribute(element, fn){
- var i, attrs = element[0].attributes || [], chld, attr, attrValue = {};
+ var i, attrs = element[0].attributes || [], chld, attr, name, value, attrValue = {};
for (i = 0; i < attrs.length; i++) {
attr = attrs[i];
- attrValue[attr.name] = attr.value;
+ name = attr.name;
+ value = attr.value;
+ if (msie && name == 'href') {
+ value = decodeURIComponent(element[0].getAttribute(name, 2));
+ }
+ attrValue[name] = value;
}
foreachSorted(attrValue, fn);
}
diff --git a/src/jqLite.js b/src/jqLite.js
index 53f52215..2d41a25c 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -29,7 +29,10 @@ function jqClearData(element) {
removeEventListener(element, type, fn);
});
delete jqCache[cacheId];
- delete element[jqName];
+ if (msie)
+ element[jqName] = ''; // ie does not allow deletion of attributes on elements.
+ else
+ delete element[jqName];
}
}
diff --git a/src/markups.js b/src/markups.js
index 4207d83f..e9c03217 100644
--- a/src/markups.js
+++ b/src/markups.js
@@ -43,6 +43,12 @@ angularTextMarkup('{{}}', function(text, textNode, parentElement) {
} else {
newElement = self.text(text);
}
+ if (msie && text.charAt(0) == ' ') {
+ newElement = jqLite(' ');
+ var nbsp = newElement.html();
+ newElement.text(text.substr(1));
+ newElement.html(nbsp + newElement.html());
+ }
cursor.after(newElement);
cursor = newElement;
});
--
cgit v1.2.3
From 22d93e0a3bc2a6dc0f64c63c68bc8f8489ea9068 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 20 Apr 2010 18:14:13 -0700
Subject: fixes to enable ie
---
src/Angular.js | 3 ++-
src/Browser.js | 9 ++++++---
src/Compiler.js | 2 +-
src/directives.js | 15 ++++++++++-----
src/jqLite.js | 24 +++++++++++-------------
src/scenario/Steps.js | 6 +++---
6 files changed, 33 insertions(+), 26 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 005eeb19..613aee67 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -112,7 +112,8 @@ function uppercase(value){ return isString(value) ? value.toUpperCase() : value;
function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; }
function nodeName(element) { return (element[0] || element).nodeName; }
function isElement(node) {
- if (node && node[0]) node = node[0];
+ if (node && !node.item && isDefined(node.length) && isDefined(node[0]))
+ node = node[0];
return node && node.nodeName;
}
diff --git a/src/Browser.js b/src/Browser.js
index ff8d9775..e00f73a5 100644
--- a/src/Browser.js
+++ b/src/Browser.js
@@ -29,7 +29,7 @@ Browser.prototype = {
bind: function() {
var self = this;
self.document.bind("mouseover", function(event){
- self.hoverListener(jqLite(event.target), true);
+ self.hoverListener(jqLite(msie ? event.srcElement : event.target), true);
return true;
});
self.document.bind("mouseleave mouseout click dblclick keypress keyup", function(event){
@@ -43,8 +43,11 @@ Browser.prototype = {
},
addCss: function(url) {
- var head = jqLite(this.document[0].getElementsByTagName('head')[0]),
- link = jqLite('');
+ var doc = this.document[0],
+ head = jqLite(doc.getElementsByTagName('head')[0]),
+ link = jqLite(doc.createElement('link'));
+ link.attr('rel', 'stylesheet');
+ link.attr('type', 'text/css');
link.attr('href', url);
head.append(link);
},
diff --git a/src/Compiler.js b/src/Compiler.js
index 96df88fb..21302054 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -185,7 +185,7 @@ function eachAttribute(element, fn){
var i, attrs = element[0].attributes || [], chld, attr, name, value, attrValue = {};
for (i = 0; i < attrs.length; i++) {
attr = attrs[i];
- name = attr.name;
+ name = attr.name.replace(':', '-');
value = attr.value;
if (msie && name == 'href') {
value = decodeURIComponent(element[0].getAttribute(name, 2));
diff --git a/src/directives.js b/src/directives.js
index a37076d4..2f393b5d 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -26,15 +26,20 @@ angularDirective("ng-bind", function(expression){
return function(element) {
var lastValue, lastError;
this.$onEval(function() {
- var error, value = this.$tryEval(expression, function(e){
- error = toJson(e);
- });
+ var error,
+ value = this.$tryEval(expression, function(e){
+ error = toJson(e);
+ }),
+ isElem = isElement(value);
+ if (!isElem && isObject(value)) {
+ value = toJson(value);
+ }
if (value != lastValue || error != lastError) {
lastValue = value;
lastError = error;
elementError(element, NG_EXCEPTION, error);
if (error) value = error;
- if (isElement(value)) {
+ if (isElem) {
element.html('');
element.append(value);
} else {
@@ -177,7 +182,7 @@ angularWidget("@ng-repeat", function(expression, element){
angularDirective("ng-click", function(expression, element){
return function(element){
var self = this;
- element.click(function(){
+ element.bind('click', function(){
self.$tryEval(expression, element);
self.$root.$eval();
return false;
diff --git a/src/jqLite.js b/src/jqLite.js
index 2d41a25c..1bf6e083 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -37,14 +37,14 @@ function jqClearData(element) {
}
function JQLite(element) {
- if (element.length && element.item) {
+ if (isElement(element)) {
+ this[0] = element;
+ this.length = 1;
+ } else if (isDefined(element.length) && element.item) {
for(var i=0; i < element.length; i++) {
this[i] = element[i];
}
this.length = element.length;
- } else {
- this[0] = element;
- this.length = 1;
}
}
@@ -92,8 +92,13 @@ JQLite.prototype = {
bubbleEvent = bubbleEvent || fn.call(self, event);
});
if (!bubbleEvent) {
- event.preventDefault();
- event.stopPropagation();
+ if (msie) {
+ event.returnValue = false;
+ event.cancelBubble = true;
+ } else {
+ event.preventDefault();
+ event.stopPropagation();
+ }
}
};
eventHandler.fns = [];
@@ -109,13 +114,6 @@ JQLite.prototype = {
this[0].dispatchEvent(evnt);
},
- click: function(fn) {
- if (fn)
- this.bind('click', fn);
- else
- this.trigger('click');
- },
-
replaceWith: function(replaceNode) {
this[0].parentNode.replaceChild(jqLite(replaceNode)[0], this[0]);
},
diff --git a/src/scenario/Steps.js b/src/scenario/Steps.js
index f8ac173f..ffe75933 100644
--- a/src/scenario/Steps.js
+++ b/src/scenario/Steps.js
@@ -29,14 +29,14 @@ angular.scenario.WHEN = {
// emulate the browser behavior which causes it
// to be overridden at the end.
var checked = input.checked = !input.checked;
- element.click();
+ element.trigger('click');
input.checked = checked;
},
select:function(){
var element = this.element(this.at);
var path = "option[value=" + this.option + "]";
var option = this.assert(element.find(path));
- option[0].selected = !option[0].selected;
+ option[0].selected = !option[0].selected;
element.change();
}
};
@@ -48,7 +48,7 @@ angular.scenario.THEN = {
if (_.isArray(this.should_be))
should_be = JSON.stringify(should_be);
if (element.text() != should_be)
- throw "Expected " + should_be +
+ throw "Expected " + should_be +
" but was " + element.text() + ".";
}
},
--
cgit v1.2.3
From e78405f6ed82fcd2e9a1cdffb7f1103d52752623 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 21 Apr 2010 12:50:05 -0700
Subject: more if tests pass
---
src/Angular.js | 15 +++++++++++++--
src/directives.js | 2 +-
src/jqLite.js | 15 ++++++++++++---
src/widgets.js | 19 +++++++++++--------
4 files changed, 37 insertions(+), 14 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 613aee67..11ac7c1c 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -27,7 +27,8 @@ var consoleNode,
angularFilter = extensionMap(angular, 'filter'),
angularFormatter = extensionMap(angular, 'formatter'),
angularService = extensionMap(angular, 'service'),
- angularCallbacks = extensionMap(angular, 'callbacks');
+ angularCallbacks = extensionMap(angular, 'callbacks'),
+ nodeName;
function angularAlert(){
log(arguments); window.alert.apply(window, arguments);
@@ -110,13 +111,23 @@ function isTextNode(node) { return nodeName(node) == '#text'; }
function lowercase(value){ return isString(value) ? value.toLowerCase() : value; }
function uppercase(value){ return isString(value) ? value.toUpperCase() : value; }
function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; }
-function nodeName(element) { return (element[0] || element).nodeName; }
function isElement(node) {
if (node && !node.item && isDefined(node.length) && isDefined(node[0]))
node = node[0];
return node && node.nodeName;
}
+if (msie) {
+ nodeName = function(element) {
+ element = element[0] || element;
+ return (element.scopeName && element.scopeName != 'HTML' ) ? uppercase(element.scopeName + ':' + element.nodeName) : element.nodeName;
+ };
+} else {
+ nodeName = function(element) {
+ return (element[0] || element).nodeName;
+ };
+}
+
function isVisible(element) {
var rect = element[0].getBoundingClientRect(),
width = (rect.width || (rect.right||0 - rect.left||0)),
diff --git a/src/directives.js b/src/directives.js
index 2f393b5d..bdcdcc1d 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -109,7 +109,7 @@ angularDirective("ng-bind-attr", function(expression){
var value = compileBindTemplate(bindExp).call(this, element);
if (REMOVE_ATTRIBUTES[lowercase(key)]) {
if (!toBoolean(value)) {
- element.removeAttr('disabled');
+ element.removeAttr(key);
} else {
element.attr(key, value);
}
diff --git a/src/jqLite.js b/src/jqLite.js
index 1bf6e083..0867f9c9 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -185,7 +185,9 @@ JQLite.prototype = {
} else if (isDefined(value)) {
e.setAttribute(name, value);
} else {
- return e.getAttribute ? e.getAttribute(name) : undefined;
+ var attributes = e.attributes,
+ item = attributes ? attributes.getNamedItem(name) : undefined;
+ return item ? item.value : undefined;
}
},
@@ -205,8 +207,11 @@ JQLite.prototype = {
html: function(value) {
if (isDefined(value)) {
- for ( var i = 0, children = this[0].childNodes; i < children.length; i++) {
- jqLite(children[i]).dealoc();
+ var parent = this[0], child;
+ while(parent.childNodes.length) {
+ child = parent.childNodes[0];
+ jqLite(child).dealoc();
+ parent.removeChild(child);
}
this[0].innerHTML = value;
}
@@ -229,6 +234,10 @@ if (msie) {
},
trigger: function(type) {
+
+ if (nodeName(this) == 'INPUT' && (lowercase(this.attr('type')) == 'radio' || lowercase(this.attr('type')) == 'checkbox')) {
+ this[0].checked = ! this[0].checked;
+ }
this[0].fireEvent('on' + type);
}
});
diff --git a/src/widgets.js b/src/widgets.js
index b296c354..2c084e29 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -211,24 +211,25 @@ angularWidget('NG:INCLUDE', function(element){
}
});
-angularWidget('NG:SWITCH', function ngSwitch(element){
+var ngSwitch = angularWidget('NG:SWITCH', function (element){
var compiler = this,
watchExpr = element.attr("on"),
- whenExpr = (element.attr("using") || 'equals').split(":"),
- whenFn = ngSwitch[whenExpr.shift()],
+ usingExpr = (element.attr("using") || 'equals'),
+ usingExprParams = usingExpr.split(":");
+ usingFn = ngSwitch[usingExprParams.shift()],
changeExpr = element.attr('change') || '',
cases = [];
- if (!whenFn) throw "Using expression '" + usingExpr + "' unknown.";
+ if (!usingFn) throw "Using expression '" + usingExpr + "' unknown.";
eachNode(element, function(caseElement){
var when = caseElement.attr('ng-switch-when');
if (when) {
cases.push({
when: function(scope, value){
var args = [value, when];
- foreach(whenExpr, function(arg){
+ foreach(usingExprParams, function(arg){
args.push(arg);
});
- return whenFn.apply(scope, args);
+ return usingFn.apply(scope, args);
},
change: changeExpr,
element: caseElement,
@@ -236,6 +237,7 @@ angularWidget('NG:SWITCH', function ngSwitch(element){
});
}
});
+
element.html('');
return function(element){
var scope = this, childScope;
@@ -244,9 +246,10 @@ angularWidget('NG:SWITCH', function ngSwitch(element){
childScope = createScope(scope);
foreach(cases, function(switchCase){
if (switchCase.when(childScope, value)) {
- element.append(switchCase.element);
+ var caseElement = switchCase.element.clone();
+ element.append(caseElement);
childScope.$tryEval(switchCase.change, element);
- switchCase.template(switchCase.element, childScope);
+ switchCase.template(caseElement, childScope);
if (scope.$invalidWidgets)
scope.$invalidWidgets.clearOrphans();
childScope.$init();
--
cgit v1.2.3
From 8b29156a2ddcc738f9b0cf8dfc48a8648474884d Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 21 Apr 2010 14:29:05 -0700
Subject: ie6 now passes
---
src/Browser.js | 2 +-
src/jqLite.js | 2 +-
src/widgets.js | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/Browser.js b/src/Browser.js
index e00f73a5..11b079f0 100644
--- a/src/Browser.js
+++ b/src/Browser.js
@@ -9,7 +9,7 @@ function Browser(location, document) {
this.urlListeners = [];
this.hoverListener = noop;
- this.XHR = XMLHttpRequest || function () {
+ this.XHR = window.XMLHttpRequest || function () {
try { return new ActiveXObject("Msxml2.XMLHTTP.6.0"); } catch (e1) {}
try { return new ActiveXObject("Msxml2.XMLHTTP.3.0"); } catch (e2) {}
try { return new ActiveXObject("Msxml2.XMLHTTP"); } catch (e3) {}
diff --git a/src/jqLite.js b/src/jqLite.js
index 0867f9c9..36248e71 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -187,7 +187,7 @@ JQLite.prototype = {
} else {
var attributes = e.attributes,
item = attributes ? attributes.getNamedItem(name) : undefined;
- return item ? item.value : undefined;
+ return item && item.specified ? item.value : undefined;
}
},
diff --git a/src/widgets.js b/src/widgets.js
index 2c084e29..239f12f8 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -45,10 +45,11 @@ function valueAccessor(scope, element) {
if (error !== lastError || force) {
elementError(element, NG_VALIDATION_ERROR, error);
lastError = error;
- if (error)
+ if (error) {
invalidWidgets.markInvalid(element);
- else
+ } else {
invalidWidgets.markValid(element);
+ }
}
return value;
}
--
cgit v1.2.3
From 2a9669e1d853d4e18d2eb1f07e84ee5baec838c2 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 22 Apr 2010 15:50:20 -0700
Subject: working on jQuery passing tests
---
src/Angular.js | 4 +---
src/filters.js | 4 +++-
src/jqLite.js | 4 ++++
src/services.js | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 11ac7c1c..a4421f0e 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -112,9 +112,7 @@ function lowercase(value){ return isString(value) ? value.toLowerCase() : value;
function uppercase(value){ return isString(value) ? value.toUpperCase() : value; }
function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; }
function isElement(node) {
- if (node && !node.item && isDefined(node.length) && isDefined(node[0]))
- node = node[0];
- return node && node.nodeName;
+ return node && (node.nodeName || node instanceof JQLite || node instanceof jQuery);
}
if (msie) {
diff --git a/src/filters.js b/src/filters.js
index d0fc2ae7..74013db1 100644
--- a/src/filters.js
+++ b/src/filters.js
@@ -269,7 +269,9 @@ foreach({
},
'html': function(html){
- return jqLite(html);
+ var div = jqLite('div');
+ div.html(html);
+ return div.children();
},
'linky': function(text){
diff --git a/src/jqLite.js b/src/jqLite.js
index 36248e71..ec1c52d2 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -118,6 +118,10 @@ JQLite.prototype = {
this[0].parentNode.replaceChild(jqLite(replaceNode)[0], this[0]);
},
+ children: function() {
+ return new JQLite(this[0].childNodes);
+ },
+
append: function(node) {
var self = this[0];
node = jqLite(node);
diff --git a/src/services.js b/src/services.js
index d98c0876..d6c3ad8a 100644
--- a/src/services.js
+++ b/src/services.js
@@ -103,7 +103,7 @@ angularService("$hover", function(browser) {
width: width + "px"
});
}
- } else if (tooltip) {
+ } else if (tooltip && false) {
tooltip.callout.remove();
tooltip = null;
}
--
cgit v1.2.3
From fe434307d15d697a5ffade51bad068f6443965b2 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 22 Apr 2010 17:11:56 -0700
Subject: tests work under jquery and without
---
src/Angular.js | 6 +++++-
src/directives.js | 9 ++++-----
src/filters.js | 6 ++----
src/jqLite.js | 4 ----
src/widgets.js | 2 +-
5 files changed, 12 insertions(+), 15 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index a4421f0e..0c1ab838 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -112,7 +112,11 @@ function lowercase(value){ return isString(value) ? value.toLowerCase() : value;
function uppercase(value){ return isString(value) ? value.toUpperCase() : value; }
function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; }
function isElement(node) {
- return node && (node.nodeName || node instanceof JQLite || node instanceof jQuery);
+ return node && (node.nodeName || node instanceof JQLite || (jQuery && node instanceof jQuery));
+}
+
+function HTML(html) {
+ this.html = html;
}
if (msie) {
diff --git a/src/directives.js b/src/directives.js
index bdcdcc1d..aa75aa5b 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -30,8 +30,8 @@ angularDirective("ng-bind", function(expression){
value = this.$tryEval(expression, function(e){
error = toJson(e);
}),
- isElem = isElement(value);
- if (!isElem && isObject(value)) {
+ isHtml = value instanceof HTML;
+ if (!isHtml && isObject(value)) {
value = toJson(value);
}
if (value != lastValue || error != lastError) {
@@ -39,9 +39,8 @@ angularDirective("ng-bind", function(expression){
lastError = error;
elementError(element, NG_EXCEPTION, error);
if (error) value = error;
- if (isElem) {
- element.html('');
- element.append(value);
+ if (isHtml) {
+ element.html(value.html);
} else {
element.text(value);
}
diff --git a/src/filters.js b/src/filters.js
index 74013db1..a911b935 100644
--- a/src/filters.js
+++ b/src/filters.js
@@ -269,9 +269,7 @@ foreach({
},
'html': function(html){
- var div = jqLite('div');
- div.html(html);
- return div.children();
+ return new HTML(html);
},
'linky': function(text){
@@ -293,7 +291,7 @@ foreach({
raw = raw.substring(i + url.length);
}
html.push(escapeHtml(raw));
- return jqLite(html.join(''));
+ return new HTML(html.join(''));
}
}, function(v,k){angularFilter[k] = v;});
diff --git a/src/jqLite.js b/src/jqLite.js
index ec1c52d2..18589630 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -238,10 +238,6 @@ if (msie) {
},
trigger: function(type) {
-
- if (nodeName(this) == 'INPUT' && (lowercase(this.attr('type')) == 'radio' || lowercase(this.attr('type')) == 'checkbox')) {
- this[0].checked = ! this[0].checked;
- }
this[0].fireEvent('on' + type);
}
});
diff --git a/src/widgets.js b/src/widgets.js
index 239f12f8..209b24b7 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -32,7 +32,7 @@ function valueAccessor(scope, element) {
value = element.val();
force = true;
}
- if (element[0].disabled || isString(element.attr('readonly'))) {
+ if (element[0].disabled || element[0].readOnly) {
elementError(element, NG_VALIDATION_ERROR, null);
invalidWidgets.markValid(element);
return value;
--
cgit v1.2.3
From df364c39806b66d135c277949c0aae924d194f34 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 22 Apr 2010 21:11:24 -0700
Subject: fix CI Build
---
src/markups.js | 2 ++
1 file changed, 2 insertions(+)
(limited to 'src')
diff --git a/src/markups.js b/src/markups.js
index e9c03217..74b293b8 100644
--- a/src/markups.js
+++ b/src/markups.js
@@ -71,6 +71,8 @@ angularTextMarkup('OPTION', function(text, textNode, parentElement){
var NG_BIND_ATTR = 'ng-bind-attr';
angularAttrMarkup('{{}}', function(value, name, element){
if (name.substr(0, 3) != 'ng-') {
+ if (msie && name == 'src')
+ value = decodeURI(value);
var bindings = parseBindings(value),
bindAttr;
if (hasBindings(bindings)) {
--
cgit v1.2.3
From 5fdb117b32b72a908a3938bee8f1bce9854a0004 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 22 Apr 2010 22:09:17 -0700
Subject: clean up failing test with jquery
---
src/directives.js | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/directives.js b/src/directives.js
index aa75aa5b..2d318be2 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -97,20 +97,21 @@ angularDirective("ng-bind-template", function(expression){
});
var REMOVE_ATTRIBUTES = {
- 'disabled':true,
- 'readonly':true,
- 'checked':true
+ 'disabled':'disabled',
+ 'readonly':'readOnly',
+ 'checked':'checked'
};
angularDirective("ng-bind-attr", function(expression){
return function(element){
this.$onEval(function(){
foreach(this.$eval(expression), function(bindExp, key) {
- var value = compileBindTemplate(bindExp).call(this, element);
- if (REMOVE_ATTRIBUTES[lowercase(key)]) {
- if (!toBoolean(value)) {
- element.removeAttr(key);
- } else {
+ var value = compileBindTemplate(bindExp).call(this, element),
+ specialName = REMOVE_ATTRIBUTES[lowercase(key)];
+ if (specialName) {
+ if (element[specialName] = toBoolean(value)) {
element.attr(key, value);
+ } else {
+ element.removeAttr(key);
}
(element.data('$validate')||noop)();
} else {
--
cgit v1.2.3
From 0396054b4a420972e16d0d9e965eb51ecd6f86a2 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 22 Apr 2010 22:44:48 -0700
Subject: fixed the way IE breaks parests on innerHTML
---
src/jqLite.js | 8 +++-----
src/widgets.js | 5 +++++
2 files changed, 8 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/jqLite.js b/src/jqLite.js
index 18589630..134c1e17 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -211,11 +211,9 @@ JQLite.prototype = {
html: function(value) {
if (isDefined(value)) {
- var parent = this[0], child;
- while(parent.childNodes.length) {
- child = parent.childNodes[0];
- jqLite(child).dealoc();
- parent.removeChild(child);
+ var i = 0, childNodes = this[0].childNodes;
+ for ( ; i < childNodes.length; i++) {
+ jqLite(childNodes[i]).dealoc();
}
this[0].innerHTML = value;
}
diff --git a/src/widgets.js b/src/widgets.js
index 209b24b7..8a816934 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -239,6 +239,11 @@ var ngSwitch = angularWidget('NG:SWITCH', function (element){
}
});
+ // this needs to be here for IE
+ foreach(cases, function(_case){
+ _case.element.remove();
+ });
+
element.html('');
return function(element){
var scope = this, childScope;
--
cgit v1.2.3
From 076f37a5ec26e88c5aeb2f37aa19ea7b2516d9f3 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 23 Apr 2010 07:34:02 -0700
Subject: fix last ie failure
---
src/directives.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/directives.js b/src/directives.js
index 2d318be2..d9cf7962 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -109,7 +109,7 @@ angularDirective("ng-bind-attr", function(expression){
specialName = REMOVE_ATTRIBUTES[lowercase(key)];
if (specialName) {
if (element[specialName] = toBoolean(value)) {
- element.attr(key, value);
+ element.attr(specialName, value);
} else {
element.removeAttr(key);
}
--
cgit v1.2.3
From 02fa10f93ce5a75dd925f13ec7456802a6e120e4 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 26 Apr 2010 11:57:33 -0700
Subject: allow the widget to change structure of the DOM and have the compiler
follow the replaced element.
---
src/Compiler.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/Compiler.js b/src/Compiler.js
index 21302054..290eb3b7 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -77,7 +77,7 @@ function Compiler(textMarkup, attrMarkup, directives, widgets){
Compiler.prototype = {
compile: function(rawElement) {
rawElement = jqLite(rawElement);
- var template = this.templatize(rawElement) || new Template();
+ var template = this.templatize(rawElement, 0, 0) || new Template();
return function(element, parentScope){
element = jqLite(element);
var scope = parentScope && parentScope.$eval ?
@@ -95,7 +95,7 @@ Compiler.prototype = {
};
},
- templatize: function(element, priority){
+ templatize: function(element, elementIndex, priority){
var self = this,
widget,
directiveFns = self.directives,
@@ -130,7 +130,11 @@ Compiler.prototype = {
if (widget) {
descend = false;
directives = false;
+ var parent = element.parent();
template.addInit(widget.call(selfApi, element));
+ if (parent) {
+ element = jqLite(parent[0].childNodes[elementIndex]);
+ }
}
if (descend){
// process markup for text nodes only
@@ -156,7 +160,7 @@ Compiler.prototype = {
// Process non text child nodes
if (descend) {
eachNode(element, function(child, i){
- template.addChild(i, self.templatize(child, priority));
+ template.addChild(i, self.templatize(child, i, priority));
});
}
return template.empty() ? null : template;
--
cgit v1.2.3
From 2a7cd9f39089af08ff42be6fb247116c35e2d345 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 26 Apr 2010 16:49:34 -0700
Subject: fix ie bug with null and orphans elements
---
src/Angular.js | 15 +++++++++------
src/Compiler.js | 2 +-
src/jqLite.js | 16 +++++++++++-----
3 files changed, 21 insertions(+), 12 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 0c1ab838..8eef7275 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -91,12 +91,15 @@ function extensionMap(angular, name) {
}
function jqLiteWrap(element) {
- if (isString(element)) {
- var div = document.createElement('div');
- div.innerHTML = element;
- element = new JQLite(div.childNodes);
- } else if (!(element instanceof JQLite) && isElement(element)) {
- element = new JQLite(element);
+ // for some reasons the parentNode of an orphan looks like null but its typeof is object.
+ if (element) {
+ if (isString(element)) {
+ var div = document.createElement('div');
+ div.innerHTML = element;
+ element = new JQLite(div.childNodes);
+ } else if (!(element instanceof JQLite) && isElement(element)) {
+ element = new JQLite(element);
+ }
}
return element;
}
diff --git a/src/Compiler.js b/src/Compiler.js
index 290eb3b7..c77c6b30 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -132,7 +132,7 @@ Compiler.prototype = {
directives = false;
var parent = element.parent();
template.addInit(widget.call(selfApi, element));
- if (parent) {
+ if (parent && parent[0]) {
element = jqLite(parent[0].childNodes[elementIndex]);
}
}
diff --git a/src/jqLite.js b/src/jqLite.js
index 134c1e17..68172fd8 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -220,7 +220,10 @@ JQLite.prototype = {
return this[0].innerHTML;
},
- parent: function() { return jqLite(this[0].parentNode);},
+ parent: function() {
+ return jqLite(this[0].parentNode);
+ },
+
clone: function() { return jqLite(this[0].cloneNode(true)); }
};
@@ -228,11 +231,14 @@ if (msie) {
extend(JQLite.prototype, {
text: function(value) {
var e = this[0];
- if (isDefined(value)) {
- e.innerText = value;
- }
// NodeType == 3 is text node
- return e.nodeType == 3 ? e.nodeValue : e.innerText;
+ if (e.nodeType == 3) {
+ if (isDefined(value)) e.nodeValue = value;
+ return e.nodeValue;
+ } else {
+ if (isDefined(value)) e.innerText = value;
+ return e.innerText;
+ }
},
trigger: function(type) {
--
cgit v1.2.3
From fce48eb60a47be87a3d95e0750e54c19c2a346d0 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 27 Apr 2010 11:18:08 -0700
Subject: resources now use browser mock
---
src/Resource.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Resource.js b/src/Resource.js
index 9fe60788..34ad1c5d 100644
--- a/src/Resource.js
+++ b/src/Resource.js
@@ -83,7 +83,7 @@ ResourceFactory.prototype = {
}
var value = action.isArray ? [] : new Resource(data);
- self.xhr(action.method, route.url(extend({}, action.params || {}, extractParams(data), params)), data, function(response) {
+ self.xhr(action.method, route.url(extend({}, action.params || {}, extractParams(data), params)), data, function(status, response) {
if (action.isArray) {
foreach(response, function(item){
value.push(new Resource(item));
--
cgit v1.2.3
From 913729ee0120cc72e13b18d826c6da0fe2b98bf7 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 29 Apr 2010 10:55:22 -0700
Subject: fix isssue where the jasmine currentSpec does not get updated and
hence everything runs as last spec context.
---
src/services.js | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'src')
diff --git a/src/services.js b/src/services.js
index d6c3ad8a..b854c8d6 100644
--- a/src/services.js
+++ b/src/services.js
@@ -189,3 +189,7 @@ angularService('$route', function(location, params){
return $route;
}, {inject: ['$location']});
+angularService('$resource', function(browser){
+ var resource = new ResourceFactory(bind(browser, browser.xhr));
+ return bind(resource, resource.route);
+}, {inject: ['$browser']});
--
cgit v1.2.3
From c7913a4b7a3f5ffb0ea6bb1e636ac9d4a0e75c32 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 29 Apr 2010 17:28:33 -0700
Subject: added $xhr service with bulk and cache, hooked up $resource
---
src/Angular.js | 8 +++---
src/Browser.js | 4 +--
src/Scope.js | 4 +--
src/services.js | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
4 files changed, 92 insertions(+), 11 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 8eef7275..3af21ced 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -231,12 +231,12 @@ function isLeafNode (node) {
function copy(source, destination){
if (!destination) {
- if (!source) {
- return source;
- } else if (isArray(source)) {
+ if (isArray(source)) {
return copy(source, []);
- } else {
+ } else if (isObject(source)) {
return copy(source, {});
+ } else {
+ return source;
}
} else {
if (isArray(source)) {
diff --git a/src/Browser.js b/src/Browser.js
index 11b079f0..d2e8608d 100644
--- a/src/Browser.js
+++ b/src/Browser.js
@@ -52,12 +52,12 @@ Browser.prototype = {
head.append(link);
},
- xhr: function(method, url, callback){
+ xhr: function(method, url, post, callback){
var xhr = new this.XHR();
xhr.open(method, url, true);
xhr.onreadystatechange = function() {
if (xhr.readyState == 4) {
- callback(xhr.status, xhr.responseText);
+ callback(xhr.status || 200, xhr.responseText);
}
};
xhr.send('');
diff --git a/src/Scope.js b/src/Scope.js
index 54e75dbd..1b93418f 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -173,7 +173,7 @@ function createScope(parent, services, existing) {
}
function inject(name){
- var service = getter(servicesCache, name), factory, args = [];
+ var service = getter(servicesCache, name, true), factory, args = [];
if (isUndefined(service)) {
factory = services[name];
if (!isFunction(factory))
@@ -189,7 +189,7 @@ function createScope(parent, services, existing) {
foreach(services, function(_, name){
var service = inject(name);
if (service) {
- instance[name] = service;
+ setter(instance, name, service);
}
});
diff --git a/src/services.js b/src/services.js
index b854c8d6..36c89ccb 100644
--- a/src/services.js
+++ b/src/services.js
@@ -189,7 +189,88 @@ angularService('$route', function(location, params){
return $route;
}, {inject: ['$location']});
-angularService('$resource', function(browser){
- var resource = new ResourceFactory(bind(browser, browser.xhr));
+angularService('$xhr', function($browser){
+ var self = this;
+ return function(method, url, post, callback){
+ if (post && isObject(post)) {
+ post = toJson(post);
+ }
+ $browser.xhr(method, url, post, function(code, response){
+ try {
+ if (isString(response) && /^\s*[\[\{]/.exec(response) && /[\}\]]\s*$/.exec(response)) {
+ response = fromJson(response);
+ }
+ callback(code, response);
+ } finally {
+ self.$eval();
+ }
+ });
+ };
+}, {inject:['$browser']});
+
+angularService('$xhr.bulk', function($xhr){
+ var requests = [],
+ callbacks = [],
+ scope = this;
+ function bulkXHR(method, url, post, callback) {
+ requests.push({method: method, url: url, data:post});
+ callbacks.push(callback);
+ }
+ bulkXHR.url = "/bulk";
+ bulkXHR.flush = function(callback){
+ var currentRequests = requests,
+ currentCallbacks = callbacks;
+ requests = [];
+ callbacks = [];
+ $xhr('POST', bulkXHR.url, {requests:currentRequests}, function(code, response){
+ foreach(response, function(response, i){
+ try {
+ (currentCallbacks[i] || noop)(response.status, response.response);
+ } catch(e) {
+ self.$log.error(e);
+ }
+ });
+ (callback || noop)();
+ });
+ scope.$eval();
+ };
+ return bulkXHR;
+}, {inject:['$xhr']});
+
+angularService('$xhr.cache', function($xhr){
+ var inflight = {};
+ function cache(method, url, post, callback){
+ if (method == 'GET') {
+ var data;
+ if (data = cache.data[url]) {
+ callback(200, copy(data.value));
+ } else if (data = inflight[url]) {
+ data.callbacks.push(callback);
+ } else {
+ inflight[url] = {callbacks: [callback]};
+ cache.delegate(method, url, post, function(status, response){
+ if (status == 200)
+ cache.data[url] = { value: response };
+ foreach(inflight[url].callbacks, function(callback){
+ try {
+ (callback||noop)(status, copy(response));
+ } catch(e) {
+ self.$log.error(e);
+ }
+ });
+ delete inflight[url];
+ });
+ }
+ } else {
+ cache.delegate(method, url, post, callback);
+ }
+ }
+ cache.data = {};
+ cache.delegate = $xhr;
+ return cache;
+}, {inject:['$xhr']});
+
+angularService('$resource', function($xhr){
+ var resource = new ResourceFactory($xhr);
return bind(resource, resource.route);
-}, {inject: ['$browser']});
+}, {inject: ['$xhr.cache']});
--
cgit v1.2.3
From 549ff73a9b66e718383c79ccd7c28e4f9b25632d Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 30 Apr 2010 10:27:41 -0700
Subject: clear cache on non-get
---
src/services.js | 1 +
1 file changed, 1 insertion(+)
(limited to 'src')
diff --git a/src/services.js b/src/services.js
index 36c89ccb..16dbcb35 100644
--- a/src/services.js
+++ b/src/services.js
@@ -262,6 +262,7 @@ angularService('$xhr.cache', function($xhr){
});
}
} else {
+ cache.data = {};
cache.delegate(method, url, post, callback);
}
}
--
cgit v1.2.3
From ac1d02d0658cb74ae3822e364f84809d78cda335 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 30 Apr 2010 12:22:07 -0700
Subject: make xhr post optional
---
src/Browser.js | 4 ++++
src/Compiler.js | 13 ++++++++++++-
src/services.js | 12 ++++++++++++
src/widgets.js | 9 ++++-----
4 files changed, 32 insertions(+), 6 deletions(-)
(limited to 'src')
diff --git a/src/Browser.js b/src/Browser.js
index d2e8608d..6ec083fa 100644
--- a/src/Browser.js
+++ b/src/Browser.js
@@ -53,6 +53,10 @@ Browser.prototype = {
},
xhr: function(method, url, post, callback){
+ if (isFunction(post)) {
+ callback = post;
+ post = null;
+ }
var xhr = new this.XHR();
xhr.open(method, url, true);
xhr.onreadystatechange = function() {
diff --git a/src/Compiler.js b/src/Compiler.js
index c77c6b30..c8910c27 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -77,7 +77,18 @@ function Compiler(textMarkup, attrMarkup, directives, widgets){
Compiler.prototype = {
compile: function(rawElement) {
rawElement = jqLite(rawElement);
- var template = this.templatize(rawElement, 0, 0) || new Template();
+ var index = 0,
+ template,
+ parent = rawElement.parent();
+ if (parent && parent[0]) {
+ parent = parent[0];
+ for(var i = 0; i < parent.childNodes.length; i++) {
+ if (parent.childNodes[i] == rawElement[0]) {
+ index = i;
+ }
+ }
+ }
+ template = this.templatize(rawElement, index, 0) || new Template();
return function(element, parentScope){
element = jqLite(element);
var scope = parentScope && parentScope.$eval ?
diff --git a/src/services.js b/src/services.js
index 16dbcb35..2cf0e4ad 100644
--- a/src/services.js
+++ b/src/services.js
@@ -192,6 +192,10 @@ angularService('$route', function(location, params){
angularService('$xhr', function($browser){
var self = this;
return function(method, url, post, callback){
+ if (isFunction(post)) {
+ callback = post;
+ post = null;
+ }
if (post && isObject(post)) {
post = toJson(post);
}
@@ -213,6 +217,10 @@ angularService('$xhr.bulk', function($xhr){
callbacks = [],
scope = this;
function bulkXHR(method, url, post, callback) {
+ if (isFunction(post)) {
+ callback = post;
+ post = null;
+ }
requests.push({method: method, url: url, data:post});
callbacks.push(callback);
}
@@ -240,6 +248,10 @@ angularService('$xhr.bulk', function($xhr){
angularService('$xhr.cache', function($xhr){
var inflight = {};
function cache(method, url, post, callback){
+ if (isFunction(post)) {
+ callback = post;
+ post = null;
+ }
if (method == 'GET') {
var data;
if (data = cache.data[url]) {
diff --git a/src/widgets.js b/src/widgets.js
index 8a816934..2fade3e3 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -192,22 +192,21 @@ angularWidget('NG:INCLUDE', function(element){
function incrementChange(){ changeCounter++;}
this.$watch(srcExp, incrementChange);
this.$watch(scopeExp, incrementChange);
+ scope.$onEval(function(){
+ if (childScope) childScope.$eval();
+ });
this.$watch(function(){return changeCounter;}, function(){
var src = this.$eval(srcExp),
useScope = this.$eval(scopeExp);
if (src) {
- scope.$browser.xhr('GET', src, function(code, response){
+ scope.$xhr.cache('GET', src, function(code, response){
element.html(response);
childScope = useScope || createScope(scope);
compiler.compile(element)(element, childScope);
childScope.$init();
- scope.$root.$eval();
});
}
});
- scope.$onEval(function(){
- if (childScope) childScope.$eval();
- });
};
}
});
--
cgit v1.2.3
From 038a743e6f49c347a38edc0e54dcbb175905a475 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 7 May 2010 12:09:14 -0700
Subject: xhr bulk fixes
---
src/Angular.js | 19 ++++++++------
src/AngularPublic.js | 1 +
src/Browser.js | 3 ++-
src/JSON.js | 2 +-
src/Resource.js | 12 ++++++---
src/Scope.js | 4 +--
src/services.js | 71 +++++++++++++++++++++++++++++++++++-----------------
7 files changed, 74 insertions(+), 38 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 3af21ced..2df6bbef 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -231,13 +231,14 @@ function isLeafNode (node) {
function copy(source, destination){
if (!destination) {
- if (isArray(source)) {
- return copy(source, []);
- } else if (isObject(source)) {
- return copy(source, {});
- } else {
- return source;
+ if (source) {
+ if (isArray(source)) {
+ return copy(source, []);
+ } else if (isObject(source)) {
+ return copy(source, {});
+ }
}
+ return source;
} else {
if (isArray(source)) {
while(destination.length) {
@@ -249,7 +250,11 @@ function copy(source, destination){
});
}
foreach(source, function(value, key){
- destination[key] = isArray(value) ? copy(value, []) : (isObject(value) ? copy(value, {}) : value);
+ destination[key] = value ?
+ ( isArray(value) ?
+ copy(value, []) :
+ (isObject(value) ? copy(value, {}) : value)) :
+ value;
});
return destination;
}
diff --git a/src/AngularPublic.js b/src/AngularPublic.js
index 1739ac4b..7230c3e5 100644
--- a/src/AngularPublic.js
+++ b/src/AngularPublic.js
@@ -22,6 +22,7 @@ extend(angular, {
'isDefined': isDefined,
'isString': isString,
'isFunction': isFunction,
+ 'isObject': isObject,
'isNumber': isNumber,
'isArray': isArray
});
diff --git a/src/Browser.js b/src/Browser.js
index 6ec083fa..2a90b63f 100644
--- a/src/Browser.js
+++ b/src/Browser.js
@@ -8,6 +8,7 @@ function Browser(location, document) {
this.expectedUrl = location.href;
this.urlListeners = [];
this.hoverListener = noop;
+ this.isMock = false;
this.XHR = window.XMLHttpRequest || function () {
try { return new ActiveXObject("Msxml2.XMLHTTP.6.0"); } catch (e1) {}
@@ -64,7 +65,7 @@ Browser.prototype = {
callback(xhr.status || 200, xhr.responseText);
}
};
- xhr.send('');
+ xhr.send(post || '');
},
watchUrl: function(fn){
diff --git a/src/JSON.js b/src/JSON.js
index 5c3e1043..340b075a 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -74,7 +74,7 @@ function toJsonArray(buf, obj, pretty, stack){
var childPretty = pretty ? pretty + " " : false;
var keys = [];
for(var k in obj) {
- if (k.indexOf('$$') === 0)
+ if (k.indexOf('$$') === 0 || obj[k] === undefined)
continue;
keys.push(k);
}
diff --git a/src/Resource.js b/src/Resource.js
index 34ad1c5d..c9bad0c0 100644
--- a/src/Resource.js
+++ b/src/Resource.js
@@ -21,7 +21,7 @@ Route.prototype = {
});
url = url.replace(/\/?#$/, '');
var query = [];
- foreach(params, function(value, key){
+ foreachSorted(params, function(value, key){
if (!self.urlParams[key]) {
query.push(encodeURI(key) + '=' + encodeURI(value));
}
@@ -69,14 +69,18 @@ ResourceFactory.prototype = {
switch(arguments.length) {
case 3: callback = a3;
case 2:
- if (typeof a2 == 'function') {
+ if (isFunction(a2)) {
callback = a2;
} else {
params = a1;
data = a2;
break;
}
- case 1: if (isPost) data = a1; else params = a1; break;
+ case 1:
+ if (isFunction(a1)) callback = a1;
+ else if (isPost) data = a1;
+ else params = a1;
+ break;
case 0: break;
default:
throw "Expected between 0-3 arguments [params, data, callback], got " + arguments.length + " arguments.";
@@ -109,7 +113,7 @@ ResourceFactory.prototype = {
case 1: if (typeof a1 == 'function') callback = a1; else params = a1;
case 0: break;
default:
- throw "Expected between 1-3 arguments [params, data, callback], got " + arguments.length + " arguments.";
+ throw "Expected between 1-2 arguments [params, callback], got " + arguments.length + " arguments.";
}
var self = this;
Resource[name](params, this, function(response){
diff --git a/src/Scope.js b/src/Scope.js
index 1b93418f..9a20c214 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -97,7 +97,7 @@ function createScope(parent, services, existing) {
$set: bind(instance, setter, instance),
$eval: function $eval(exp) {
- if (isDefined(exp)) {
+ if (exp) {
return expressionCompile(exp).apply(instance, slice.call(arguments, 1, arguments.length));
} else {
foreach(evalLists.sorted, function(list) {
@@ -129,8 +129,8 @@ function createScope(parent, services, existing) {
function watcher(){
var value = watch.call(instance);
if (last !== value) {
- instance.$tryEval(listener, exceptionHandler, value, last);
last = value;
+ instance.$tryEval(listener, exceptionHandler, value, last);
}
}
instance.$onEval(PRIORITY_WATCH, watcher);
diff --git a/src/services.js b/src/services.js
index 2cf0e4ad..195cd6b3 100644
--- a/src/services.js
+++ b/src/services.js
@@ -64,6 +64,12 @@ angularService("$location", function(browser){
return location;
}, {inject: ['$browser']});
+angularService("$log", function(){
+ return {
+ error: noop
+ };
+});
+
angularService("$hover", function(browser) {
var tooltip, self = this, error, width = 300, arrowWidth = 10;
browser.hover(function(element, show){
@@ -152,6 +158,7 @@ angularService('$route', function(location, params){
onChange = [],
matcher = angularWidget('NG:SWITCH').route,
parentScope = this,
+ dirty = 0,
$route = {
routes: routes,
onChange: bind(onChange, onChange.push),
@@ -160,7 +167,7 @@ angularService('$route', function(location, params){
var route = routes[path];
if (!route) route = routes[path] = {};
if (params) angular.extend(route, params);
- if (matcher(location.hashPath, path)) updateRoute();
+ dirty++;
return route;
}
};
@@ -185,7 +192,7 @@ angularService('$route', function(location, params){
parentScope.$tryEval(childScope.init);
}
}
- this.$watch(function(){return location.hash;}, updateRoute);
+ this.$watch(function(){return dirty + location.hash;}, updateRoute);
return $route;
}, {inject: ['$location']});
@@ -221,32 +228,49 @@ angularService('$xhr.bulk', function($xhr){
callback = post;
post = null;
}
- requests.push({method: method, url: url, data:post});
- callbacks.push(callback);
+ var currentQueue;
+ foreach(bulkXHR.urls, function(queue){
+ if (isFunction(queue.match) ? queue.match(url) : queue.match.exec(url)) {
+ currentQueue = queue;
+ }
+ });
+ if (currentQueue) {
+ if (!currentQueue.requests) currentQueue.requests = [];
+ if (!currentQueue.callbacks) currentQueue.callbacks = [];
+ currentQueue.requests.push({method: method, url: url, data:post});
+ currentQueue.callbacks.push(callback);
+ } else {
+ $xhr(method, url, post, callback);
+ }
}
- bulkXHR.url = "/bulk";
+ bulkXHR.urls = {};
bulkXHR.flush = function(callback){
- var currentRequests = requests,
- currentCallbacks = callbacks;
- requests = [];
- callbacks = [];
- $xhr('POST', bulkXHR.url, {requests:currentRequests}, function(code, response){
- foreach(response, function(response, i){
- try {
- (currentCallbacks[i] || noop)(response.status, response.response);
- } catch(e) {
- self.$log.error(e);
- }
- });
- (callback || noop)();
+ foreach(bulkXHR.urls, function(queue, url){
+ var currentRequests = queue.requests,
+ currentCallbacks = queue.callbacks;
+ if (currentRequests && currentRequests.length) {
+ queue.requests = [];
+ queue.callbacks = [];
+ $xhr('POST', url, {requests:currentRequests}, function(code, response){
+ foreach(response, function(response, i){
+ try {
+ (currentCallbacks[i] || noop)(response.status, response.response);
+ } catch(e) {
+ scope.$log.error(e);
+ }
+ });
+ (callback || noop)();
+ });
+ scope.$eval();
+ }
});
- scope.$eval();
};
+ this.$onEval(PRIORITY_LAST, bulkXHR.flush);
return bulkXHR;
}, {inject:['$xhr']});
angularService('$xhr.cache', function($xhr){
- var inflight = {};
+ var inflight = {}, self = this;;
function cache(method, url, post, callback){
if (isFunction(post)) {
callback = post;
@@ -263,14 +287,15 @@ angularService('$xhr.cache', function($xhr){
cache.delegate(method, url, post, function(status, response){
if (status == 200)
cache.data[url] = { value: response };
- foreach(inflight[url].callbacks, function(callback){
+ var callbacks = inflight[url].callbacks;
+ delete inflight[url];
+ foreach(callbacks, function(callback){
try {
(callback||noop)(status, copy(response));
} catch(e) {
self.$log.error(e);
}
});
- delete inflight[url];
});
}
} else {
@@ -281,7 +306,7 @@ angularService('$xhr.cache', function($xhr){
cache.data = {};
cache.delegate = $xhr;
return cache;
-}, {inject:['$xhr']});
+}, {inject:['$xhr.bulk']});
angularService('$resource', function($xhr){
var resource = new ResourceFactory($xhr);
--
cgit v1.2.3
From 0305b6746e2c50960b042c5d687794e030930f8b Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 7 May 2010 13:43:54 -0700
Subject: change everything over to jasmine
---
src/Scope.js | 5 +++--
src/directives.js | 8 ++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/Scope.js b/src/Scope.js
index 9a20c214..687d3628 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -127,10 +127,11 @@ function createScope(parent, services, existing) {
var watch = expressionCompile(watchExp),
last;
function watcher(){
- var value = watch.call(instance);
+ var value = watch.call(instance),
+ lastValue = last;
if (last !== value) {
last = value;
- instance.$tryEval(listener, exceptionHandler, value, last);
+ instance.$tryEval(listener, exceptionHandler, value, lastValue);
}
}
instance.$onEval(PRIORITY_WATCH, watcher);
diff --git a/src/directives.js b/src/directives.js
index d9cf7962..a3575d62 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -30,8 +30,9 @@ angularDirective("ng-bind", function(expression){
value = this.$tryEval(expression, function(e){
error = toJson(e);
}),
- isHtml = value instanceof HTML;
- if (!isHtml && isObject(value)) {
+ isHtml = value instanceof HTML,
+ isDomElement = isElement(value);
+ if (!isHtml && !isDomElement && isObject(value)) {
value = toJson(value);
}
if (value != lastValue || error != lastError) {
@@ -41,6 +42,9 @@ angularDirective("ng-bind", function(expression){
if (error) value = error;
if (isHtml) {
element.html(value.html);
+ } else if (isDomElement) {
+ element.html('');
+ element.append(value);
} else {
element.text(value);
}
--
cgit v1.2.3
From 664f1c56876f00b885272c39f759641271eef1dc Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sat, 8 May 2010 10:40:45 -0700
Subject: reenable hover clearing
---
src/services.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/services.js b/src/services.js
index 195cd6b3..bdfbfdb4 100644
--- a/src/services.js
+++ b/src/services.js
@@ -109,7 +109,7 @@ angularService("$hover", function(browser) {
width: width + "px"
});
}
- } else if (tooltip && false) {
+ } else if (tooltip) {
tooltip.callout.remove();
tooltip = null;
}
--
cgit v1.2.3
From 4542716370ac52f385795f509436104a2a3501d2 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 10 May 2010 10:36:02 -0700
Subject: lint
---
src/widgets.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/widgets.js b/src/widgets.js
index 8a816934..1dadfe51 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -216,7 +216,7 @@ var ngSwitch = angularWidget('NG:SWITCH', function (element){
var compiler = this,
watchExpr = element.attr("on"),
usingExpr = (element.attr("using") || 'equals'),
- usingExprParams = usingExpr.split(":");
+ usingExprParams = usingExpr.split(":"),
usingFn = ngSwitch[usingExprParams.shift()],
changeExpr = element.attr('change') || '',
cases = [];
--
cgit v1.2.3
From 5dda723185a9037b7e92828d32430c21838ee216 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 10 May 2010 20:24:20 -0700
Subject: improved handling of text fields when formater fails to prevent
clobering of field
---
src/formatters.js | 23 +++++++++++-----
src/widgets.js | 78 ++++++++++++++++++++++++++++++++++---------------------
2 files changed, 64 insertions(+), 37 deletions(-)
(limited to 'src')
diff --git a/src/formatters.js b/src/formatters.js
index ee63c1a5..40462cf3 100644
--- a/src/formatters.js
+++ b/src/formatters.js
@@ -1,11 +1,20 @@
-function formater(format, parse) {return {'format':format, 'parse':parse || format};}
-function toString(obj) {return isDefined(obj) ? "" + obj : obj;}
+function formatter(format, parse) {return {'format':format, 'parse':parse || format};}
+function toString(obj) {return (isDefined(obj) && obj !== null) ? "" + obj : obj;}
+
+var NUMBER = /^\s*[-+]?\d*(\.\d*)?\s*$/;
+
extend(angularFormatter, {
- 'noop':formater(identity, identity),
- 'boolean':formater(toString, toBoolean),
- 'number':formater(toString, function(obj){return 1*obj;}),
+ '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";
+ }),
- 'list':formater(
+ 'list':formatter(
function(obj) { return obj ? obj.join(", ") : obj; },
function(value) {
var list = [];
@@ -17,7 +26,7 @@ extend(angularFormatter, {
}
),
- 'trim':formater(
+ 'trim':formatter(
function(obj) { return obj ? trim("" + obj) : ""; }
)
});
diff --git a/src/widgets.js b/src/widgets.js
index 064b27fe..48898a9a 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -1,15 +1,14 @@
function modelAccessor(scope, element) {
- var expr = element.attr('name'),
- farmatterName = element.attr('ng-format') || NOOP,
- formatter = angularFormatter(farmatterName);
+ var expr = element.attr('name');
if (!expr) throw "Required field 'name' not found.";
- if (!formatter) throw "Formatter named '" + farmatterName + "' not found.";
return {
get: function() {
- return formatter['format'](scope.$eval(expr));
+ return scope.$eval(expr);
},
set: function(value) {
- scope.$tryEval(expr + '=' + toJson(formatter['parse'](value)), element);
+ if (value !== undefined) {
+ scope.$tryEval(expr + '=' + toJson(value), element);
+ }
}
};
}
@@ -22,27 +21,49 @@ function valueAccessor(scope, element) {
var validatorName = element.attr('ng-validate') || NOOP,
validator = compileValidator(validatorName),
required = element.attr('ng-required'),
- lastError,
+ farmatterName = element.attr('ng-format') || NOOP,
+ formatter = angularFormatter(farmatterName),
+ format, parse, lastError;
invalidWidgets = scope.$invalidWidgets || {markValid:noop, markInvalid:noop};
- required = required || required === '';
if (!validator) throw "Validator named '" + validatorName + "' not found.";
- function validate(value) {
- var force = false;
- if (isUndefined(value)) {
- value = element.val();
- force = true;
+ if (!formatter) throw "Formatter named '" + farmatterName + "' not found.";
+ format = formatter.format;
+ parse = formatter.parse;
+ required = required || required === '';
+
+ element.data('$validate', validate);
+ return {
+ get: function(){
+ if (lastError)
+ elementError(element, NG_VALIDATION_ERROR, null);
+ try {
+ return parse(element.val());
+ } catch (e) {
+ lastError = e;
+ elementError(element, NG_VALIDATION_ERROR, e);
+ }
+ },
+ set: function(value) {
+ var oldValue = element.val(),
+ newValue = format(value);
+ if (oldValue != newValue) {
+ element.val(newValue);
+ }
+ validate();
}
+ };
+
+ function validate() {
+ var value = trim(element.val());
if (element[0].disabled || element[0].readOnly) {
elementError(element, NG_VALIDATION_ERROR, null);
invalidWidgets.markValid(element);
- return value;
- }
- var error,
- validateScope = extend(new (extend(function(){}, {prototype:scope}))(), {$element:element});
- error = required && !trim(value) ?
- "Required" :
- (trim(value) ? validator({state:validateScope, scope:{get:validateScope.$get, set:validateScope.$set}}, value) : null);
- if (error !== lastError || force) {
+ } else {
+ var error,
+ validateScope = extend(new (extend(function(){}, {prototype:scope}))(), {$element:element});
+ error = required && !value ?
+ "Required" :
+ (value ? validator({state:validateScope, scope:{get:validateScope.$get, set:validateScope.$set}}, value) : null);
elementError(element, NG_VALIDATION_ERROR, error);
lastError = error;
if (error) {
@@ -51,13 +72,7 @@ function valueAccessor(scope, element) {
invalidWidgets.markValid(element);
}
}
- return value;
}
- element.data('$validate', validate);
- return {
- get: function(){ return validate(element.val()); },
- set: function(value){ element.val(validate(value)); }
- };
}
function checkedAccessor(scope, element) {
@@ -106,7 +121,7 @@ function optionsAccessor(scope, element) {
function noopAccessor() { return { get: noop, set: noop }; }
-var textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, initWidgetValue('')),
+var textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, initWidgetValue()),
buttonWidget = inputWidget('click', noopAccessor, noopAccessor, noop),
INPUT_TYPE = {
'text': textWidget,
@@ -126,9 +141,12 @@ var textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, initW
function initWidgetValue(initValue) {
return function (model, view) {
- var value = view.get() || copy(initValue);
- if (isUndefined(model.get()) && isDefined(value))
+ var value = view.get();
+ if (!value && isDefined(initValue))
+ value = copy(initValue);
+ if (isUndefined(model.get()) && isDefined(value)) {
model.set(value);
+ }
};
}
--
cgit v1.2.3
From 81e99799a8c999d8038dd27bf86bb8ca6a3add11 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 10 May 2010 20:30:05 -0700
Subject: fix handling of val on ie with jquery
---
src/widgets.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/widgets.js b/src/widgets.js
index 48898a9a..d63616ac 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -44,17 +44,17 @@ function valueAccessor(scope, element) {
}
},
set: function(value) {
- var oldValue = element.val(),
+ var oldValue = element[0].value,
newValue = format(value);
if (oldValue != newValue) {
- element.val(newValue);
+ element[0].value = newValue;
}
validate();
}
};
function validate() {
- var value = trim(element.val());
+ var value = trim(element[0].value);
if (element[0].disabled || element[0].readOnly) {
elementError(element, NG_VALIDATION_ERROR, null);
invalidWidgets.markValid(element);
--
cgit v1.2.3
From 271b535c8285cb90781bf1e8ee56d6e68210a6a9 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 10 May 2010 20:41:12 -0700
Subject: fix handling of null on ie
---
src/widgets.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/widgets.js b/src/widgets.js
index d63616ac..24c85464 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -44,17 +44,17 @@ function valueAccessor(scope, element) {
}
},
set: function(value) {
- var oldValue = element[0].value,
+ var oldValue = element.val(),
newValue = format(value);
if (oldValue != newValue) {
- element[0].value = newValue;
+ element.val(newValue || ''); // needed for ie
}
validate();
}
};
function validate() {
- var value = trim(element[0].value);
+ var value = trim(element.val());
if (element[0].disabled || element[0].readOnly) {
elementError(element, NG_VALIDATION_ERROR, null);
invalidWidgets.markValid(element);
@@ -142,8 +142,9 @@ var textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, initW
function initWidgetValue(initValue) {
return function (model, view) {
var value = view.get();
- if (!value && isDefined(initValue))
+ if (!value && isDefined(initValue)) {
value = copy(initValue);
+ }
if (isUndefined(model.get()) && isDefined(value)) {
model.set(value);
}
--
cgit v1.2.3
From d5ba889f63d3ce8abe49c24695f5f5c964b40264 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 12 May 2010 15:25:16 -0700
Subject: fixes issues where the field clobbers itself
---
src/Angular.js | 3 ++-
src/widgets.js | 18 +++++++++++++-----
2 files changed, 15 insertions(+), 6 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 2df6bbef..8675bc40 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -379,7 +379,8 @@ function toKeyValue(obj) {
function angularInit(config){
if (config.autobind) {
var scope = compile(window.document, null, {'$config':config});
- scope.$browser.addCss('../css/angular.css');
+ // TODO default to the source of angular.js
+ scope.$browser.addCss('css/angular.css');
scope.$init();
}
}
diff --git a/src/widgets.js b/src/widgets.js
index 24c85464..4eae735f 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -7,7 +7,7 @@ function modelAccessor(scope, element) {
},
set: function(value) {
if (value !== undefined) {
- scope.$tryEval(expr + '=' + toJson(value), element);
+ return scope.$tryEval(expr + '=' + toJson(value), element);
}
}
};
@@ -37,7 +37,9 @@ function valueAccessor(scope, element) {
if (lastError)
elementError(element, NG_VALIDATION_ERROR, null);
try {
- return parse(element.val());
+ var value = parse(element.val());
+ validate();
+ return value;
} catch (e) {
lastError = e;
elementError(element, NG_VALIDATION_ERROR, e);
@@ -163,13 +165,15 @@ function inputWidget(events, modelAccessor, viewAccessor, initFn) {
var scope = this,
model = modelAccessor(scope, element),
view = viewAccessor(scope, element),
- action = element.attr('ng-change') || '';
+ action = element.attr('ng-change') || '',
+ lastValue;
initFn.call(scope, model, view, element);
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(){
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,
@@ -177,8 +181,12 @@ function inputWidget(events, modelAccessor, viewAccessor, initFn) {
return initFn != noop;
});
}
- view.set(model.get());
- scope.$watch(model.get, view.set);
+ view.set(lastValue = model.get());
+ scope.$watch(model.get, function(value){
+ if (lastValue !== value) {
+ view.set(lastValue = value);
+ }
+ });
};
}
--
cgit v1.2.3
From 4b9b9e98300b9554faf0c960674eb75750227404 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 13 May 2010 12:03:10 -0700
Subject: fix incorect parsing of url if it contains dash - character
---
src/services.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/services.js b/src/services.js
index bdfbfdb4..55e3b2f6 100644
--- a/src/services.js
+++ b/src/services.js
@@ -3,7 +3,7 @@ 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 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){
--
cgit v1.2.3
From 22d1464d7abc284dd56d6beaf47e8d85088e01c5 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 13 May 2010 13:57:39 -0700
Subject: fixed issue with radio view clobering model if radio was checked.
---
src/Scope.js | 2 +-
src/widgets.js | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/Scope.js b/src/Scope.js
index 687d3628..7bcf7380 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -97,7 +97,7 @@ function createScope(parent, services, existing) {
$set: bind(instance, setter, instance),
$eval: function $eval(exp) {
- if (exp) {
+ if (exp !== undefined) {
return expressionCompile(exp).apply(instance, slice.call(arguments, 1, arguments.length));
} else {
foreach(evalLists.sorted, function(list) {
diff --git a/src/widgets.js b/src/widgets.js
index 4eae735f..7de4bdc1 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -155,9 +155,15 @@ function initWidgetValue(initValue) {
function radioInit(model, view, element) {
var modelValue = model.get(), viewValue = view.get(), input = element[0];
+ input.checked = false;
input.name = this.$id + '@' + input.name;
- if (isUndefined(modelValue)) model.set(null);
- if (viewValue !== null) model.set(viewValue);
+ if (isUndefined(modelValue)) {
+ model.set(modelValue = null);
+ }
+ if (modelValue == null && viewValue !== null) {
+ model.set(viewValue);
+ }
+ view.set(modelValue);
}
function inputWidget(events, modelAccessor, viewAccessor, initFn) {
--
cgit v1.2.3
From 1bdcf72e456c74256b14f98b26e969b9de637614 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 13 May 2010 16:40:41 -0700
Subject: put formatters back.
---
src/widgets.js | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/widgets.js b/src/widgets.js
index 7de4bdc1..1c9fe605 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -13,6 +13,21 @@ function modelAccessor(scope, element) {
};
}
+function modelFormattedAccessor(scope, element) {
+ var accessor = modelAccessor(scope, element),
+ farmatterName = element.attr('ng-format') || NOOP,
+ formatter = angularFormatter(farmatterName);
+ if (!formatter) throw "Formatter named '" + farmatterName + "' not found.";
+ return {
+ get: function() {
+ return formatter.format(accessor.get());
+ },
+ set: function(value) {
+ return accessor.set(formatter.parse(value));
+ }
+ };
+}
+
function compileValidator(expr) {
return new Parser(expr).validator()();
}
@@ -134,10 +149,10 @@ var textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, initW
'submit': buttonWidget,
'reset': buttonWidget,
'image': buttonWidget,
- 'checkbox': inputWidget('click', modelAccessor, checkedAccessor, initWidgetValue(false)),
- 'radio': inputWidget('click', modelAccessor, radioAccessor, radioInit),
- 'select-one': inputWidget('change', modelAccessor, valueAccessor, initWidgetValue(null)),
- 'select-multiple': inputWidget('change', modelAccessor, optionsAccessor, initWidgetValue([]))
+ 'checkbox': inputWidget('click', modelFormattedAccessor, checkedAccessor, initWidgetValue(false)),
+ 'radio': inputWidget('click', modelFormattedAccessor, radioAccessor, radioInit),
+ 'select-one': inputWidget('change', modelFormattedAccessor, valueAccessor, initWidgetValue(null)),
+ 'select-multiple': inputWidget('change', modelFormattedAccessor, optionsAccessor, initWidgetValue([]))
// 'file': fileWidget???
};
--
cgit v1.2.3
From 0f73084e9d21cea99f0535e6ca30a1341b7047dc Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 19 May 2010 11:51:17 -0700
Subject: added error handler to xhr requests
---
src/Resource.js | 27 ++++++++++++++++++---------
src/Scope.js | 4 ++--
src/services.js | 30 ++++++++++++++++++++++++------
3 files changed, 44 insertions(+), 17 deletions(-)
(limited to 'src')
diff --git a/src/Resource.js b/src/Resource.js
index c9bad0c0..724121b7 100644
--- a/src/Resource.js
+++ b/src/Resource.js
@@ -87,16 +87,25 @@ ResourceFactory.prototype = {
}
var value = action.isArray ? [] : new Resource(data);
- self.xhr(action.method, route.url(extend({}, action.params || {}, extractParams(data), params)), data, function(status, response) {
- if (action.isArray) {
- foreach(response, function(item){
- value.push(new Resource(item));
- });
- } else {
- copy(response, value);
+ self.xhr(
+ action.method,
+ route.url(extend({}, action.params || {}, extractParams(data), params)),
+ data,
+ function(status, response) {
+ if (status == 200) {
+ if (action.isArray) {
+ foreach(response, function(item){
+ value.push(new Resource(item));
+ });
+ } else {
+ copy(response, value);
+ }
+ (callback||noop)(value);
+ } else {
+ throw {status: status, response:response, message: status + ": " + response};
+ }
}
- (callback||noop)(value);
- });
+ );
return value;
};
diff --git a/src/Scope.js b/src/Scope.js
index 7bcf7380..fe0b6ce3 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -174,7 +174,7 @@ function createScope(parent, services, existing) {
}
function inject(name){
- var service = getter(servicesCache, name, true), factory, args = [];
+ var service = servicesCache[name], factory, args = [];
if (isUndefined(service)) {
factory = services[name];
if (!isFunction(factory))
@@ -182,7 +182,7 @@ function createScope(parent, services, existing) {
foreach(factory.inject, function(dependency){
args.push(inject(dependency));
});
- setter(servicesCache, name, service = factory.apply(instance, args));
+ servicesCache[name] = service = factory.apply(instance, args);
}
return service;
}
diff --git a/src/services.js b/src/services.js
index 55e3b2f6..f1dc5c28 100644
--- a/src/services.js
+++ b/src/services.js
@@ -196,7 +196,7 @@ angularService('$route', function(location, params){
return $route;
}, {inject: ['$location']});
-angularService('$xhr', function($browser){
+angularService('$xhr', function($browser, $error){
var self = this;
return function(method, url, post, callback){
if (isFunction(post)) {
@@ -211,15 +211,27 @@ angularService('$xhr', function($browser){
if (isString(response) && /^\s*[\[\{]/.exec(response) && /[\}\]]\s*$/.exec(response)) {
response = fromJson(response);
}
- callback(code, response);
+ if (code == 200) {
+ callback(code, response);
+ } else {
+ $error(
+ {method: method, url:url, data:post, callback:callback},
+ {status: code, body:response});
+ }
} finally {
self.$eval();
}
});
};
-}, {inject:['$browser']});
+}, {inject:['$browser', '$xhr.error']});
+
+angularService('$xhr.error', function($log){
+ return function(request, response){
+ $log.error(response);
+ };
+}, {inject:['$log']});
-angularService('$xhr.bulk', function($xhr){
+angularService('$xhr.bulk', function($xhr, $error){
var requests = [],
callbacks = [],
scope = this;
@@ -254,7 +266,13 @@ angularService('$xhr.bulk', function($xhr){
$xhr('POST', url, {requests:currentRequests}, function(code, response){
foreach(response, function(response, i){
try {
- (currentCallbacks[i] || noop)(response.status, response.response);
+ if (response.status == 200) {
+ (currentCallbacks[i] || noop)(response.status, response.response);
+ } else {
+ $error(
+ extend({}, currentRequests[i], {callback: currentCallbacks[i]}),
+ {status: response.status, body:response.response});
+ }
} catch(e) {
scope.$log.error(e);
}
@@ -267,7 +285,7 @@ angularService('$xhr.bulk', function($xhr){
};
this.$onEval(PRIORITY_LAST, bulkXHR.flush);
return bulkXHR;
-}, {inject:['$xhr']});
+}, {inject:['$xhr', '$xhr.error']});
angularService('$xhr.cache', function($xhr){
var inflight = {}, self = this;;
--
cgit v1.2.3
From f2abbfd394691f87860d5c8dc28c2c1d0310c90f Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 19 May 2010 11:54:58 -0700
Subject: refactor for simplicity
---
src/services.js | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
(limited to 'src')
diff --git a/src/services.js b/src/services.js
index f1dc5c28..99e05018 100644
--- a/src/services.js
+++ b/src/services.js
@@ -231,9 +231,8 @@ angularService('$xhr.error', function($log){
};
}, {inject:['$log']});
-angularService('$xhr.bulk', function($xhr, $error){
+angularService('$xhr.bulk', function($xhr, $error, $log){
var requests = [],
- callbacks = [],
scope = this;
function bulkXHR(method, url, post, callback) {
if (isFunction(post)) {
@@ -248,9 +247,7 @@ angularService('$xhr.bulk', function($xhr, $error){
});
if (currentQueue) {
if (!currentQueue.requests) currentQueue.requests = [];
- if (!currentQueue.callbacks) currentQueue.callbacks = [];
- currentQueue.requests.push({method: method, url: url, data:post});
- currentQueue.callbacks.push(callback);
+ currentQueue.requests.push({method: method, url: url, data:post, callback:callback});
} else {
$xhr(method, url, post, callback);
}
@@ -258,8 +255,7 @@ angularService('$xhr.bulk', function($xhr, $error){
bulkXHR.urls = {};
bulkXHR.flush = function(callback){
foreach(bulkXHR.urls, function(queue, url){
- var currentRequests = queue.requests,
- currentCallbacks = queue.callbacks;
+ var currentRequests = queue.requests;
if (currentRequests && currentRequests.length) {
queue.requests = [];
queue.callbacks = [];
@@ -267,14 +263,12 @@ angularService('$xhr.bulk', function($xhr, $error){
foreach(response, function(response, i){
try {
if (response.status == 200) {
- (currentCallbacks[i] || noop)(response.status, response.response);
+ (currentRequests[i].callback || noop)(response.status, response.response);
} else {
- $error(
- extend({}, currentRequests[i], {callback: currentCallbacks[i]}),
- {status: response.status, body:response.response});
+ $error(currentRequests[i], {status: response.status, body:response.response});
}
} catch(e) {
- scope.$log.error(e);
+ $log.error(e);
}
});
(callback || noop)();
@@ -285,7 +279,7 @@ angularService('$xhr.bulk', function($xhr, $error){
};
this.$onEval(PRIORITY_LAST, bulkXHR.flush);
return bulkXHR;
-}, {inject:['$xhr', '$xhr.error']});
+}, {inject:['$xhr', '$xhr.error', '$log']});
angularService('$xhr.cache', function($xhr){
var inflight = {}, self = this;;
--
cgit v1.2.3
From 31b35b141f52e6f5d3805d6ca4f2702aee05d61d Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 19 May 2010 12:00:44 -0700
Subject: added exception handling to $xhr
---
src/services.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/services.js b/src/services.js
index 99e05018..aa749e32 100644
--- a/src/services.js
+++ b/src/services.js
@@ -196,7 +196,7 @@ angularService('$route', function(location, params){
return $route;
}, {inject: ['$location']});
-angularService('$xhr', function($browser, $error){
+angularService('$xhr', function($browser, $error, $log){
var self = this;
return function(method, url, post, callback){
if (isFunction(post)) {
@@ -218,12 +218,14 @@ angularService('$xhr', function($browser, $error){
{method: method, url:url, data:post, callback:callback},
{status: code, body:response});
}
+ } catch (e) {
+ $log.error(e);
} finally {
self.$eval();
}
});
};
-}, {inject:['$browser', '$xhr.error']});
+}, {inject:['$browser', '$xhr.error', '$log']});
angularService('$xhr.error', function($log){
return function(request, response){
--
cgit v1.2.3
From 80e12276f423a0dcb486b1191857db96a0ba0a93 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 19 May 2010 13:24:20 -0700
Subject: added $log to console connection
---
src/services.js | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/services.js b/src/services.js
index aa749e32..93822a8c 100644
--- a/src/services.js
+++ b/src/services.js
@@ -64,11 +64,16 @@ angularService("$location", function(browser){
return location;
}, {inject: ['$browser']});
-angularService("$log", function(){
+angularService("$log", function($window){
+ var console = $window.console,
+ log = console && console.log || noop;
return {
- error: noop
+ log: log,
+ warn: console && console.warn || log,
+ info: console && console.info || log,
+ error: console && console.error || log
};
-});
+}, {inject:['$window']});
angularService("$hover", function(browser) {
var tooltip, self = this, error, width = 300, arrowWidth = 10;
--
cgit v1.2.3
From 80bd0c273b20b6fde25bb38c7639821cd205f69b Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 19 May 2010 16:00:20 -0700
Subject: fixed isNumber to angular.isNumber for mocks outside of angular
---
src/services.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/services.js b/src/services.js
index 93822a8c..940f1905 100644
--- a/src/services.js
+++ b/src/services.js
@@ -234,7 +234,7 @@ angularService('$xhr', function($browser, $error, $log){
angularService('$xhr.error', function($log){
return function(request, response){
- $log.error(response);
+ $log.error('ERROR: XHR: ' + request.url, request, response);
};
}, {inject:['$log']});
@@ -272,7 +272,7 @@ angularService('$xhr.bulk', function($xhr, $error, $log){
if (response.status == 200) {
(currentRequests[i].callback || noop)(response.status, response.response);
} else {
- $error(currentRequests[i], {status: response.status, body:response.response});
+ $error(currentRequests[i], response);
}
} catch(e) {
$log.error(e);
--
cgit v1.2.3
From 5215e2095cfd42a0363eb02eded34e03fa2b0cd3 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 20 May 2010 15:55:41 -0700
Subject: basic end to end runner
---
src/scenario/Runner.js | 250 +++++++++++++++++----------------------------
src/scenario/Steps.js | 57 -----------
src/scenario/_namespace.js | 6 --
src/scenario/bootstrap.js | 19 +---
4 files changed, 96 insertions(+), 236 deletions(-)
delete mode 100644 src/scenario/Steps.js
delete mode 100644 src/scenario/_namespace.js
(limited to 'src')
diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
index 7caddc98..eeb4330d 100644
--- a/src/scenario/Runner.js
+++ b/src/scenario/Runner.js
@@ -1,171 +1,109 @@
-var scenario = angular.scenario;
-scenario.SuiteRunner = function(scenarios, body) {
- this.scenarios = scenarios;
- this.body = body;
-};
+angular['scenario'] = (angular['scenario'] = {});
-scenario.SuiteRunner.prototype = {
- run:function(){
- this.setUpUI();
- this.runScenarios();
- },
+angular.scenario.Runner = function(scope){
+ var self = scope.$scenario = this;
+ this.scope = scope;
+ var specs = this.specs = {};
+ var path = [];
+ this.scope.describe = function describe(name, body){
+ path.push(name);
+ body();
+ path.pop();
+ };
+ this.scope.it = function it(name, body) {
+ var specName = path.join(' ') + ': it ' + name;
+ self.currentSpec = specs[specName] = {
+ name: specName,
+ steps:[]
+ };
+ body();
+ self.currentSpec = null;
+ };
+ this.beginSpec = function returnNoop(){
+ return returnNoop;
+ };
+};
- setUpUI:function(){
- this.body.html(
+angular.scenario.Runner.prototype = {
+ run: function(body){
+ body.append(
'
' +
- '' +
- '
';
-
-
-ControlBar.FORBIDEN =
- '' +
- '' +
- '
' +
- '' +
- 'Sorry, you do not have permission for this!'+
- '
';
-
-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('');
- this._document.append(loginView);
- loginView['dialog']({
- 'height':iframeHeight + 33, 'width':500,
- 'resizable': false, 'modal':true,
- 'title': 'Authentication: <angular/>'
- });
- 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/DataStore.js b/src/DataStore.js
deleted file mode 100644
index 70bcc623..00000000
--- a/src/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/Formatters.js b/src/Formatters.js
index 6aa832af..f2d5d33e 100644
--- a/src/Formatters.js
+++ b/src/Formatters.js
@@ -7,12 +7,17 @@ extend(angularFormatter, {
'list':formater(
function(obj) { return obj ? obj.join(", ") : obj; },
- function(value) {
- return value ? _(_(value.split(',')).map(jQuery.trim)).select(_.identity) : [];
+ function(value) {
+ var list = [];
+ foreach(value.split(','), function(item){
+ item = trim(item);
+ if (item) list.push(item);
+ });
+ return list;
}
),
'trim':formater(
function(obj) { return obj ? $.trim("" + obj) : ""; }
- )
+ )
});
diff --git a/src/JSON.js b/src/JSON.js
index 98dfddd2..baf3a2fa 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -2,7 +2,7 @@ array = [].constructor;
function toJson(obj, pretty){
var buf = [];
- toJsonArray(buf, obj, pretty ? "\n " : null, _([]));
+ toJsonArray(buf, obj, pretty ? "\n " : null, []);
return buf.join('');
};
@@ -27,7 +27,7 @@ angular['fromJson'] = fromJson;
function toJsonArray(buf, obj, pretty, stack){
if (typeof obj == "object") {
- if (stack.include(obj)) {
+ if (includes(stack, obj)) {
buf.push("RECURSION");
return;
}
diff --git a/src/Model.js b/src/Model.js
deleted file mode 100644
index b09efd0e..00000000
--- a/src/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/Scope.js b/src/Scope.js
index ccf55077..6ba6aa8e 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -1,253 +1,3 @@
-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('.');
@@ -262,12 +12,12 @@ function getter(instance, path) {
lastInstance = instance;
instance = instance[key];
}
- if (_.isUndefined(instance) && key.charAt(0) == '$') {
+ 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);
+ instance = bind(fn, lastInstance, lastInstance);
return instance;
}
}
@@ -303,24 +53,26 @@ function expressionCompile(exp){
parser.assertAllConsumed();
compileCache[exp] = expFn;
}
- // return expFn
- // TODO(remove this hack)
+ return parserNewScopeAdapter(expFn);
+};
+
+// return expFn
+// TODO(remove this hack)
+function parserNewScopeAdapter(fn) {
return function(){
- return expFn({
+ return fn({
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 isRenderableElement(element) {
+ var name = element && element[0] && element[0].nodeName;
+ return name && name.charAt(0) != '#' &&
+ !includes(['TR', 'COL', 'COLGROUP', 'TBODY', 'THEAD', 'TFOOT'], name);
}
function rethrow(e) { throw e; }
@@ -334,7 +86,7 @@ function errorHandlerFor(element) {
};
}
-function scope(parent, Class) {
+function createScope(parent, Class) {
function Parent(){}
function API(){}
function Behavior(){}
diff --git a/src/Server.js b/src/Server.js
deleted file mode 100644
index 5c4ec3c6..00000000
--- a/src/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/UrlWatcher.js b/src/UrlWatcher.js
new file mode 100644
index 00000000..0892eb1a
--- /dev/null
+++ b/src/UrlWatcher.js
@@ -0,0 +1,62 @@
+
+// ////////////////////////////
+// UrlWatcher
+// ////////////////////////////
+
+function UrlWatcher(location) {
+ this.location = location;
+ this.delay = 25;
+ this.setTimeout = function(fn, delay) {
+ window.setTimeout(fn, delay);
+ };
+ this.listener = function(url) {
+ return url;
+ };
+ this.expectedUrl = location.href;
+}
+
+UrlWatcher.prototype = {
+ listen: function(fn){
+ this.listener = fn;
+ },
+ watch: function() {
+ var self = this;
+ var pull = function() {
+ if (self.expectedUrl !== self.location.href) {
+ var notify = self.location.hash.match(/^#\$iframe_notify=(.*)$/);
+ if (notify) {
+ if (!self.expectedUrl.match(/#/)) {
+ self.expectedUrl += "#";
+ }
+ self.location.href = self.expectedUrl;
+ var id = '_iframe_notify_' + notify[1];
+ var notifyFn = angularCallbacks[id];
+ delete angularCallbacks[id];
+ try {
+ (notifyFn||noop)();
+ } catch (e) {
+ alert(e);
+ }
+ } else {
+ self.listener(self.location.href);
+ self.expectedUrl = self.location.href;
+ }
+ }
+ self.setTimeout(pull, self.delay);
+ };
+ pull();
+ },
+
+ set: function(url) {
+ var existingURL = this.location.href;
+ if (!existingURL.match(/#/))
+ existingURL += '#';
+ if (existingURL != url)
+ this.location.href = url;
+ this.existingURL = url;
+ },
+
+ get: function() {
+ return window.location.href;
+ }
+};
diff --git a/src/Users.js b/src/Users.js
deleted file mode 100644
index fb5845d3..00000000
--- a/src/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/Widgets.js b/src/Widgets.js
index 74f70f21..42b9e916 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -1,806 +1,137 @@
-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('');
-};
-
-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;
+function modelAccessor(scope, element) {
+ var expr = element.attr('name'),
+ farmatterName = element.attr('ng-format') || NOOP,
+ formatter = angularFormatter(farmatterName);
+ if (!expr) throw "Required field 'name' not found.";
+ if (!formatter) throw "Formatter named '" + farmatterName + "' not found.";
+ return {
+ get: function() {
+ return formatter['format'](scope.$eval(expr));
+ },
+ set: function(value) {
+ scope.$eval(expr + '=' + toJson(formatter['parse'](value)));
+ }
+ };
+}
+
+function compileValidator(expr) {
+ return new Parser(expr).validator()();
+}
+
+function valueAccessor(element) {
+ var validatorName = element.attr('ng-validate') || NOOP,
+ validator = compileValidator(validatorName),
+ required = element.attr('ng-required'),
+ lastError;
+ required = required || required == '';
+ if (!validator) throw "Validator named '" + validatorName + "' not found.";
+ function validate(value) {
+ var error = required && !trim(value) ? "Required" : validator.call(this, value);
+ if (error !== lastError) {
+ if (error) {
+ element.addClass(NG_VALIDATION_ERROR);
+ element.attr(NG_ERROR, error);
} 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);
+ element.removeClass(NG_VALIDATION_ERROR);
+ element.removeAttr(NG_ERROR);
}
+ lastError = error;
}
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" +
- "" +
- "
");
- 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 ='"+title+"
" +
- ""+msg+"
" +
- "loading....
';
-
-Status.prototype = {
- beginRequest: function () {
- if (this.requestCount === 0) {
- (this.loader = this.loader || this.body.append(Status.DOM).find("#ng-loading")).show();
}
- this.requestCount++;
- },
+ };
+}
+
+function noopAccessor() { return { get: noop, set: noop }; }
+
+var NG_ERROR = 'ng-error',
+ NG_VALIDATION_ERROR = 'ng-validation-error',
+ textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, ''),
+ buttonWidget = inputWidget('click', noopAccessor, noopAccessor, undefined),
+ INPUT_TYPE = {
+ 'text': textWidget,
+ 'textarea': textWidget,
+ 'hidden': textWidget,
+ 'password': textWidget,
+ 'button': buttonWidget,
+ 'submit': buttonWidget,
+ 'reset': buttonWidget,
+ 'image': buttonWidget,
+ 'checkbox': inputWidget('click', modelAccessor, checkedAccessor, false),
+ 'radio': inputWidget('click', modelAccessor, radioAccessor, undefined),
+ 'select-one': inputWidget('click', modelAccessor, valueAccessor, null),
+ 'select-multiple': inputWidget('click', modelAccessor, optionsAccessor, [])
+// 'file': fileWidget???
+ };
- endRequest: function () {
- this.requestCount--;
- if (this.requestCount === 0) {
- this.loader.hide("fold");
- }
- }
-};
+function inputWidget(events, modelAccessor, viewAccessor, initValue) {
+ return function(element) {
+ var scope = this,
+ model = modelAccessor(scope, element),
+ view = viewAccessor(element),
+ action = element.attr('ng-action') || '',
+ value = view.get() || copy(initValue);
+ if (isDefined(value)) model.set(value);
+ this.$eval(element.attr('ng-init')||'');
+ element.bind(events, function(){
+ model.set(view.get());
+ scope.$tryEval(action, element);
+ scope.$root.$eval();
+ // if we have no initValue than we are just a button,
+ // therefore we want to prevent default action
+ return isDefined(initValue);
+ });
+ scope.$watch(model.get, view.set);
+ };
+}
+
+function inputWidgetSelector(element){
+ return INPUT_TYPE[lowercase(element[0].type)] || noop;
+}
+
+angularWidget('INPUT', inputWidgetSelector);
+angularWidget('TEXTAREA', inputWidgetSelector);
+angularWidget('BUTTON', inputWidgetSelector);
+angularWidget('SELECT', function(element){
+ this.descend(true);
+ return inputWidgetSelector.call(this, element);
+});
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index d2b2ff9c..7798afa5 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -1,18 +1,18 @@
/**
* The MIT License
- *
+ *
* Copyright (c) 2010 Adam Abrons and Misko Hevery http://getangular.com
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,35 +22,58 @@
* THE SOFTWARE.
*/
(function(previousOnLoad){
- var filename = /(.*)\/angular-(.*).js/;
- var scripts = document.getElementsByTagName("script");
+ var filename = /(.*)\/angular-(.*).js(#(.*))?/;
+ var scripts = document.getElementsByTagName("SCRIPT");
var serverPath;
+ var config = {};
for(var j = 0; j < scripts.length; j++) {
var match = (scripts[j].src || "").match(filename);
if (match) {
serverPath = match[1];
+ parseConfig(match[4]);
+ }
+ }
+
+ function parseConfig(args) {
+ var keyValues = args.split('&'), keyValue, i = 0;
+ for (; i < keyValues.length; i++) {
+ keyValue = keyValues[i].split('=');
+ config[keyValue[0]] = keyValue[1] || true;
}
}
function addScript(file){
document.write('');
- };
+ }
addScript("/Angular.js");
- addScript("/API.js");
- addScript("/Binder.js");
- addScript("/ControlBar.js");
- addScript("/DataStore.js");
- addScript("/Filters.js");
- addScript("/Formatters.js");
addScript("/JSON.js");
- addScript("/Model.js");
+ addScript("/Compiler.js");
+ addScript("/Scope.js");
+ addScript("/jqlite.js");
addScript("/Parser.js");
addScript("/Resource.js");
- addScript("/Scope.js");
- addScript("/Server.js");
- addScript("/Users.js");
- addScript("/Validators.js");
- addScript("/Widgets.js");
+ addScript("/URLWatcher.js");
+
+ // Extension points
+ addScript("/apis.js");
+ addScript("/filters.js");
+ addScript("/formatters.js");
+ addScript("/validators.js");
+ addScript("/directives.js");
+ addScript("/markups.js");
+ addScript("/widgets.js");
+
+ if (config.autobind) {
+ window.onload = function(){
+ try {
+ if (previousOnLoad) previousOnLoad();
+ } catch(e) {}
+ var scope = angular.compile(window.document, config);
+ if (config.rootScope) window[config.rootScope] = scope;
+ scope.$init();
+ };
+ }
+
})(window.onload);
diff --git a/src/apis.js b/src/apis.js
new file mode 100644
index 00000000..e375e8fc
--- /dev/null
+++ b/src/apis.js
@@ -0,0 +1,328 @@
+var angularGlobal = {
+ 'typeOf':function(obj){
+ if (obj === null) return "null";
+ var type = typeof obj;
+ if (type == "object") {
+ if (obj instanceof Array) return "array";
+ if (obj instanceof Date) return "date";
+ if (obj.nodeType == 1) return "element";
+ }
+ return type;
+ }
+};
+
+var angularCollection = {};
+var angularObject = {};
+var angularArray = {
+ '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;
+ for (var i = 0; i < array.length; i++) {
+ var value = 1 * fn(array[i]);
+ if (!isNaN(value)){
+ sum += value;
+ }
+ }
+ return sum;
+ },
+ 'remove':function(array, value) {
+ var index = _.indexOf(array, value);
+ if (index >=0)
+ array.splice(index, 1);
+ return value;
+ },
+ 'find':function(array, condition, defaultValue) {
+ if (!condition) return undefined;
+ var fn = angular['Function']['compile'](condition);
+ _.detect(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) {
+ for (var j = 0; j < predicates.length; j++) {
+ if(!predicates[j](value)) {
+ return false;
+ }
+ }
+ return true;
+ };
+ var getter = Scope.getter;
+ var search = function(obj, text){
+ if (text.charAt(0) === '!') {
+ return !search(obj, text.substr(1));
+ }
+ switch (typeof obj) {
+ case "boolean":
+ case "number":
+ case "string":
+ return ('' + obj).toLowerCase().indexOf(text) > -1;
+ case "object":
+ for ( var objKey in obj) {
+ if (objKey.charAt(0) !== '$' && search(obj[objKey], text)) {
+ return true;
+ }
+ }
+ return false;
+ case "array":
+ for ( var i = 0; i < obj.length; i++) {
+ if (search(obj[i], text)) {
+ return true;
+ }
+ }
+ return false;
+ default:
+ return false;
+ }
+ };
+ switch (typeof expression) {
+ case "boolean":
+ case "number":
+ case "string":
+ expression = {$:expression};
+ case "object":
+ for (var key in expression) {
+ if (key == '$') {
+ (function(){
+ var text = (''+expression[key]).toLowerCase();
+ if (!text) return;
+ predicates.push(function(value) {
+ return search(value, text);
+ });
+ })();
+ } else {
+ (function(){
+ var path = key;
+ var text = (''+expression[key]).toLowerCase();
+ if (!text) return;
+ predicates.push(function(value) {
+ return search(getter(value, path), text);
+ });
+ })();
+ }
+ }
+ break;
+ case "function":
+ predicates.push(expression);
+ break;
+ default:
+ return array;
+ }
+ var filtered = [];
+ for ( var j = 0; j < array.length; j++) {
+ var value = array[j];
+ if (predicates.check(value)) {
+ filtered.push(value);
+ }
+ }
+ return filtered;
+ },
+ 'add':function(array, value) {
+ array.push(_.isUndefined(value)? {} : value);
+ return array;
+ },
+ 'count':function(array, condition) {
+ if (!condition) return array.length;
+ var fn = angular['Function']['compile'](condition);
+ return _.reduce(array, 0, function(count, $){return count + (fn($)?1:0);});
+ },
+ 'orderBy':function(array, expression, descend) {
+ function reverse(comp, descending) {
+ return toBoolean(descending) ?
+ function(a,b){return comp(b,a);} : comp;
+ }
+ function compare(v1, v2){
+ var t1 = typeof v1;
+ var t2 = typeof v2;
+ if (t1 == t2) {
+ if (t1 == "string") v1 = v1.toLowerCase();
+ if (t1 == "string") v2 = v2.toLowerCase();
+ if (v1 === v2) return 0;
+ return v1 < v2 ? -1 : 1;
+ } else {
+ return t1 < t2 ? -1 : 1;
+ }
+ }
+ expression = _.isArray(expression) ? expression: [expression];
+ expression = _.map(expression, function($){
+ var descending = false;
+ if (typeof $ == "string" && ($.charAt(0) == '+' || $.charAt(0) == '-')) {
+ descending = $.charAt(0) == '-';
+ $ = $.substring(1);
+ }
+ var get = $ ? angular['Function']['compile']($) : _.identity;
+ return reverse(function(a,b){
+ return compare(get(a),get(b));
+ }, descending);
+ });
+ var comparator = function(o1, o2){
+ for ( var i = 0; i < expression.length; i++) {
+ var comp = expression[i](o1, o2);
+ if (comp !== 0) return comp;
+ }
+ return 0;
+ };
+ return _.clone(array).sort(reverse(comparator, descend));
+ },
+ 'orderByToggle':function(predicate, attribute) {
+ var STRIP = /^([+|-])?(.*)/;
+ var ascending = false;
+ var index = -1;
+ _.detect(predicate, function($, i){
+ 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;
+ }
+};
+
+var angularString = {
+ 'quote':function(string) {
+ return '"' + string.replace(/\\/g, '\\\\').
+ replace(/"/g, '\\"').
+ replace(/\n/g, '\\n').
+ replace(/\f/g, '\\f').
+ replace(/\r/g, '\\r').
+ replace(/\t/g, '\\t').
+ replace(/\v/g, '\\v') +
+ '"';
+ },
+ 'quoteUnicode':function(string) {
+ var str = angular['String']['quote'](string);
+ var chars = [];
+ for ( var i = 0; i < str.length; i++) {
+ var ch = str.charCodeAt(i);
+ if (ch < 128) {
+ chars.push(str.charAt(i));
+ } else {
+ var encode = "000" + ch.toString(16);
+ chars.push("\\u" + encode.substring(encode.length - 4));
+ }
+ }
+ return chars.join('');
+ },
+ 'toDate':function(string){
+ var match;
+ if (typeof string == 'string' &&
+ (match = string.match(/^(\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)Z$/))){
+ var date = new Date(0);
+ date.setUTCFullYear(match[1], match[2] - 1, match[3]);
+ date.setUTCHours(match[4], match[5], match[6], 0);
+ return date;
+ }
+ return string;
+ }
+};
+
+var angularDate = {
+ 'toString':function(date){
+ function pad(n) { return n < 10 ? "0" + n : n; }
+ return !date ? date :
+ date.getUTCFullYear() + '-' +
+ pad(date.getUTCMonth() + 1) + '-' +
+ pad(date.getUTCDate()) + 'T' +
+ pad(date.getUTCHours()) + ':' +
+ pad(date.getUTCMinutes()) + ':' +
+ pad(date.getUTCSeconds()) + 'Z' ;
+ }
+ };
+
+var angularFunction = {
+ 'compile':function(expression) {
+ if (_.isFunction(expression)){
+ return expression;
+ } else if (expression){
+ var scope = new Scope();
+ return function($) {
+ scope.state = $;
+ return scope.eval(expression);
+ };
+ } else {
+ return function($){return $;};
+ }
+ }
+};
+
+function defineApi(dst, chain, underscoreNames){
+ if (_) {
+ var lastChain = _.last(chain);
+ foreach(underscoreNames, function(name){
+ lastChain[name] = _[name];
+ });
+ }
+ angular[dst] = angular[dst] || {};
+ foreach(chain, function(parent){
+ extend(angular[dst], parent);
+ });
+}
+defineApi('Global', [angularGlobal],
+ ['extend', 'clone','isEqual',
+ 'isElement', 'isArray', 'isFunction', 'isUndefined']);
+defineApi('Collection', [angularGlobal, angularCollection],
+ ['each', 'map', 'reduce', 'reduceRight', 'detect',
+ 'select', 'reject', 'all', 'any', 'include',
+ 'invoke', 'pluck', 'max', 'min', 'sortBy',
+ 'sortedIndex', 'toArray', 'size']);
+defineApi('Array', [angularGlobal, angularCollection, angularArray],
+ ['first', 'last', 'compact', 'flatten', 'without',
+ 'uniq', 'intersect', 'zip', 'indexOf', 'lastIndexOf']);
+defineApi('Object', [angularGlobal, angularCollection, angularObject],
+ ['keys', 'values']);
+defineApi('String', [angularGlobal, angularString], []);
+defineApi('Date', [angularGlobal, angularDate], []);
+//IE bug
+angular['Date']['toString'] = angularDate['toString'];
+defineApi('Function', [angularGlobal, angularCollection, angularFunction],
+ ['bind', 'bindAll', 'delay', 'defer', 'wrap', 'compose']);
diff --git a/src/delete/Binder.js b/src/delete/Binder.js
new file mode 100644
index 00000000..9fc32513
--- /dev/null
+++ b/src/delete/Binder.js
@@ -0,0 +1,356 @@
+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 = ' ' + 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('').append(jQuery(node).clone()).html();
+ if (!html.match(/" +
+ "" +
+ "
");
+ 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 ='"+title+"
" +
+ ""+msg+"
" +
+ "loading....
';
+
+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 10476c77..c54c89e9 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -11,9 +11,15 @@ angularDirective("ng-eval", function(expression){
});
angularDirective("ng-bind", function(expression){
+ var templateFn = compileBindTemplate("{{" + expression + "}}");
return function(element) {
- this.$watch(expression, function(value){
- element.text(value);
+ var lastValue;
+ this.$onEval(function() {
+ var value = templateFn.call(this);
+ if (value != lastValue) {
+ element.text(value);
+ lastValue = value;
+ }
}, element);
};
});
@@ -34,7 +40,9 @@ function compileBindTemplate(template){
bindTemplateCache[template] = fn = function(){
var parts = [], self = this;
foreach(bindings, function(fn){
- parts.push(fn.call(self));
+ var value = fn.call(self);
+ if (isObject(value)) value = toJson(value, true);
+ parts.push(value);
});
return parts.join('');
};
@@ -125,6 +133,7 @@ angularDirective("ng-action", function(expression, element){
var self = this;
element.click(function(){
self.$tryEval(expression, element);
+ self.$eval();
});
};
});
diff --git a/src/jqLite.js b/src/jqLite.js
index 7646bf98..a5014354 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -38,7 +38,8 @@ function JQLite(element) {
this[0] = element;
}
-function jqLite(element) {
+
+function jqLiteWrap(element) {
if (typeof element == 'string') {
var div = document.createElement('div');
div.innerHTML = element;
@@ -47,6 +48,8 @@ function jqLite(element) {
return element instanceof JQLite ? element : new JQLite(element);
}
+jqLite = jqLite || jqLiteWrap;
+
JQLite.prototype = {
data: function(key, value) {
var element = this[0],
@@ -85,12 +88,15 @@ JQLite.prototype = {
foreach(type.split(' '), function(type){
eventHandler = bind[type];
if (!eventHandler) {
- bind[type] = eventHandler = function() {
- var value = false;
+ bind[type] = eventHandler = function(event) {
+ var bubbleEvent = false;
foreach(eventHandler.fns, function(fn){
- value = value || fn.apply(self, arguments);
+ bubbleEvent = bubbleEvent || fn.apply(self, arguments);
});
- return value;
+ if (!bubbleEvent) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
};
eventHandler.fns = [];
addEventListener(element, type, eventHandler);
diff --git a/src/markup.js b/src/markup.js
deleted file mode 100644
index 5fb10779..00000000
--- a/src/markup.js
+++ /dev/null
@@ -1,76 +0,0 @@
-function parseBindings(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;
-};
-
-function binding(string) {
- var binding = string.replace(/\n/gm, ' ').match(/^\{\{(.*)\}\}$/);
- return binding ? binding[1] : null;
-};
-
-function hasBindings(bindings) {
- return bindings.length > 1 || Binder.binding(bindings[0]) !== null;
-};
-
-angularTextMarkup('{{}}', function(text, textNode, parentElement) {
- var bindings = parseBindings(text),
- self = this;
- if (hasBindings(bindings)) {
- if (isLeafNode(parentElement[0])) {
- parentElement.attr('ng-bind-template', text);
- } else {
- var cursor = textNode, newElement;
- foreach(parseBindings(text), function(text){
- var exp = binding(text);
- if (exp) {
- newElement = self.element('span');
- newElement.attr('ng-bind', exp);
- } else {
- newElement = self.text(text);
- }
- cursor.after(newElement);
- cursor = newElement;
- });
- }
- textNode.remove();
- }
-});
-
-angularTextMarkup('OPTION', function(text, textNode, parentElement){
- if (parentElement[0].nodeName == "OPTION") {
- var select = document.createElement('select');
- select.insertBefore(parentElement[0].cloneNode(true), null);
- if (!select.innerHTML.match(/' +
+ '' +
+ '
';
+
+
+ControlBar.FORBIDEN =
+ '' +
+ '' +
+ '
' +
+ '' +
+ 'Sorry, you do not have permission for this!'+
+ '
';
+
+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('');
+ this._document.append(loginView);
+ loginView['dialog']({
+ 'height':iframeHeight + 33, 'width':500,
+ 'resizable': false, 'modal':true,
+ 'title': 'Authentication: <angular/>'
+ });
+ 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
new file mode 100644
index 00000000..70bcc623
--- /dev/null
+++ b/src/moveToAngularCom/DataStore.js
@@ -0,0 +1,330 @@
+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/Model.js b/src/moveToAngularCom/Model.js
new file mode 100644
index 00000000..b09efd0e
--- /dev/null
+++ b/src/moveToAngularCom/Model.js
@@ -0,0 +1,65 @@
+// 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/moveToAngularCom/Server.js b/src/moveToAngularCom/Server.js
new file mode 100644
index 00000000..5c4ec3c6
--- /dev/null
+++ b/src/moveToAngularCom/Server.js
@@ -0,0 +1,68 @@
+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
new file mode 100644
index 00000000..fb5845d3
--- /dev/null
+++ b/src/moveToAngularCom/Users.js
@@ -0,0 +1,35 @@
+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/widgets2.js b/src/widgets2.js
deleted file mode 100644
index 04045426..00000000
--- a/src/widgets2.js
+++ /dev/null
@@ -1,129 +0,0 @@
-function modelAccessor(scope, element) {
- var expr = element.attr('name'),
- farmatterName = element.attr('ng-format') || NOOP,
- formatter = angularFormatter(farmatterName);
- if (!expr) throw "Required field 'name' not found.";
- if (!formatter) throw "Formatter named '" + farmatterName + "' not found.";
- return {
- get: function() {
- return formatter['format'](scope.$eval(expr));
- },
- set: function(value) {
- scope.$eval(expr + '=' + toJson(formatter['parse'](value)));
- }
- };
-}
-
-function valueAccessor(element) {
- var validatorName = element.attr('ng-validate') || NOOP,
- validator = angularValidator(validatorName),
- required = element.attr('ng-required'),
- lastError;
- required = required || required == '';
- if (!validator) throw "Validator named '" + validatorName + "' not found.";
- function validate(value) {
- var error = required && !trim(value) ? "Required" : validator(value);
- if (error !== lastError) {
- if (error) {
- element.addClass(NG_VALIDATION_ERROR);
- element.attr(NG_ERROR, error);
- } else {
- element.removeClass(NG_VALIDATION_ERROR);
- element.removeAttr(NG_ERROR);
- }
- lastError = error;
- }
- return value;
- }
- return {
- get: function(){ return validate(element.val()); },
- set: function(value){ element.val(validate(value)); }
- };
-}
-
-function checkedAccessor(element) {
- var domElement = element[0];
- return {
- get: function(){ return !!domElement.checked; },
- set: function(value){ domElement.checked = !!value; }
- };
-}
-
-function radioAccessor(element) {
- var domElement = element[0];
- return {
- get: function(){ return domElement.checked ? domElement.value : null; },
- set: function(value){ domElement.checked = value == domElement.value; }
- };
-}
-
-function optionsAccessor(element) {
- var options = element[0].options;
- return {
- get: function(){
- var values = [];
- foreach(options, function(option){
- if (option.selected) values.push(option.value);
- });
- return values;
- },
- set: function(values){
- var keys = {};
- foreach(values, function(value){ keys[value] = true; });
- foreach(options, function(option){
- option.selected = keys[option.value];
- });
- }
- };
-}
-
-function noopAccessor() { return { get: noop, set: noop }; }
-
-var NG_ERROR = 'ng-error',
- NG_VALIDATION_ERROR = 'ng-validation-error',
- textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, ''),
- buttonWidget = inputWidget('click', noopAccessor, noopAccessor, undefined),
- INPUT_TYPE = {
- 'text': textWidget,
- 'textarea': textWidget,
- 'hidden': textWidget,
- 'password': textWidget,
- 'button': buttonWidget,
- 'submit': buttonWidget,
- 'reset': buttonWidget,
- 'image': buttonWidget,
- 'checkbox': inputWidget('click', modelAccessor, checkedAccessor, false),
- 'radio': inputWidget('click', modelAccessor, radioAccessor, undefined),
- 'select-one': inputWidget('click', modelAccessor, valueAccessor, null),
- 'select-multiple': inputWidget('click', modelAccessor, optionsAccessor, [])
-// 'file': fileWidget???
- };
-
-function inputWidget(events, modelAccessor, viewAccessor, initValue) {
- return function(element) {
- var scope = this,
- model = modelAccessor(scope, element),
- view = viewAccessor(element),
- action = element.attr('ng-action') || '',
- value = view.get() || copy(initValue);
- if (isDefined(value)) model.set(value);
- this.$eval(element.attr('ng-init')||'');
- element.bind(events, function(){
- model.set(view.get());
- scope.$tryEval(action, element);
- });
- scope.$watch(model.get, view.set);
- };
-}
-
-function inputWidgetSelector(element){
- return INPUT_TYPE[lowercase(element[0].type)] || noop;
-}
-
-angularWidget('INPUT', inputWidgetSelector);
-angularWidget('TEXTAREA', inputWidgetSelector);
-angularWidget('BUTTON', inputWidgetSelector);
-angularWidget('SELECT', function(element){
- this.descend(true);
- return inputWidgetSelector.call(this, element);
-});
--
cgit v1.2.3
From c655b884e268c8c9b6853d440143953f51b7e7de Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 29 Mar 2010 10:40:57 -0700
Subject: tests broken, but bootstrap works
---
src/angular.prefix | 10 +++++-----
src/angular.suffix | 2 +-
src/directivesAngularCom.js | 29 ----------------------------
src/moveToAngularCom/directivesAngularCom.js | 29 ++++++++++++++++++++++++++++
4 files changed, 35 insertions(+), 35 deletions(-)
delete mode 100644 src/directivesAngularCom.js
create mode 100644 src/moveToAngularCom/directivesAngularCom.js
(limited to 'src')
diff --git a/src/angular.prefix b/src/angular.prefix
index 26a8429f..0552b2ed 100644
--- a/src/angular.prefix
+++ b/src/angular.prefix
@@ -1,18 +1,18 @@
/**
* The MIT License
- *
+ *
* Copyright (c) 2010 Adam Abrons and Misko Hevery http://getangular.com
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,4 +21,4 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-(function(window, document){
+(function(window, document, onLoadDelegate){
diff --git a/src/angular.suffix b/src/angular.suffix
index 4b3cc37b..c5754df2 100644
--- a/src/angular.suffix
+++ b/src/angular.suffix
@@ -1 +1 @@
-})(window, document);
\ No newline at end of file
+})(window, document, window.onload);
diff --git a/src/directivesAngularCom.js b/src/directivesAngularCom.js
deleted file mode 100644
index 84032bdd..00000000
--- a/src/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/moveToAngularCom/directivesAngularCom.js b/src/moveToAngularCom/directivesAngularCom.js
new file mode 100644
index 00000000..84032bdd
--- /dev/null
+++ b/src/moveToAngularCom/directivesAngularCom.js
@@ -0,0 +1,29 @@
+
+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]);
+ });
+ };
+});
+
+
--
cgit v1.2.3
From e55c97debaa0ef8487ece219b6eadbc147ece1f9 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 29 Mar 2010 20:25:42 -0700
Subject: dissabled a lot of tests, and made the core test set pass.
---
src/Angular.js | 80 ++++++++++++++++++++++++++++++++++++++++++-------------
src/Compiler.js | 12 ++++++---
src/Formatters.js | 4 +--
src/Parser.js | 12 ++++-----
src/Resource.js | 8 +++---
src/Scope.js | 1 +
src/Validators.js | 4 +--
src/Widgets.js | 28 ++++++++++++-------
src/apis.js | 62 +++++++++++++++++++++++-------------------
src/jqLite.js | 15 +----------
10 files changed, 138 insertions(+), 88 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index c3562e84..12293ddb 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -1,25 +1,13 @@
if (typeof document.getAttribute == 'undefined')
document.getAttribute = function() {};
-function noop() {}
-function identity($) {return $;}
if (!window['console']) window['console']={'log':noop, 'error':noop};
-function extensionMap(angular, name) {
- var extPoint;
- return angular[name] || (extPoint = angular[name] = function (name, fn, prop){
- if (isDefined(fn)) {
- extPoint[name] = extend(fn, prop || {});
- }
- return extPoint[name];
- });
-}
-
var consoleNode,
NOOP = 'noop',
jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
_ = window['_'],
- jqLite = jQuery,
+ jqLite = jQuery || jqLiteWrap,
slice = Array.prototype.slice,
angular = window['angular'] || (window['angular'] = {}),
angularTextMarkup = extensionMap(angular, 'textMarkup'),
@@ -44,7 +32,7 @@ function foreach(obj, iterator, context) {
if (obj) {
if (obj.forEach) {
obj.forEach(iterator, context);
- } else if (obj instanceof Array) {
+ } else if (isObject(obj) && isNumber(obj.length)) {
for (key = 0; key < obj.length; key++)
iterator.call(context, obj[key], key);
} else {
@@ -55,22 +43,66 @@ function foreach(obj, iterator, context) {
return obj;
}
-function extend(dst, obj) {
- foreach(obj, function(value, key){
- dst[key] = value;
+function extend(dst) {
+ foreach(arguments, function(obj){
+ if (obj !== dst) {
+ foreach(obj, function(value, key){
+ dst[key] = value;
+ });
+ }
});
return dst;
}
+function noop() {}
+function identity($) {return $;}
+function extensionMap(angular, name) {
+ var extPoint;
+ return angular[name] || (extPoint = angular[name] = function (name, fn, prop){
+ if (isDefined(fn)) {
+ extPoint[name] = extend(fn, prop || {});
+ }
+ return extPoint[name];
+ });
+}
+
+function jqLiteWrap(element) {
+ if (typeof element == 'string') {
+ var div = document.createElement('div');
+ div.innerHTML = element;
+ element = div.childNodes[0];
+ }
+ return element instanceof JQLite ? element : new JQLite(element);
+}
function isUndefined(value){ return typeof value == 'undefined'; }
function isDefined(value){ return typeof value != 'undefined'; }
function isObject(value){ return typeof value == 'object';}
function isString(value){ return typeof value == 'string';}
+function isNumber(value){ return typeof value == 'number';}
function isArray(value) { return value instanceof Array; }
function isFunction(value){ return typeof value == 'function';}
function lowercase(value){ return isString(value) ? value.toLowerCase() : value; }
function uppercase(value){ return isString(value) ? value.toUpperCase() : value; }
function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; };
+function map(obj, iterator, context) {
+ var results = [];
+ foreach(obj, function(value, index, list) {
+ results.push(iterator.call(context, value, index, list));
+ });
+ return results;
+};
+function size(obj) {
+ var size = 0;
+ if (obj) {
+ if (isNumber(obj.length)) {
+ return obj.length;
+ } else if (isObject(obj)){
+ for (key in obj)
+ size++;
+ }
+ }
+ return size;
+}
function includes(array, obj) {
for ( var i = 0; i < array.length; i++) {
if (obj === array[i]) return true;
@@ -78,6 +110,13 @@ function includes(array, obj) {
return false;
}
+function indexOf(array, obj) {
+ for ( var i = 0; i < array.length; i++) {
+ if (obj === array[i]) return i;
+ }
+ return -1;
+}
+
function log(a, b, c){
var console = window['console'];
switch(arguments.length) {
@@ -157,11 +196,14 @@ function copy(source, destination){
destination.pop();
}
} else {
- foreach(function(value, key){
+ foreach(destination, function(value, key){
delete destination[key];
});
}
- return $.extend(true, destination, source);
+ foreach(source, function(value, key){
+ destination[key] = isArray(value) ? copy(value, []) : (isObject(value) ? copy(value, {}) : value);
+ });
+ return destination;
}
};
diff --git a/src/Compiler.js b/src/Compiler.js
index 4f30521b..923f7b2f 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -73,11 +73,12 @@ function eachNode(element, fn){
}
function eachAttribute(element, fn){
- var i, attrs = element[0].attributes || [], size = attrs.length, chld, attr;
+ var i, attrs = element[0].attributes || [], size = attrs.length, chld, attr, attrValue = {};
for (i = 0; i < size; i++) {
var attr = attrs[i];
- fn(attr.name, attr.value);
+ attrValue[attr.name] = attr.value;
}
+ foreach(attrValue, fn);
}
function Compiler(textMarkup, attrMarkup, directives, widgets){
@@ -92,12 +93,15 @@ Compiler.prototype = {
rawElement = jqLite(rawElement);
var template = this.templatize(rawElement) || new Template();
return function(element, parentScope){
+ parentScope = parentScope || {};
var scope = createScope(parentScope);
+ parentScope.$root = parentScope.$root || scope;
return extend(scope, {
$element:element,
$init: function() {
template.init(element, scope);
scope.$eval();
+ return scope;
}
});
};
@@ -132,12 +136,12 @@ Compiler.prototype = {
});
// Process attributes/directives
- eachAttribute(element, function(name, value){
+ eachAttribute(element, function(value, name){
foreach(self.attrMarkup, function(markup){
markup.call(selfApi, value, name, element);
});
});
- eachAttribute(element, function(name, value){
+ eachAttribute(element, function(value, name){
var directive = directives[name];
if (!exclusive && directive) {
if (directive.exclusive) {
diff --git a/src/Formatters.js b/src/Formatters.js
index f2d5d33e..402e8a2b 100644
--- a/src/Formatters.js
+++ b/src/Formatters.js
@@ -9,7 +9,7 @@ extend(angularFormatter, {
function(obj) { return obj ? obj.join(", ") : obj; },
function(value) {
var list = [];
- foreach(value.split(','), function(item){
+ foreach((value || '').split(','), function(item){
item = trim(item);
if (item) list.push(item);
});
@@ -18,6 +18,6 @@ extend(angularFormatter, {
),
'trim':formater(
- function(obj) { return obj ? $.trim("" + obj) : ""; }
+ function(obj) { return obj ? trim("" + obj) : ""; }
)
});
diff --git a/src/Parser.js b/src/Parser.js
index 81a2afdc..ef1465a0 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -558,14 +558,14 @@ Parser.prototype = {
}
var statements = this.statements();
this.consume("}");
- return function(self){
+ return function(self) {
return function($){
- var scope = new Scope(self.scope.state);
- scope.set('$', $);
+ var scope = createScope(self.state);
+ scope['$'] = $;
for ( var i = 0; i < args.length; i++) {
- scope.set(args[i], arguments[i]);
+ scope.$set(args[i], arguments[i]);
}
- return statements({scope:scope});
+ return statements({scope:{get:scope.$get, set:scope.$set}});
};
};
},
@@ -573,7 +573,7 @@ Parser.prototype = {
fieldAccess: function(object) {
var field = this.expect().text;
var fn = function (self){
- return Scope.getter(object(self), field);
+ return getter(object(self), field);
};
fn.isAssignable = field;
return fn;
diff --git a/src/Resource.js b/src/Resource.js
index 971ad6e5..27ce8aa9 100644
--- a/src/Resource.js
+++ b/src/Resource.js
@@ -46,11 +46,11 @@ ResourceFactory.prototype = {
route: function(url, paramDefaults, actions){
var self = this;
var route = new Route(url);
- actions = $.extend({}, ResourceFactory.DEFAULT_ACTIONS, actions);
+ actions = extend({}, ResourceFactory.DEFAULT_ACTIONS, actions);
function extractParams(data){
var ids = {};
foreach(paramDefaults || {}, function(value, key){
- ids[key] = value.charAt && value.charAt(0) == '@' ? Scope.getter(data, value.substr(1)) : value;
+ ids[key] = value.charAt && value.charAt(0) == '@' ? getter(data, value.substr(1)) : value;
});
return ids;
}
@@ -83,7 +83,7 @@ ResourceFactory.prototype = {
}
var value = action.isArray ? [] : new Resource(data);
- self.xhr(action.method, route.url($.extend({}, action.params || {}, extractParams(data), params)), data, function(response) {
+ self.xhr(action.method, route.url(extend({}, action.params || {}, extractParams(data), params)), data, function(response) {
if (action.isArray) {
foreach(response, function(item){
value.push(new Resource(item));
@@ -97,7 +97,7 @@ ResourceFactory.prototype = {
};
Resource.bind = function(additionalParamDefaults){
- return self.route(url, $.extend({}, paramDefaults, additionalParamDefaults), actions);
+ return self.route(url, extend({}, paramDefaults, additionalParamDefaults), actions);
};
if (!isGet) {
diff --git a/src/Scope.js b/src/Scope.js
index 6ba6aa8e..3e225653 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -61,6 +61,7 @@ function expressionCompile(exp){
function parserNewScopeAdapter(fn) {
return function(){
return fn({
+ state: this,
scope: {
set: this.$set,
get: this.$get
diff --git a/src/Validators.js b/src/Validators.js
index cdff5e1a..662145c0 100644
--- a/src/Validators.js
+++ b/src/Validators.js
@@ -91,12 +91,12 @@ foreach({
obj[lastKey] = text;
if (state === undefined) {
// we have never seen this before, Request it
- jQuery(obj).addClass('ng-input-indicator-wait');
+ jqLite(obj).addClass('ng-input-indicator-wait');
state = stateCache[text] = null;
asynchronousFn(text, function(error){
state = stateCache[text] = error ? error : false;
if (stateCache[obj[lastKey]] !== null) {
- jQuery(obj).removeClass('ng-input-indicator-wait');
+ jqLite(obj).removeClass('ng-input-indicator-wait');
}
updateView();
});
diff --git a/src/Widgets.js b/src/Widgets.js
index 42b9e916..b5222ac7 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -18,7 +18,7 @@ function compileValidator(expr) {
return new Parser(expr).validator()();
}
-function valueAccessor(element) {
+function valueAccessor(scope, element) {
var validatorName = element.attr('ng-validate') || NOOP,
validator = compileValidator(validatorName),
required = element.attr('ng-required'),
@@ -26,7 +26,7 @@ function valueAccessor(element) {
required = required || required == '';
if (!validator) throw "Validator named '" + validatorName + "' not found.";
function validate(value) {
- var error = required && !trim(value) ? "Required" : validator.call(this, value);
+ var error = required && !trim(value) ? "Required" : validator({self:scope, scope:{get:scope.$get, set:scope.$set}}, value);
if (error !== lastError) {
if (error) {
element.addClass(NG_VALIDATION_ERROR);
@@ -45,23 +45,31 @@ function valueAccessor(element) {
};
}
-function checkedAccessor(element) {
+function checkedAccessor(scope, element) {
var domElement = element[0];
return {
- get: function(){ return !!domElement.checked; },
- set: function(value){ domElement.checked = !!value; }
+ get: function(){
+ return !!domElement.checked;
+ },
+ set: function(value){
+ domElement.checked = !!value;
+ }
};
}
-function radioAccessor(element) {
+function radioAccessor(scope, element) {
var domElement = element[0];
return {
- get: function(){ return domElement.checked ? domElement.value : null; },
- set: function(value){ domElement.checked = value == domElement.value; }
+ get: function(){
+ return domElement.checked ? domElement.value : null;
+ },
+ set: function(value){
+ domElement.checked = value == domElement.value;
+ }
};
}
-function optionsAccessor(element) {
+function optionsAccessor(scope, element) {
var options = element[0].options;
return {
get: function(){
@@ -107,7 +115,7 @@ function inputWidget(events, modelAccessor, viewAccessor, initValue) {
return function(element) {
var scope = this,
model = modelAccessor(scope, element),
- view = viewAccessor(element),
+ view = viewAccessor(scope, element),
action = element.attr('ng-action') || '',
value = view.get() || copy(initValue);
if (isDefined(value)) model.set(value);
diff --git a/src/apis.js b/src/apis.js
index e375e8fc..3d0c5db3 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -11,11 +11,15 @@ var angularGlobal = {
}
};
-var angularCollection = {};
+var angularCollection = {
+ 'size': size
+};
var angularObject = {};
var angularArray = {
+ 'indexOf': indexOf,
+ 'include': includes,
'includeIf':function(array, value, condition) {
- var index = _.indexOf(array, value);
+ var index = indexOf(array, value);
if (condition) {
if (index == -1)
array.push(value);
@@ -36,7 +40,7 @@ var angularArray = {
return sum;
},
'remove':function(array, value) {
- var index = _.indexOf(array, value);
+ var index = indexOf(array, value);
if (index >=0)
array.splice(index, 1);
return value;
@@ -44,7 +48,7 @@ var angularArray = {
'find':function(array, condition, defaultValue) {
if (!condition) return undefined;
var fn = angular['Function']['compile'](condition);
- _.detect(array, function($){
+ foreach(array, function($){
if (fn($)){
defaultValue = $;
return true;
@@ -65,7 +69,6 @@ var angularArray = {
}
return true;
};
- var getter = Scope.getter;
var search = function(obj, text){
if (text.charAt(0) === '!') {
return !search(obj, text.substr(1));
@@ -136,13 +139,18 @@ var angularArray = {
return filtered;
},
'add':function(array, value) {
- array.push(_.isUndefined(value)? {} : value);
+ array.push(isUndefined(value)? {} : value);
return array;
},
'count':function(array, condition) {
if (!condition) return array.length;
- var fn = angular['Function']['compile'](condition);
- return _.reduce(array, 0, function(count, $){return count + (fn($)?1:0);});
+ var fn = angular['Function']['compile'](condition), count = 0;
+ foreach(array, function(value){
+ if (fn(value)) {
+ count ++;
+ }
+ });
+ return count;
},
'orderBy':function(array, expression, descend) {
function reverse(comp, descending) {
@@ -161,14 +169,14 @@ var angularArray = {
return t1 < t2 ? -1 : 1;
}
}
- expression = _.isArray(expression) ? expression: [expression];
- expression = _.map(expression, function($){
+ expression = isArray(expression) ? expression: [expression];
+ expression = map(expression, function($){
var descending = false;
if (typeof $ == "string" && ($.charAt(0) == '+' || $.charAt(0) == '-')) {
descending = $.charAt(0) == '-';
$ = $.substring(1);
}
- var get = $ ? angular['Function']['compile']($) : _.identity;
+ var get = $ ? angular['Function']['compile']($) : identity;
return reverse(function(a,b){
return compare(get(a),get(b));
}, descending);
@@ -180,22 +188,24 @@ var angularArray = {
}
return 0;
};
- return _.clone(array).sort(reverse(comparator, descend));
+ return copy(array).sort(reverse(comparator, descend));
},
'orderByToggle':function(predicate, attribute) {
var STRIP = /^([+|-])?(.*)/;
var ascending = false;
var index = -1;
- _.detect(predicate, function($, i){
- if ($ == attribute) {
- ascending = true;
- index = i;
- return true;
- }
- if (($.charAt(0)=='+'||$.charAt(0)=='-') && $.substring(1) == attribute) {
- ascending = $.charAt(0) == '+';
- index = i;
- return true;
+ 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) {
@@ -281,16 +291,14 @@ var angularDate = {
var angularFunction = {
'compile':function(expression) {
- if (_.isFunction(expression)){
+ if (isFunction(expression)){
return expression;
} else if (expression){
- var scope = new Scope();
return function($) {
- scope.state = $;
- return scope.eval(expression);
+ return createScope($).$eval(expression);
};
} else {
- return function($){return $;};
+ return identity;
}
}
};
diff --git a/src/jqLite.js b/src/jqLite.js
index a5014354..449854d5 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -1,5 +1,4 @@
-
-///////////////////////////////////
+//////////////////////////////////
//JQLite
//////////////////////////////////
@@ -38,18 +37,6 @@ function JQLite(element) {
this[0] = element;
}
-
-function jqLiteWrap(element) {
- if (typeof element == 'string') {
- var div = document.createElement('div');
- div.innerHTML = element;
- element = div.childNodes[0];
- }
- return element instanceof JQLite ? element : new JQLite(element);
-}
-
-jqLite = jqLite || jqLiteWrap;
-
JQLite.prototype = {
data: function(key, value) {
var element = this[0],
--
cgit v1.2.3
From cc6def854f2c77d0a7fea177df0dca858b8cd943 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 29 Mar 2010 21:36:34 -0700
Subject: reenabled more tests
---
src/Angular.js | 10 ++++++++++
src/Compiler.js | 1 +
src/Validators.js | 31 ++++++++++++++++---------------
src/Widgets.js | 8 +-------
4 files changed, 28 insertions(+), 22 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 12293ddb..e49eb9a9 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -228,6 +228,16 @@ function escapeHtml(html) {
replace(/>/g, '>');
}
+function elementDecorateError(element, error) {
+ if (error) {
+ element.addClass(NG_VALIDATION_ERROR);
+ element.attr(NG_ERROR, error);
+ } else {
+ element.removeClass(NG_VALIDATION_ERROR);
+ element.removeAttr(NG_ERROR);
+ }
+}
+
function escapeAttr(html) {
if (!html || !html.replace)
return html;
diff --git a/src/Compiler.js b/src/Compiler.js
index 923f7b2f..e97fb112 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -93,6 +93,7 @@ Compiler.prototype = {
rawElement = jqLite(rawElement);
var template = this.templatize(rawElement) || new Template();
return function(element, parentScope){
+ element = jqLite(element);
parentScope = parentScope || {};
var scope = createScope(parentScope);
parentScope.$root = parentScope.$root || scope;
diff --git a/src/Validators.js b/src/Validators.js
index 662145c0..ecf21a01 100644
--- a/src/Validators.js
+++ b/src/Validators.js
@@ -82,29 +82,30 @@ foreach({
},
'asynchronous': function(text, asynchronousFn) {
- var stateKey = '$validateState';
- var lastKey = '$lastKey';
- var obj = this['$element'];
- var stateCache = obj[stateKey] = obj[stateKey] || {};
- var state = stateCache[text];
- var updateView = this['$updateView'];
- obj[lastKey] = text;
+ var element = this['$element'];
+ var cache = element.data('$validateState');
+ if (!cache) {
+ cache = { state: {}};
+ element.data('$validateState', cache);
+ }
+ var state = cache.state[text];
+ cache.lastKey = text;
if (state === undefined) {
// we have never seen this before, Request it
- jqLite(obj).addClass('ng-input-indicator-wait');
- state = stateCache[text] = null;
- asynchronousFn(text, function(error){
- state = stateCache[text] = error ? error : false;
- if (stateCache[obj[lastKey]] !== null) {
- jqLite(obj).removeClass('ng-input-indicator-wait');
+ element.addClass('ng-input-indicator-wait');
+ state = cache.state[text] = null;
+ (asynchronousFn || noop)(text, function(error){
+ state = cache.state[text] = error ? error : false;
+ if (cache.state[cache.lastKey] !== null) {
+ element.removeClass('ng-input-indicator-wait');
}
- updateView();
+ elementDecorateError(element, error);
});
}
if (state === null){
// request in flight, mark widget invalid, but don't show it to user
- this['$invalidWidgets'].push(this.$element);
+ (this['$invalidWidgets']||[]).push(this.$element);
}
return state;
}
diff --git a/src/Widgets.js b/src/Widgets.js
index b5222ac7..870468d3 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -28,13 +28,7 @@ function valueAccessor(scope, element) {
function validate(value) {
var error = required && !trim(value) ? "Required" : validator({self:scope, scope:{get:scope.$get, set:scope.$set}}, value);
if (error !== lastError) {
- if (error) {
- element.addClass(NG_VALIDATION_ERROR);
- element.attr(NG_ERROR, error);
- } else {
- element.removeClass(NG_VALIDATION_ERROR);
- element.removeAttr(NG_ERROR);
- }
+ elementDecorateError(element, error);
lastError = error;
}
return value;
--
cgit v1.2.3
From d2d356918bd1c0c76673d22ff85c617fbd85d40e Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 29 Mar 2010 21:49:12 -0700
Subject: reenabled more tests
---
src/Scope.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/Scope.js b/src/Scope.js
index 3e225653..cd4eb8ea 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -106,20 +106,23 @@ function createScope(parent, Class) {
$get: bind(instance, getter, instance),
$set: bind(instance, setter, instance),
- $eval: function(exp) {
+ $eval: function $eval(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);
});
+ var dirty = false;
foreach(watchList, function(watch) {
var value = instance.$tryEval(watch.watch, watch.handler);
if (watch.last !== value) {
+ dirty = true;
instance.$tryEval(watch.listener, watch.handler, value, watch.last);
watch.last = value;
}
});
+ if (dirty) $eval();
}
},
--
cgit v1.2.3
From a7d62dcb5533ceb9a7ae47ee27e2054400a0196b Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 30 Mar 2010 14:55:04 -0700
Subject: more tests fixed
---
src/Angular.js | 15 ++++----
src/Compiler.js | 102 +++++++++++++++++++++++++++---------------------------
src/Scope.js | 15 ++++----
src/Widgets.js | 5 +--
src/directives.js | 46 ++++++++++++++----------
5 files changed, 98 insertions(+), 85 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index e49eb9a9..4443890a 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -23,10 +23,6 @@ var consoleNode,
});
angular['copy'] = copy;
-var isVisible = isVisible || function (element) {
- return jQuery(element).is(":visible");
-};
-
function foreach(obj, iterator, context) {
var key;
if (obj) {
@@ -81,9 +77,11 @@ function isString(value){ return typeof value == 'string';}
function isNumber(value){ return typeof value == 'number';}
function isArray(value) { return value instanceof Array; }
function isFunction(value){ return typeof value == 'function';}
+function isTextNode(node) { return nodeName(node) == '#text'; }
function lowercase(value){ return isString(value) ? value.toLowerCase() : value; }
function uppercase(value){ return isString(value) ? value.toUpperCase() : value; }
function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; };
+function nodeName(element) { return (element[0] || element || {}).nodeName; }
function map(obj, iterator, context) {
var results = [];
foreach(obj, function(value, index, list) {
@@ -261,10 +259,13 @@ function outerHTML(node) {
}
function toBoolean(value) {
- var v = ("" + value).toLowerCase();
- if (v == 'f' || v == '0' || v == 'false' || v == 'no')
+ if (value && value.length !== 0) {
+ var v = lowercase("" + value);
+ value = !(v == 'f' || v == '0' || v == 'false' || v == 'no' || v == '[]');
+ } else {
value = false;
- return !!value;
+ }
+ return value;
}
function merge(src, dst) {
diff --git a/src/Compiler.js b/src/Compiler.js
index e97fb112..361d6946 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -50,37 +50,6 @@ Template.prototype = {
///////////////////////////////////
//Compiler
//////////////////////////////////
-function isTextNode(node) {
- return node.nodeName == '#text';
-}
-
-function eachTextNode(element, fn){
- var i, chldNodes = element[0].childNodes || [], size = chldNodes.length, chld;
- for (i = 0; i < size; i++) {
- if(isTextNode(chld = chldNodes[i])) {
- fn(jqLite(chld), i);
- }
- }
-}
-
-function eachNode(element, fn){
- var i, chldNodes = element[0].childNodes || [], size = chldNodes.length, chld;
- for (i = 0; i < size; i++) {
- if(!isTextNode(chld = chldNodes[i])) {
- fn(jqLite(chld), i);
- }
- }
-}
-
-function eachAttribute(element, fn){
- var i, attrs = element[0].attributes || [], size = attrs.length, chld, attr, attrValue = {};
- for (i = 0; i < size; i++) {
- var attr = attrs[i];
- attrValue[attr.name] = attr.value;
- }
- foreach(attrValue, fn);
-}
-
function Compiler(textMarkup, attrMarkup, directives, widgets){
this.textMarkup = textMarkup;
this.attrMarkup = attrMarkup;
@@ -110,24 +79,38 @@ Compiler.prototype = {
templatize: function(element){
var self = this,
- widget = self.widgets[element[0].nodeName],
- directives = self.directives,
+ widget,
+ directiveFns = self.directives,
descend = true,
- exclusive = false,
- directiveQueue = [],
+ directives = true,
template = new Template(),
selfApi = {
compile: bind(self, self.compile),
comment:function(text) {return jqLite(document.createComment(text));},
element:function(type) {return jqLite(document.createElement(type));},
text:function(text) {return jqLite(document.createTextNode(text));},
- descend: function(value){ if(isDefined(value)) descend = value; return descend;}
+ descend: function(value){ if(isDefined(value)) descend = value; return descend;},
+ directives: function(value){ if(isDefined(value)) directives = value; return directives;}
};
+ eachAttribute(element, function(value, name){
+ if (!widget) {
+ if (widget = self.widgets['@' + name]) {
+ widget = bind(selfApi, widget, value, element);
+ }
+ }
+ });
+ if (!widget) {
+ if (widget = self.widgets[nodeName(element)]) {
+ widget = bind(selfApi, widget, element);
+ }
+ }
if (widget) {
descend = false;
+ directives = false;
template.addInit(widget.call(selfApi, element));
- } else {
+ }
+ if (descend){
// process markup for text nodes only
eachTextNode(element, function(textNode){
var text = textNode.text();
@@ -135,7 +118,9 @@ Compiler.prototype = {
markup.call(selfApi, text, textNode, element);
});
});
+ }
+ if (directives) {
// Process attributes/directives
eachAttribute(element, function(value, name){
foreach(self.attrMarkup, function(markup){
@@ -143,21 +128,8 @@ Compiler.prototype = {
});
});
eachAttribute(element, function(value, name){
- var directive = directives[name];
- if (!exclusive && directive) {
- if (directive.exclusive) {
- exclusive = true;
- directiveQueue = [];
- }
- directiveQueue.push(bind(selfApi, directive, value, element));
- }
+ template.addInit((directiveFns[name]||noop).call(selfApi, value, element));
});
-
- // Execute directives
- foreach(directiveQueue, function(directive){
- template.addInit(directive());
- });
-
}
// Process non text child nodes
if (descend) {
@@ -168,3 +140,31 @@ Compiler.prototype = {
return template.empty() ? null : template;
}
};
+
+function eachTextNode(element, fn){
+ var i, chldNodes = element[0].childNodes || [], size = chldNodes.length, chld;
+ for (i = 0; i < size; i++) {
+ if(isTextNode(chld = chldNodes[i])) {
+ fn(jqLite(chld), i);
+ }
+ }
+}
+
+function eachNode(element, fn){
+ var i, chldNodes = element[0].childNodes || [], size = chldNodes.length, chld;
+ for (i = 0; i < size; i++) {
+ if(!isTextNode(chld = chldNodes[i])) {
+ fn(jqLite(chld), i);
+ }
+ }
+}
+
+function eachAttribute(element, fn){
+ var i, attrs = element[0].attributes || [], size = attrs.length, chld, attr, attrValue = {};
+ for (i = 0; i < size; i++) {
+ var attr = attrs[i];
+ attrValue[attr.name] = attr.value;
+ }
+ foreach(attrValue, fn);
+}
+
diff --git a/src/Scope.js b/src/Scope.js
index cd4eb8ea..dbb6c4aa 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -110,25 +110,26 @@ function createScope(parent, Class) {
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);
- });
- var dirty = false;
foreach(watchList, function(watch) {
var value = instance.$tryEval(watch.watch, watch.handler);
if (watch.last !== value) {
- dirty = true;
instance.$tryEval(watch.listener, watch.handler, value, watch.last);
watch.last = value;
}
});
- if (dirty) $eval();
+ foreach(evalList, function(eval) {
+ instance.$tryEval(eval.fn, eval.handler);
+ });
}
},
$tryEval: function (expression, exceptionHandler) {
try {
- return expressionCompile(expression).apply(instance, slice.call(arguments, 2, arguments.length));
+ var value = expressionCompile(expression).apply(instance, slice.call(arguments, 2, arguments.length));
+ if (exceptionHandler) {
+ errorHandlerFor(exceptionHandler)();
+ }
+ return value;
} catch (e) {
error(e);
if (isFunction(exceptionHandler)) {
diff --git a/src/Widgets.js b/src/Widgets.js
index 870468d3..d9d72535 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -9,7 +9,7 @@ function modelAccessor(scope, element) {
return formatter['format'](scope.$eval(expr));
},
set: function(value) {
- scope.$eval(expr + '=' + toJson(formatter['parse'](value)));
+ scope.$tryEval(expr + '=' + toJson(formatter['parse'](value)), element);
}
};
}
@@ -112,7 +112,7 @@ function inputWidget(events, modelAccessor, viewAccessor, initValue) {
view = viewAccessor(scope, element),
action = element.attr('ng-action') || '',
value = view.get() || copy(initValue);
- if (isDefined(value)) model.set(value);
+ if (isUndefined(model.get()) && isDefined(value)) model.set(value);
this.$eval(element.attr('ng-init')||'');
element.bind(events, function(){
model.set(view.get());
@@ -127,6 +127,7 @@ function inputWidget(events, modelAccessor, viewAccessor, initValue) {
}
function inputWidgetSelector(element){
+ this.directives(true);
return INPUT_TYPE[lowercase(element[0].type)] || noop;
}
diff --git a/src/directives.js b/src/directives.js
index c54c89e9..291bea11 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -66,18 +66,21 @@ angularDirective("ng-bind-template", function(expression){
angularDirective("ng-bind-attr", function(expression){
return function(element){
this.$onEval(function(){
- foreach(this.$eval(expression), function(value, key){
- element.attr(key, compileBindTemplate(value).call(this));
+ foreach(this.$eval(expression), function(bindExp, key) {
+ var value = compileBindTemplate(bindExp).call(this);
+ if (key == 'disabled' && !toBoolean(value)) {
+ element.removeAttr('disabled');
+ } else {
+ element.attr(key, value);
+ }
}, this);
}, element);
};
});
-angularDirective("ng-non-bindable", function(){
- this.descend(false);
-});
+angularWidget("@ng-non-bindable", noop);
-angularDirective("ng-repeat", function(expression, element){
+angularWidget("@ng-repeat", function(expression, element){
element.removeAttr('ng-repeat');
element.replaceWith(this.comment("ng-repeat: " + expression));
var template = this.compile(element);
@@ -98,24 +101,28 @@ angularDirective("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;
foreach(this.$tryEval(rhs, reference), function(value, key){
+ function assign(scope) {
+ scope[valueIdent] = value;
+ if (keyIdent) scope[keyIdent] = key;
+ }
if (index < childCount) {
// reuse existing child
- childScope = children[index];
+ assign(childScope = children[index]);
} else {
// grow children
- childScope = template(element.clone(), currentScope);
+ assign(childScope = template(element.clone(), currentScope));
lastElement.after(childScope.$element);
childScope.$index = index;
- childScope.$element.attr('ng-index', index);
+ childScope.$element.attr('ng-repeat-index', index);
childScope.$init();
children.push(childScope);
}
- childScope[valueIdent] = value;
- if (keyIdent) childScope[keyIdent] = key;
childScope.$eval();
lastElement = childScope.$element;
index ++;
@@ -126,7 +133,7 @@ angularDirective("ng-repeat", function(expression, element){
}
}, reference);
};
-}, {exclusive: true});
+});
angularDirective("ng-action", function(expression, element){
return function(element){
@@ -139,13 +146,16 @@ angularDirective("ng-action", function(expression, element){
});
angularDirective("ng-watch", function(expression, element){
- var match = expression.match(/^([^.]*):(.*)$/);
return function(element){
- if (!match) {
- throw "Expecting watch expression 'ident_to_watch: watch_statement' got '"
- + expression + "'";
- }
- this.$watch(match[1], match[2], element);
+ var self = this;
+ new Parser(expression).watch()({
+ scope:{get: self.$get, set: self.$set},
+ addListener:function(watch, exp){
+ self.$watch(watch, function(){
+ return exp({scope:{get: self.$get, set: self.$set}, state:self});
+ }, element);
+ }
+ });
};
});
--
cgit v1.2.3
From b5b8f63e1ebc75d09c6faf8dbad6497880deed47 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 30 Mar 2010 15:39:51 -0700
Subject: more tests passing
---
src/Angular.js | 8 +++++---
src/Scope.js | 15 ++++-----------
src/Validators.js | 2 +-
src/Widgets.js | 6 ++----
4 files changed, 12 insertions(+), 19 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 4443890a..27f463ac 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -5,6 +5,8 @@ if (!window['console']) window['console']={'log':noop, 'error':noop};
var consoleNode,
NOOP = 'noop',
+ NG_ERROR = 'ng-error',
+ NG_VALIDATION_ERROR = 'ng-validation-error',
jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
_ = window['_'],
jqLite = jQuery || jqLiteWrap,
@@ -226,12 +228,12 @@ function escapeHtml(html) {
replace(/>/g, '>');
}
-function elementDecorateError(element, error) {
+function elementError(element, type, error) {
if (error) {
- element.addClass(NG_VALIDATION_ERROR);
+ element.addClass(type);
element.attr(NG_ERROR, error);
} else {
- element.removeClass(NG_VALIDATION_ERROR);
+ element.removeClass(type);
element.removeAttr(NG_ERROR);
}
}
diff --git a/src/Scope.js b/src/Scope.js
index dbb6c4aa..42e7d5e5 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -77,14 +77,11 @@ function isRenderableElement(element) {
}
function rethrow(e) { throw e; }
-function errorHandlerFor(element) {
+function errorHandlerFor(element, error) {
while (!isRenderableElement(element)) {
element = element.parent() || jqLite(document.body);
}
- return function(error) {
- element.attr('ng-error', angular.toJson(error));
- element.addClass('ng-exception');
- };
+ elementError(element, 'ng-exception', isDefined(error) ? toJson(error) : error);
}
function createScope(parent, Class) {
@@ -125,17 +122,13 @@ function createScope(parent, Class) {
$tryEval: function (expression, exceptionHandler) {
try {
- var value = expressionCompile(expression).apply(instance, slice.call(arguments, 2, arguments.length));
- if (exceptionHandler) {
- errorHandlerFor(exceptionHandler)();
- }
- return value;
+ 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);
+ errorHandlerFor(exceptionHandler, e);
}
}
},
diff --git a/src/Validators.js b/src/Validators.js
index ecf21a01..e3da0a81 100644
--- a/src/Validators.js
+++ b/src/Validators.js
@@ -99,7 +99,7 @@ foreach({
if (cache.state[cache.lastKey] !== null) {
element.removeClass('ng-input-indicator-wait');
}
- elementDecorateError(element, error);
+ elementError(element, NG_VALIDATION_ERROR, error);
});
}
diff --git a/src/Widgets.js b/src/Widgets.js
index d9d72535..bc61f570 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -28,7 +28,7 @@ function valueAccessor(scope, element) {
function validate(value) {
var error = required && !trim(value) ? "Required" : validator({self:scope, scope:{get:scope.$get, set:scope.$set}}, value);
if (error !== lastError) {
- elementDecorateError(element, error);
+ elementError(element, NG_VALIDATION_ERROR, error);
lastError = error;
}
return value;
@@ -85,9 +85,7 @@ function optionsAccessor(scope, element) {
function noopAccessor() { return { get: noop, set: noop }; }
-var NG_ERROR = 'ng-error',
- NG_VALIDATION_ERROR = 'ng-validation-error',
- textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, ''),
+var textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, ''),
buttonWidget = inputWidget('click', noopAccessor, noopAccessor, undefined),
INPUT_TYPE = {
'text': textWidget,
--
cgit v1.2.3
From 35a91085004e31f786df1e0011bc26ed0142ab4d Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 31 Mar 2010 13:57:25 -0700
Subject: all tests green, some dissabled
---
src/Angular.js | 2 ++
src/Formatters.js | 2 +-
src/JSON.js | 1 +
src/Scope.js | 2 +-
src/Widgets.js | 3 ++-
src/directives.js | 29 +++++++++++++++++------------
src/jqLite.js | 2 +-
7 files changed, 25 insertions(+), 16 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 27f463ac..db177082 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -6,9 +6,11 @@ if (!window['console']) window['console']={'log':noop, 'error':noop};
var consoleNode,
NOOP = 'noop',
NG_ERROR = 'ng-error',
+ NG_EXCEPTION = 'ng-exception',
NG_VALIDATION_ERROR = 'ng-validation-error',
jQuery = window['jQuery'] || window['$'], // weirdness to make IE happy
_ = window['_'],
+ msie = !!/(msie) ([\w.]+)/.exec(lowercase(navigator.userAgent)),
jqLite = jQuery || jqLiteWrap,
slice = Array.prototype.slice,
angular = window['angular'] || (window['angular'] = {}),
diff --git a/src/Formatters.js b/src/Formatters.js
index 402e8a2b..c1ff82c6 100644
--- a/src/Formatters.js
+++ b/src/Formatters.js
@@ -1,5 +1,5 @@
function formater(format, parse) {return {'format':format, 'parse':parse || format};}
-function toString(obj) {return ""+obj;};
+function toString(obj) {return isDefined(obj) ? "" + obj : obj;};
extend(angularFormatter, {
'noop':formater(identity, identity),
'boolean':formater(toString, toBoolean),
diff --git a/src/JSON.js b/src/JSON.js
index baf3a2fa..69e1b4c0 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -11,6 +11,7 @@ function toPrettyJson(obj) {
};
function fromJson(json) {
+ if (!json) return json;
try {
var parser = new Parser(json, true);
var expression = parser.primary();
diff --git a/src/Scope.js b/src/Scope.js
index 42e7d5e5..4144d456 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -81,7 +81,7 @@ function errorHandlerFor(element, error) {
while (!isRenderableElement(element)) {
element = element.parent() || jqLite(document.body);
}
- elementError(element, 'ng-exception', isDefined(error) ? toJson(error) : error);
+ elementError(element, NG_EXCEPTION, isDefined(error) ? toJson(error) : error);
}
function createScope(parent, Class) {
diff --git a/src/Widgets.js b/src/Widgets.js
index bc61f570..f172eae2 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -108,7 +108,7 @@ function inputWidget(events, modelAccessor, viewAccessor, initValue) {
var scope = this,
model = modelAccessor(scope, element),
view = viewAccessor(scope, element),
- action = element.attr('ng-action') || '',
+ action = element.attr('ng-change') || '',
value = view.get() || copy(initValue);
if (isUndefined(model.get()) && isDefined(value)) model.set(value);
this.$eval(element.attr('ng-init')||'');
@@ -120,6 +120,7 @@ function inputWidget(events, modelAccessor, viewAccessor, initValue) {
// therefore we want to prevent default action
return isDefined(initValue);
});
+ view.set(model.get());
scope.$watch(model.get, view.set);
};
}
diff --git a/src/directives.js b/src/directives.js
index 291bea11..de68360e 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -15,7 +15,7 @@ angularDirective("ng-bind", function(expression){
return function(element) {
var lastValue;
this.$onEval(function() {
- var value = templateFn.call(this);
+ var value = templateFn.call(this, element);
if (value != lastValue) {
element.text(value);
lastValue = value;
@@ -31,16 +31,20 @@ function compileBindTemplate(template){
var bindings = [];
foreach(parseBindings(template), function(text){
var exp = binding(text);
- bindings.push(exp ? function(){
- return this.$eval(exp);
- } : function(){
+ bindings.push(exp ? function(element){
+ var error, value = this.$tryEval(exp, function(e){
+ error = toJson(e);
+ });
+ elementError(element, NG_EXCEPTION, error);
+ return error ? error : value;
+ } : function() {
return text;
});
});
- bindTemplateCache[template] = fn = function(){
+ bindTemplateCache[template] = fn = function(element){
var parts = [], self = this;
foreach(bindings, function(fn){
- var value = fn.call(self);
+ var value = fn.call(self, element);
if (isObject(value)) value = toJson(value, true);
parts.push(value);
});
@@ -54,7 +58,7 @@ angularDirective("ng-bind-template", function(expression){
return function(element) {
var lastValue;
this.$onEval(function() {
- var value = templateFn.call(this);
+ var value = templateFn.call(this, element);
if (value != lastValue) {
element.text(value);
lastValue = value;
@@ -67,7 +71,7 @@ angularDirective("ng-bind-attr", function(expression){
return function(element){
this.$onEval(function(){
foreach(this.$eval(expression), function(bindExp, key) {
- var value = compileBindTemplate(bindExp).call(this);
+ var value = compileBindTemplate(bindExp).call(this, element);
if (key == 'disabled' && !toBoolean(value)) {
element.removeAttr('disabled');
} else {
@@ -135,12 +139,13 @@ angularWidget("@ng-repeat", function(expression, element){
};
});
-angularDirective("ng-action", function(expression, element){
+angularDirective("ng-click", function(expression, element){
return function(element){
var self = this;
element.click(function(){
self.$tryEval(expression, element);
self.$eval();
+ return false;
});
};
});
@@ -167,7 +172,7 @@ function ngClass(selector) {
var value = this.$eval(expression);
if (selector(this.$index)) {
if (isArray(value)) value = value.join(' ');
- element[0].className = (existing + value).replace(/\s\s+/g, ' ');
+ element[0].className = trim(existing + value);
}
}, element);
};
@@ -175,8 +180,8 @@ function ngClass(selector) {
}
angularDirective("ng-class", ngClass(function(){return true;}));
-angularDirective("ng-class-odd", ngClass(function(i){return i % 2 == 1;}));
-angularDirective("ng-class-even", ngClass(function(i){return i % 2 == 0;}));
+angularDirective("ng-class-odd", ngClass(function(i){return i % 2 == 0;}));
+angularDirective("ng-class-even", ngClass(function(i){return i % 2 == 1;}));
angularDirective("ng-show", function(expression, element){
return function(element){
diff --git a/src/jqLite.js b/src/jqLite.js
index 449854d5..3baafd51 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -136,7 +136,7 @@ JQLite.prototype = {
addClass: function( selector ) {
if (!this.hasClass(selector)) {
- this[0].className += ' ' + selector;
+ this[0].className = trim(this[0].className + ' ' + selector);
}
},
--
cgit v1.2.3
From 861bac1d2808b15abb867e761ded8144bf5f7e94 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 31 Mar 2010 17:56:16 -0700
Subject: started to add services
---
src/Angular.js | 71 +++++++++++++++++++++++++++++++++++++++++--------------
src/Compiler.js | 1 -
src/Parser.js | 4 ++--
src/Scope.js | 55 +++++++++++++++++++++++++++++-------------
src/UrlWatcher.js | 40 ++++++++++---------------------
src/services.js | 34 ++++++++++++++++++++++++++
6 files changed, 139 insertions(+), 66 deletions(-)
create mode 100644 src/services.js
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index db177082..8eef6ac0 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -4,6 +4,9 @@ if (typeof document.getAttribute == 'undefined')
if (!window['console']) window['console']={'log':noop, 'error':noop};
var consoleNode,
+ PRIORITY_FIRST = -99999;
+ PRIORITY_WATCH = -1000;
+ PRIORITY_LAST = 99999;
NOOP = 'noop',
NG_ERROR = 'ng-error',
NG_EXCEPTION = 'ng-exception',
@@ -21,11 +24,30 @@ var consoleNode,
angularValidator = extensionMap(angular, 'validator'),
angularFilter = extensionMap(angular, 'filter'),
angularFormatter = extensionMap(angular, 'formatter'),
+ angularService = extensionMap(angular, 'service'),
angularCallbacks = extensionMap(angular, 'callbacks'),
- angularAlert = angular['alert'] || (angular['alert'] = function(){
- log(arguments); window.alert.apply(window, arguments);
- });
-angular['copy'] = copy;
+ urlWatcher = new UrlWatcher(window.location);
+
+function angularAlert(){
+ log(arguments); window.alert.apply(window, arguments);
+};
+
+extend(angular, {
+ 'compile': compile,
+ 'startUrlWatch': bind(urlWatcher, urlWatcher.start),
+ 'copy': copy,
+ 'extend': extend,
+ 'foreach': foreach,
+ 'noop':noop,
+ 'identity':identity,
+ 'isUndefined': isUndefined,
+ 'isDefined': isDefined,
+ 'isString': isString,
+ 'isFunction': isFunction,
+ 'isNumber': isNumber,
+ 'isArray': isArray,
+ 'alert': angularAlert
+});
function foreach(obj, iterator, context) {
var key;
@@ -43,6 +65,17 @@ function foreach(obj, iterator, context) {
return obj;
}
+function foreachSorted(obj, iterator, context) {
+ var keys = [];
+ for (var key in obj) keys.push(key);
+ keys.sort();
+ for ( var i = 0; i < keys.length; i++) {
+ iterator.call(context, obj[keys[i]], keys[i]);
+ }
+ return keys;
+}
+
+
function extend(dst) {
foreach(arguments, function(obj){
if (obj !== dst) {
@@ -285,19 +318,21 @@ function merge(src, dst) {
}
}
-/////////////////////////////////////////////////
-
-angular['compile'] = function(element, config) {
- config = extend({
- 'onUpdateView': noop,
- 'server': "",
- 'location': {'get':noop, 'set':noop, 'listen':noop}
- }, config||{});
-
+function compile(element, config) {
var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget);
$element = jqLite(element),
- rootScope = {
- '$window': window
- };
- return rootScope['$root'] = compiler.compile($element)($element, rootScope);
-};
+ rootScope = createScope({
+ $element: $element,
+ $config: extend({
+ 'onUpdateView': noop,
+ 'server': "",
+ 'location': {
+ 'get':bind(urlWatcher, urlWatcher.get),
+ 'set':bind(urlWatcher, urlWatcher.set),
+ 'watch':bind(urlWatcher, urlWatcher.watch)
+ }
+ }, config || {})
+ }, serviceAdapter(angularService));
+ return compiler.compile($element)($element, rootScope);
+}
+/////////////////////////////////////////////////
diff --git a/src/Compiler.js b/src/Compiler.js
index 361d6946..c9039928 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -65,7 +65,6 @@ Compiler.prototype = {
element = jqLite(element);
parentScope = parentScope || {};
var scope = createScope(parentScope);
- parentScope.$root = parentScope.$root || scope;
return extend(scope, {
$element:element,
$init: function() {
diff --git a/src/Parser.js b/src/Parser.js
index ef1465a0..ec58295a 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -11,8 +11,8 @@ Lexer.OPERATORS = {
'true':function(self){return true;},
'false':function(self){return false;},
'undefined':noop,
- '+':function(self, a,b){return (a||0)+(b||0);},
- '-':function(self, a,b){return (a||0)-(b||0);},
+ '+':function(self, a,b){return (isDefined(a)?a:0)+(isDefined(b)?b:0);},
+ '-':function(self, a,b){return (isDefined(a)?a:0)-(isDefined(b)?b:0);},
'*':function(self, a,b){return a*b;},
'/':function(self, a,b){return a/b;},
'%':function(self, a,b){return a%b;},
diff --git a/src/Scope.js b/src/Scope.js
index 4144d456..ba86e24f 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -89,7 +89,11 @@ function createScope(parent, Class) {
function API(){}
function Behavior(){}
- var instance, behavior, api, watchList = [], evalList = [];
+ var instance, behavior, api, evalLists = {};
+ if (isFunction(parent)) {
+ Class = parent;
+ parent = {};
+ }
Class = Class || noop;
parent = Parent.prototype = parent || {};
@@ -107,15 +111,10 @@ function createScope(parent, Class) {
if (isDefined(exp)) {
return expressionCompile(exp).apply(instance, slice.call(arguments, 1, arguments.length));
} else {
- 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;
- }
- });
- foreach(evalList, function(eval) {
- instance.$tryEval(eval.fn, eval.handler);
+ foreachSorted(evalLists, function(list) {
+ foreach(list, function(eval) {
+ instance.$tryEval(eval.fn, eval.handler);
+ });
});
}
},
@@ -134,16 +133,24 @@ function createScope(parent, Class) {
},
$watch: function(watchExp, listener, exceptionHandler) {
- var watch = expressionCompile(watchExp);
- watchList.push({
- watch: watch,
- last: watch.call(instance),
- handler: exceptionHandler,
- listener:expressionCompile(listener)
+ var watch = expressionCompile(watchExp),
+ last = watch.call(instance);
+ instance.$onEval(PRIORITY_WATCH, function(){
+ var value = watch.call(instance);
+ if (last !== value) {
+ instance.$tryEval(listener, exceptionHandler, value, last);
+ last = value;
+ }
});
},
- $onEval: function(expr, exceptionHandler){
+ $onEval: function(priority, expr, exceptionHandler){
+ if (!isNumber(priority)) {
+ exceptionHandler = expr;
+ expr = priority;
+ priority = 0;
+ }
+ var evalList = evalLists[priority] || (evalLists[priority] = []);
evalList.push({
fn: expressionCompile(expr),
handler: exceptionHandler
@@ -151,7 +158,21 @@ function createScope(parent, Class) {
}
});
+ if (isUndefined(instance.$root)) {
+ behavior.$root = instance;
+ behavior.$parent = instance;
+ }
+
Class.apply(instance, slice.call(arguments, 2, arguments.length));
return instance;
}
+
+function serviceAdapter(services) {
+ return function(){
+ var self = this;
+ foreach(services, function(service, name){
+ self[name] = service.call(self);
+ });
+ };
+};
diff --git a/src/UrlWatcher.js b/src/UrlWatcher.js
index 0892eb1a..1b2a9cf0 100644
--- a/src/UrlWatcher.js
+++ b/src/UrlWatcher.js
@@ -9,42 +9,26 @@ function UrlWatcher(location) {
this.setTimeout = function(fn, delay) {
window.setTimeout(fn, delay);
};
- this.listener = function(url) {
- return url;
- };
this.expectedUrl = location.href;
+ this.listeners = [];
}
UrlWatcher.prototype = {
- listen: function(fn){
- this.listener = fn;
+ watch: function(fn){
+ this.listeners.push(fn);
},
- watch: function() {
+
+ start: function() {
var self = this;
- var pull = function() {
+ (function pull () {
if (self.expectedUrl !== self.location.href) {
- var notify = self.location.hash.match(/^#\$iframe_notify=(.*)$/);
- if (notify) {
- if (!self.expectedUrl.match(/#/)) {
- self.expectedUrl += "#";
- }
- self.location.href = self.expectedUrl;
- var id = '_iframe_notify_' + notify[1];
- var notifyFn = angularCallbacks[id];
- delete angularCallbacks[id];
- try {
- (notifyFn||noop)();
- } catch (e) {
- alert(e);
- }
- } else {
- self.listener(self.location.href);
- self.expectedUrl = self.location.href;
- }
+ foreach(self.listeners, function(listener){
+ listener(self.location.href);
+ });
+ self.expectedUrl = self.location.href;
}
self.setTimeout(pull, self.delay);
- };
- pull();
+ })();
},
set: function(url) {
@@ -57,6 +41,6 @@ UrlWatcher.prototype = {
},
get: function() {
- return window.location.href;
+ return this.location.href;
}
};
diff --git a/src/services.js b/src/services.js
new file mode 100644
index 00000000..14c71363
--- /dev/null
+++ b/src/services.js
@@ -0,0 +1,34 @@
+angularService("$window", bind(window, identity, window));
+
+angularService("$anchor", function(){
+ var scope = this;
+ function anchor(url){
+ if (isDefined(url)) {
+ if (url.charAt(0) == '#') url = url.substr(1);
+ var pathQuery = url.split('?');
+ anchor.path = decodeURIComponent(pathQuery[0]);
+ anchor.param = {};
+ foreach((pathQuery[1] || "").split('&'), function(keyValue){
+ if (keyValue) {
+ var parts = keyValue.split('=');
+ var key = decodeURIComponent(parts[0]);
+ var value = parts[1];
+ if (!value) value = true;
+ anchor.param[key] = decodeURIComponent(value);
+ }
+ });
+ }
+ var params = [];
+ foreach(anchor.param, function(value, key){
+ params.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
+ });
+ return (anchor.path ? anchor.path : '') + (params.length ? '?' + params.join('&') : '');
+ };
+ this.$config.location.watch(function(url){
+ anchor(url);
+ });
+ this.$onEval(PRIORITY_LAST, function(){
+ scope.$config.location.set(anchor());
+ });
+ return anchor;
+});
--
cgit v1.2.3
From 11a6431f8926c557f3c58408dacc98466e76cde1 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 31 Mar 2010 17:56:16 -0700
Subject: started to add services
---
src/Angular.js | 123 +++++++++++++++++++++++++++++++++++++++++++++---------
src/Compiler.js | 1 -
src/Parser.js | 4 +-
src/Scope.js | 55 ++++++++++++++++--------
src/UrlWatcher.js | 62 ---------------------------
src/services.js | 34 +++++++++++++++
6 files changed, 178 insertions(+), 101 deletions(-)
delete mode 100644 src/UrlWatcher.js
create mode 100644 src/services.js
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index db177082..72ff26b0 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -1,9 +1,61 @@
+
+//////////////////////////////
+//UrlWatcher
+//////////////////////////////
+
+function UrlWatcher(location) {
+ this.location = location;
+ this.delay = 25;
+ this.setTimeout = function(fn, delay) {
+ window.setTimeout(fn, delay);
+ };
+ this.expectedUrl = location.href;
+ this.listeners = [];
+}
+
+UrlWatcher.prototype = {
+ watch: function(fn){
+ this.listeners.push(fn);
+ },
+
+ start: function() {
+ var self = this;
+ (function pull () {
+ if (self.expectedUrl !== self.location.href) {
+ foreach(self.listeners, function(listener){
+ listener(self.location.href);
+ });
+ self.expectedUrl = self.location.href;
+ }
+ self.setTimeout(pull, self.delay);
+ })();
+ },
+
+ set: function(url) {
+ var existingURL = this.location.href;
+ if (!existingURL.match(/#/))
+ existingURL += '#';
+ if (existingURL != url)
+ this.location.href = url;
+ this.existingURL = url;
+ },
+
+ get: function() {
+ return this.location.href;
+ }
+};
+
+
+
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;
+ PRIORITY_LAST = 99999;
NOOP = 'noop',
NG_ERROR = 'ng-error',
NG_EXCEPTION = 'ng-exception',
@@ -13,7 +65,7 @@ var consoleNode,
msie = !!/(msie) ([\w.]+)/.exec(lowercase(navigator.userAgent)),
jqLite = jQuery || jqLiteWrap,
slice = Array.prototype.slice,
- angular = window['angular'] || (window['angular'] = {}),
+ angular = window['angular'] || (window['angular'] = {}),
angularTextMarkup = extensionMap(angular, 'textMarkup'),
angularAttrMarkup = extensionMap(angular, 'attrMarkup'),
angularDirective = extensionMap(angular, 'directive'),
@@ -21,11 +73,30 @@ var consoleNode,
angularValidator = extensionMap(angular, 'validator'),
angularFilter = extensionMap(angular, 'filter'),
angularFormatter = extensionMap(angular, 'formatter'),
+ angularService = extensionMap(angular, 'service'),
angularCallbacks = extensionMap(angular, 'callbacks'),
- angularAlert = angular['alert'] || (angular['alert'] = function(){
- log(arguments); window.alert.apply(window, arguments);
- });
-angular['copy'] = copy;
+ urlWatcher = new UrlWatcher(window.location);
+
+function angularAlert(){
+ log(arguments); window.alert.apply(window, arguments);
+};
+
+extend(angular, {
+ 'compile': compile,
+ 'startUrlWatch': bind(urlWatcher, urlWatcher.start),
+ 'copy': copy,
+ 'extend': extend,
+ 'foreach': foreach,
+ 'noop':noop,
+ 'identity':identity,
+ 'isUndefined': isUndefined,
+ 'isDefined': isDefined,
+ 'isString': isString,
+ 'isFunction': isFunction,
+ 'isNumber': isNumber,
+ 'isArray': isArray,
+ 'alert': angularAlert
+});
function foreach(obj, iterator, context) {
var key;
@@ -43,6 +114,17 @@ function foreach(obj, iterator, context) {
return obj;
}
+function foreachSorted(obj, iterator, context) {
+ var keys = [];
+ for (var key in obj) keys.push(key);
+ keys.sort();
+ for ( var i = 0; i < keys.length; i++) {
+ iterator.call(context, obj[keys[i]], keys[i]);
+ }
+ return keys;
+}
+
+
function extend(dst) {
foreach(arguments, function(obj){
if (obj !== dst) {
@@ -285,19 +367,22 @@ function merge(src, dst) {
}
}
-/////////////////////////////////////////////////
-
-angular['compile'] = function(element, config) {
- config = extend({
- 'onUpdateView': noop,
- 'server': "",
- 'location': {'get':noop, 'set':noop, 'listen':noop}
- }, config||{});
-
+function compile(element, config) {
var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget);
$element = jqLite(element),
- rootScope = {
- '$window': window
- };
- return rootScope['$root'] = compiler.compile($element)($element, rootScope);
-};
+ rootScope = createScope({
+ $element: $element,
+ $config: extend({
+ 'onUpdateView': noop,
+ 'server': "",
+ 'location': {
+ 'get':bind(urlWatcher, urlWatcher.get),
+ 'set':bind(urlWatcher, urlWatcher.set),
+ 'watch':bind(urlWatcher, urlWatcher.watch)
+ }
+ }, config || {})
+ }, serviceAdapter(angularService));
+ return compiler.compile($element)($element, rootScope);
+}
+/////////////////////////////////////////////////
+
diff --git a/src/Compiler.js b/src/Compiler.js
index 361d6946..c9039928 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -65,7 +65,6 @@ Compiler.prototype = {
element = jqLite(element);
parentScope = parentScope || {};
var scope = createScope(parentScope);
- parentScope.$root = parentScope.$root || scope;
return extend(scope, {
$element:element,
$init: function() {
diff --git a/src/Parser.js b/src/Parser.js
index ef1465a0..ec58295a 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -11,8 +11,8 @@ Lexer.OPERATORS = {
'true':function(self){return true;},
'false':function(self){return false;},
'undefined':noop,
- '+':function(self, a,b){return (a||0)+(b||0);},
- '-':function(self, a,b){return (a||0)-(b||0);},
+ '+':function(self, a,b){return (isDefined(a)?a:0)+(isDefined(b)?b:0);},
+ '-':function(self, a,b){return (isDefined(a)?a:0)-(isDefined(b)?b:0);},
'*':function(self, a,b){return a*b;},
'/':function(self, a,b){return a/b;},
'%':function(self, a,b){return a%b;},
diff --git a/src/Scope.js b/src/Scope.js
index 4144d456..ba86e24f 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -89,7 +89,11 @@ function createScope(parent, Class) {
function API(){}
function Behavior(){}
- var instance, behavior, api, watchList = [], evalList = [];
+ var instance, behavior, api, evalLists = {};
+ if (isFunction(parent)) {
+ Class = parent;
+ parent = {};
+ }
Class = Class || noop;
parent = Parent.prototype = parent || {};
@@ -107,15 +111,10 @@ function createScope(parent, Class) {
if (isDefined(exp)) {
return expressionCompile(exp).apply(instance, slice.call(arguments, 1, arguments.length));
} else {
- 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;
- }
- });
- foreach(evalList, function(eval) {
- instance.$tryEval(eval.fn, eval.handler);
+ foreachSorted(evalLists, function(list) {
+ foreach(list, function(eval) {
+ instance.$tryEval(eval.fn, eval.handler);
+ });
});
}
},
@@ -134,16 +133,24 @@ function createScope(parent, Class) {
},
$watch: function(watchExp, listener, exceptionHandler) {
- var watch = expressionCompile(watchExp);
- watchList.push({
- watch: watch,
- last: watch.call(instance),
- handler: exceptionHandler,
- listener:expressionCompile(listener)
+ var watch = expressionCompile(watchExp),
+ last = watch.call(instance);
+ instance.$onEval(PRIORITY_WATCH, function(){
+ var value = watch.call(instance);
+ if (last !== value) {
+ instance.$tryEval(listener, exceptionHandler, value, last);
+ last = value;
+ }
});
},
- $onEval: function(expr, exceptionHandler){
+ $onEval: function(priority, expr, exceptionHandler){
+ if (!isNumber(priority)) {
+ exceptionHandler = expr;
+ expr = priority;
+ priority = 0;
+ }
+ var evalList = evalLists[priority] || (evalLists[priority] = []);
evalList.push({
fn: expressionCompile(expr),
handler: exceptionHandler
@@ -151,7 +158,21 @@ function createScope(parent, Class) {
}
});
+ if (isUndefined(instance.$root)) {
+ behavior.$root = instance;
+ behavior.$parent = instance;
+ }
+
Class.apply(instance, slice.call(arguments, 2, arguments.length));
return instance;
}
+
+function serviceAdapter(services) {
+ return function(){
+ var self = this;
+ foreach(services, function(service, name){
+ self[name] = service.call(self);
+ });
+ };
+};
diff --git a/src/UrlWatcher.js b/src/UrlWatcher.js
deleted file mode 100644
index 0892eb1a..00000000
--- a/src/UrlWatcher.js
+++ /dev/null
@@ -1,62 +0,0 @@
-
-// ////////////////////////////
-// UrlWatcher
-// ////////////////////////////
-
-function UrlWatcher(location) {
- this.location = location;
- this.delay = 25;
- this.setTimeout = function(fn, delay) {
- window.setTimeout(fn, delay);
- };
- this.listener = function(url) {
- return url;
- };
- this.expectedUrl = location.href;
-}
-
-UrlWatcher.prototype = {
- listen: function(fn){
- this.listener = fn;
- },
- watch: function() {
- var self = this;
- var pull = function() {
- if (self.expectedUrl !== self.location.href) {
- var notify = self.location.hash.match(/^#\$iframe_notify=(.*)$/);
- if (notify) {
- if (!self.expectedUrl.match(/#/)) {
- self.expectedUrl += "#";
- }
- self.location.href = self.expectedUrl;
- var id = '_iframe_notify_' + notify[1];
- var notifyFn = angularCallbacks[id];
- delete angularCallbacks[id];
- try {
- (notifyFn||noop)();
- } catch (e) {
- alert(e);
- }
- } else {
- self.listener(self.location.href);
- self.expectedUrl = self.location.href;
- }
- }
- self.setTimeout(pull, self.delay);
- };
- pull();
- },
-
- set: function(url) {
- var existingURL = this.location.href;
- if (!existingURL.match(/#/))
- existingURL += '#';
- if (existingURL != url)
- this.location.href = url;
- this.existingURL = url;
- },
-
- get: function() {
- return window.location.href;
- }
-};
diff --git a/src/services.js b/src/services.js
new file mode 100644
index 00000000..14c71363
--- /dev/null
+++ b/src/services.js
@@ -0,0 +1,34 @@
+angularService("$window", bind(window, identity, window));
+
+angularService("$anchor", function(){
+ var scope = this;
+ function anchor(url){
+ if (isDefined(url)) {
+ if (url.charAt(0) == '#') url = url.substr(1);
+ var pathQuery = url.split('?');
+ anchor.path = decodeURIComponent(pathQuery[0]);
+ anchor.param = {};
+ foreach((pathQuery[1] || "").split('&'), function(keyValue){
+ if (keyValue) {
+ var parts = keyValue.split('=');
+ var key = decodeURIComponent(parts[0]);
+ var value = parts[1];
+ if (!value) value = true;
+ anchor.param[key] = decodeURIComponent(value);
+ }
+ });
+ }
+ var params = [];
+ foreach(anchor.param, function(value, key){
+ params.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
+ });
+ return (anchor.path ? anchor.path : '') + (params.length ? '?' + params.join('&') : '');
+ };
+ this.$config.location.watch(function(url){
+ anchor(url);
+ });
+ this.$onEval(PRIORITY_LAST, function(){
+ scope.$config.location.set(anchor());
+ });
+ return anchor;
+});
--
cgit v1.2.3
From 85f13d602e31424b2e2d18172872f14a24c31135 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 1 Apr 2010 14:10:28 -0700
Subject: work on $location and autobind
---
src/Angular.js | 19 ++++++++++++-
src/angular-bootstrap.js | 39 ++++++++++----------------
src/delete/Model.js | 65 +++++++++++++++++++++++++++++++++++++++++++
src/markups.js | 1 +
src/moveToAngularCom/Model.js | 65 -------------------------------------------
src/services.js | 40 +++++++++++++-------------
6 files changed, 118 insertions(+), 111 deletions(-)
create mode 100644 src/delete/Model.js
delete mode 100644 src/moveToAngularCom/Model.js
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 72ff26b0..5b5aa87b 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -45,7 +45,7 @@ UrlWatcher.prototype = {
}
};
-
+////////////////////////////////////
if (typeof document.getAttribute == 'undefined')
document.getAttribute = function() {};
@@ -386,3 +386,20 @@ function compile(element, config) {
}
/////////////////////////////////////////////////
+function parseKeyValue(keyValue) {
+ var obj = {}, key_value, key;
+ 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;
+ }
+ });
+ return obj;
+}
+
+function angularInit(config){
+ if (config.autobind) {
+ compile(window.document, config).$init();
+ }
+}
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index 7798afa5..b0a3aa4f 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -22,23 +22,16 @@
* THE SOFTWARE.
*/
(function(previousOnLoad){
- var filename = /(.*)\/angular-(.*).js(#(.*))?/;
- var scripts = document.getElementsByTagName("SCRIPT");
- var serverPath;
- var config = {};
+ var filename = /(.*)\/angular-(.*).js(#(.*))?/,
+ scripts = document.getElementsByTagName("SCRIPT"),
+ serverPath,
+ config,
+ match;
for(var j = 0; j < scripts.length; j++) {
- var match = (scripts[j].src || "").match(filename);
+ match = (scripts[j].src || "").match(filename);
if (match) {
serverPath = match[1];
- parseConfig(match[4]);
- }
- }
-
- function parseConfig(args) {
- var keyValues = args.split('&'), keyValue, i = 0;
- for (; i < keyValues.length; i++) {
- keyValue = keyValues[i].split('=');
- config[keyValue[0]] = keyValue[1] || true;
+ config = match[4];
}
}
@@ -53,7 +46,6 @@
addScript("/jqlite.js");
addScript("/Parser.js");
addScript("/Resource.js");
- addScript("/URLWatcher.js");
// Extension points
addScript("/apis.js");
@@ -63,17 +55,14 @@
addScript("/directives.js");
addScript("/markups.js");
addScript("/widgets.js");
+ addScript("/services.js");
- if (config.autobind) {
- window.onload = function(){
- try {
- if (previousOnLoad) previousOnLoad();
- } catch(e) {}
- var scope = angular.compile(window.document, config);
- if (config.rootScope) window[config.rootScope] = scope;
- scope.$init();
- };
- }
+ window.onload = function(){
+ try {
+ if (previousOnLoad) previousOnLoad();
+ } catch(e) {}
+ angularInit(parseKeyValue(config));
+ };
})(window.onload);
diff --git a/src/delete/Model.js b/src/delete/Model.js
new file mode 100644
index 00000000..b09efd0e
--- /dev/null
+++ b/src/delete/Model.js
@@ -0,0 +1,65 @@
+// 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/markups.js b/src/markups.js
index 6bc27c85..3ae713fb 100644
--- a/src/markups.js
+++ b/src/markups.js
@@ -51,6 +51,7 @@ angularTextMarkup('{{}}', function(text, textNode, parentElement) {
}
});
+// TODO: this should be widget not a markup
angularTextMarkup('OPTION', function(text, textNode, parentElement){
if (parentElement[0].nodeName == "OPTION") {
var select = document.createElement('select');
diff --git a/src/moveToAngularCom/Model.js b/src/moveToAngularCom/Model.js
deleted file mode 100644
index b09efd0e..00000000
--- a/src/moveToAngularCom/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/services.js b/src/services.js
index 14c71363..5d235b32 100644
--- a/src/services.js
+++ b/src/services.js
@@ -1,34 +1,34 @@
angularService("$window", bind(window, identity, window));
-angularService("$anchor", function(){
+var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.]+)(:([0-9]+))?([^\?#]+)?(\?([^#]*))((#([^\?]*))(\?([^\?]*))?)$/;
+angularService("$location", function(){
var scope = this;
- function anchor(url){
+ function location(url){
if (isDefined(url)) {
- if (url.charAt(0) == '#') url = url.substr(1);
- var pathQuery = url.split('?');
- anchor.path = decodeURIComponent(pathQuery[0]);
- anchor.param = {};
- foreach((pathQuery[1] || "").split('&'), function(keyValue){
- if (keyValue) {
- var parts = keyValue.split('=');
- var key = decodeURIComponent(parts[0]);
- var value = parts[1];
- if (!value) value = true;
- anchor.param[key] = decodeURIComponent(value);
- }
- });
+ var match = URL_MATCH.exec(url);
+ dump(match);
+ location.href = url;
+ location.protocol = match[1];
+ location.host = match[3];
+ location.port = match[5];
+ location.path = match[6];
+ location.search = parseKeyValue(match[8]);
+ location.hash = match[9];
+ location.hashPath = match[11];
+ location.hashSearch = parseKeyValue(match[13]);
+ foreach(location, dump);
}
var params = [];
- foreach(anchor.param, function(value, key){
+ foreach(location.param, function(value, key){
params.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
});
- return (anchor.path ? anchor.path : '') + (params.length ? '?' + params.join('&') : '');
+ return (location.path ? location.path : '') + (params.length ? '?' + params.join('&') : '');
};
this.$config.location.watch(function(url){
- anchor(url);
+ location(url);
});
this.$onEval(PRIORITY_LAST, function(){
- scope.$config.location.set(anchor());
+ scope.$config.location.set(location());
});
- return anchor;
+ return location;
});
--
cgit v1.2.3
From d717020911a350a5ea3c0a985c57d56c8fcad607 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 2 Apr 2010 11:10:36 -0700
Subject: widgets now work properly
---
src/Angular.js | 8 ++++++
src/Scope.js | 3 ++-
src/Widgets.js | 78 ++++++++++++++++++++++++++++++++++++++++++++++++---------
src/services.js | 42 ++++++++++++++++++-------------
4 files changed, 100 insertions(+), 31 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 5b5aa87b..4e3266eb 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -398,6 +398,14 @@ function parseKeyValue(keyValue) {
return obj;
}
+function toKeyValue(obj) {
+ var parts = [];
+ foreach(obj, function(value, key){
+ parts.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
+ });
+ return parts.length ? parts.join('&') : '';
+};
+
function angularInit(config){
if (config.autobind) {
compile(window.document, config).$init();
diff --git a/src/Scope.js b/src/Scope.js
index ba86e24f..ae5bd384 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -102,6 +102,7 @@ function createScope(parent, Class) {
instance = new Behavior();
extend(api, {
+ 'this': instance,
$parent: parent,
$bind: bind(instance, bind, instance),
$get: bind(instance, getter, instance),
@@ -162,7 +163,7 @@ function createScope(parent, Class) {
behavior.$root = instance;
behavior.$parent = instance;
}
-
+ (parent.$onEval || noop)(instance.$eval);
Class.apply(instance, slice.call(arguments, 2, arguments.length));
return instance;
diff --git a/src/Widgets.js b/src/Widgets.js
index f172eae2..e42d981c 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -85,8 +85,8 @@ function optionsAccessor(scope, element) {
function noopAccessor() { return { get: noop, set: noop }; }
-var textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, ''),
- buttonWidget = inputWidget('click', noopAccessor, noopAccessor, undefined),
+var textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, initWidgetValue('')),
+ buttonWidget = inputWidget('click', noopAccessor, noopAccessor, noop),
INPUT_TYPE = {
'text': textWidget,
'textarea': textWidget,
@@ -96,29 +96,42 @@ var textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, ''),
'submit': buttonWidget,
'reset': buttonWidget,
'image': buttonWidget,
- 'checkbox': inputWidget('click', modelAccessor, checkedAccessor, false),
- 'radio': inputWidget('click', modelAccessor, radioAccessor, undefined),
- 'select-one': inputWidget('click', modelAccessor, valueAccessor, null),
- 'select-multiple': inputWidget('click', modelAccessor, optionsAccessor, [])
+ 'checkbox': inputWidget('click', modelAccessor, checkedAccessor, initWidgetValue(false)),
+ 'radio': inputWidget('click', modelAccessor, radioAccessor, radioInit),
+ 'select-one': inputWidget('change', modelAccessor, valueAccessor, initWidgetValue(null)),
+ 'select-multiple': inputWidget('change', modelAccessor, optionsAccessor, initWidgetValue([]))
// 'file': fileWidget???
};
-function inputWidget(events, modelAccessor, viewAccessor, initValue) {
+function initWidgetValue(initValue) {
+ return function (model, view) {
+ var value = view.get() || copy(initValue);
+ if (isUndefined(model.get()) && isDefined(value))
+ model.set(value);
+ };
+}
+
+function radioInit(model, view) {
+ var modelValue = model.get(), viewValue = view.get();
+ if (isUndefined(modelValue)) model.set(null);
+ if (viewValue != null) model.set(viewValue);
+}
+
+function inputWidget(events, modelAccessor, viewAccessor, initFn) {
return function(element) {
var scope = this,
model = modelAccessor(scope, element),
view = viewAccessor(scope, element),
- action = element.attr('ng-change') || '',
- value = view.get() || copy(initValue);
- if (isUndefined(model.get()) && isDefined(value)) model.set(value);
+ action = element.attr('ng-change') || '';
+ initFn(model, view);
this.$eval(element.attr('ng-init')||'');
element.bind(events, function(){
model.set(view.get());
scope.$tryEval(action, element);
scope.$root.$eval();
- // if we have no initValue than we are just a button,
+ // if we have noop initFn than we are just a button,
// therefore we want to prevent default action
- return isDefined(initValue);
+ return initFn != noop;
});
view.set(model.get());
scope.$watch(model.get, view.set);
@@ -137,3 +150,44 @@ angularWidget('SELECT', function(element){
this.descend(true);
return inputWidgetSelector.call(this, element);
});
+
+
+angularWidget('INLINE', function(element){
+ element.replaceWith(this.element("div"));
+ var compiler = this,
+ behavior = element.attr("behavior"),
+ template = element.attr("template"),
+ initExpr = element.attr("init");
+ return function(boundElement){
+ var scope = this;
+ boundElement.load(template, function(){
+ var templateScope = compiler.compile(boundElement)(boundElement, scope);
+ templateScope.$tryEval(initExpr, boundElement);
+ templateScope.$init();
+ });
+ };
+});
+
+angularWidget('INCLUDE', function(element){
+ element.replaceWith(this.element("div"));
+ var matches = [];
+ element.find("INLINE").each(function(){
+ matches.push({match: jQuery(this).attr("match"), element: jQuery(this)});
+ });
+ var compiler = this,
+ watchExpr = element.attr("watch");
+ return function(boundElement){
+ var scope = this;
+ this.$watch(watchExpr, function(value){
+ foreach(matches, function(inline){
+ if(inline.match == value) {
+ var template = inline.element.attr("template");
+ boundElement.load(template, function(){
+ var templateScope = compiler.compile(boundElement)(boundElement, scope);
+ templateScope.$init();
+ });
+ }
+ });
+ });
+ };
+});
diff --git a/src/services.js b/src/services.js
index 5d235b32..fc12b22b 100644
--- a/src/services.js
+++ b/src/services.js
@@ -1,34 +1,40 @@
angularService("$window", bind(window, identity, window));
-var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.]+)(:([0-9]+))?([^\?#]+)?(\?([^#]*))((#([^\?]*))(\?([^\?]*))?)$/;
+var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.]*)(:([0-9]+))?([^\?#]+)(\?([^#]*))?((#([^\?]*))?(\?([^\?]*))?)$/;
+var DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp':21};
angularService("$location", function(){
var scope = this;
function location(url){
if (isDefined(url)) {
var match = URL_MATCH.exec(url);
- dump(match);
- location.href = url;
- location.protocol = match[1];
- location.host = match[3];
- location.port = match[5];
- location.path = match[6];
- location.search = parseKeyValue(match[8]);
- location.hash = match[9];
- location.hashPath = match[11];
- location.hashSearch = parseKeyValue(match[13]);
- foreach(location, dump);
+ if (match) {
+ location.href = url;
+ location.protocol = match[1];
+ location.host = match[3] || '';
+ location.port = match[5] || DEFAULT_PORTS[location.href] || null;
+ location.path = match[6];
+ location.search = parseKeyValue(match[8]);
+ location.hash = match[9];
+ if (location.hash) location.hash = location.hash.substr(1);
+ location.hashPath = match[11] || '';
+ location.hashSearch = parseKeyValue(match[13]);
+ }
}
- var params = [];
- foreach(location.param, function(value, key){
- params.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
- });
- return (location.path ? location.path : '') + (params.length ? '?' + params.join('&') : '');
+ var hashKeyValue = toKeyValue(location.hashSearch);
+ return location.href +
+ (location.hashPath ? location.hashPath : '') +
+ (hashKeyValue ? '?' + hashKeyValue : '');
};
this.$config.location.watch(function(url){
location(url);
});
+ location(this.$config.location.get());
this.$onEval(PRIORITY_LAST, function(){
- scope.$config.location.set(location());
+ var href = location();
+ if (href != location.href) {
+ scope.$config.location.set(location());
+ location.href = href;
+ }
});
return location;
});
--
cgit v1.2.3
From 35ca4fcb9c49e505e28669e951e01ddedb01d7db Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Fri, 2 Apr 2010 11:49:48 -0700
Subject: radio now works with repeaters
---
src/Scope.js | 2 ++
src/Widgets.js | 7 ++++---
2 files changed, 6 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/Scope.js b/src/Scope.js
index 2b2db189..26a3f85b 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -84,6 +84,7 @@ function errorHandlerFor(element, error) {
elementError(element, NG_EXCEPTION, isDefined(error) ? toJson(error) : error);
}
+var scopeId = 0;
function createScope(parent, Class) {
function Parent(){}
function API(){}
@@ -103,6 +104,7 @@ function createScope(parent, Class) {
extend(api, {
'this': instance,
+ $id: (scopeId++),
$parent: parent,
$bind: bind(instance, bind, instance),
$get: bind(instance, getter, instance),
diff --git a/src/Widgets.js b/src/Widgets.js
index e42d981c..a05ea63c 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -111,8 +111,9 @@ function initWidgetValue(initValue) {
};
}
-function radioInit(model, view) {
- var modelValue = model.get(), viewValue = view.get();
+function radioInit(model, view, element) {
+ var modelValue = model.get(), viewValue = view.get(), input = element[0];
+ input.name = this.$id + '@' + input.name;
if (isUndefined(modelValue)) model.set(null);
if (viewValue != null) model.set(viewValue);
}
@@ -123,7 +124,7 @@ function inputWidget(events, modelAccessor, viewAccessor, initFn) {
model = modelAccessor(scope, element),
view = viewAccessor(scope, element),
action = element.attr('ng-change') || '';
- initFn(model, view);
+ initFn.call(scope, model, view, element);
this.$eval(element.attr('ng-init')||'');
element.bind(events, function(){
model.set(view.get());
--
cgit v1.2.3
From a80a61839a66d244c8bb14bbe2975746e02516c8 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sat, 3 Apr 2010 17:04:36 -0700
Subject: injection is now working
---
src/Angular.js | 88 +++++++-----------------------------------------
src/Browser.js | 46 +++++++++++++++++++++++++
src/Compiler.js | 11 +++---
src/Formatters.js | 2 +-
src/JSON.js | 8 ++---
src/Parser.js | 4 +--
src/Resource.js | 6 ++--
src/Scope.js | 53 +++++++++++++++--------------
src/Widgets.js | 23 +++++++------
src/angular-bootstrap.js | 1 +
src/directives.js | 11 +++---
src/jqLite.js | 4 +--
src/markups.js | 6 ++--
src/services.js | 27 +++++++++++----
14 files changed, 148 insertions(+), 142 deletions(-)
create mode 100644 src/Browser.js
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index d97c2282..86fb5291 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -1,50 +1,3 @@
-
-//////////////////////////////
-//UrlWatcher
-//////////////////////////////
-
-function UrlWatcher(location) {
- this.location = location;
- this.delay = 25;
- this.setTimeout = function(fn, delay) {
- window.setTimeout(fn, delay);
- };
- this.expectedUrl = location.href;
- this.listeners = [];
-}
-
-UrlWatcher.prototype = {
- watch: function(fn){
- this.listeners.push(fn);
- },
-
- start: function() {
- var self = this;
- (function pull () {
- if (self.expectedUrl !== self.location.href) {
- foreach(self.listeners, function(listener){
- listener(self.location.href);
- });
- self.expectedUrl = self.location.href;
- }
- self.setTimeout(pull, self.delay);
- })();
- },
-
- set: function(url) {
- var existingURL = this.location.href;
- if (!existingURL.match(/#/))
- existingURL += '#';
- if (existingURL != url)
- this.location.href = url;
- this.existingURL = url;
- },
-
- get: function() {
- return this.location.href;
- }
-};
-
////////////////////////////////////
if (typeof document.getAttribute == 'undefined')
@@ -53,9 +6,9 @@ if (typeof document.getAttribute == 'undefined')
if (!window['console']) window['console']={'log':noop, 'error':noop};
var consoleNode,
- PRIORITY_FIRST = -99999;
- PRIORITY_WATCH = -1000;
- PRIORITY_LAST = 99999;
+ PRIORITY_FIRST = -99999,
+ PRIORITY_WATCH = -1000,
+ PRIORITY_LAST = 99999,
NOOP = 'noop',
NG_ERROR = 'ng-error',
NG_EXCEPTION = 'ng-exception',
@@ -74,16 +27,14 @@ var consoleNode,
angularFilter = extensionMap(angular, 'filter'),
angularFormatter = extensionMap(angular, 'formatter'),
angularService = extensionMap(angular, 'service'),
- angularCallbacks = extensionMap(angular, 'callbacks'),
- urlWatcher = new UrlWatcher(window.location);
+ angularCallbacks = extensionMap(angular, 'callbacks');
function angularAlert(){
log(arguments); window.alert.apply(window, arguments);
-};
+}
extend(angular, {
'compile': compile,
- 'startUrlWatch': bind(urlWatcher, urlWatcher.start),
'copy': copy,
'extend': extend,
'foreach': foreach,
@@ -166,7 +117,7 @@ function isFunction(value){ return typeof value == 'function';}
function isTextNode(node) { return nodeName(node) == '#text'; }
function lowercase(value){ return isString(value) ? value.toLowerCase() : value; }
function uppercase(value){ return isString(value) ? value.toUpperCase() : value; }
-function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; };
+function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; }
function nodeName(element) { return (element[0] || element || {}).nodeName; }
function map(obj, iterator, context) {
var results = [];
@@ -174,7 +125,7 @@ function map(obj, iterator, context) {
results.push(iterator.call(context, value, index, list));
});
return results;
-};
+}
function size(obj) {
var size = 0;
if (obj) {
@@ -289,7 +240,7 @@ function copy(source, destination){
});
return destination;
}
-};
+}
function setHtml(node, html) {
if (isLeafNode(node)) {
@@ -367,22 +318,10 @@ function merge(src, dst) {
}
}
-function compile(element, config) {
+function compile(element, parentScope, overrides) {
var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget);
- $element = jqLite(element),
- rootScope = createScope({
- $element: $element,
- $config: extend({
- 'onUpdateView': noop,
- 'server': "",
- 'location': {
- 'get':bind(urlWatcher, urlWatcher.get),
- 'set':bind(urlWatcher, urlWatcher.set),
- 'watch':bind(urlWatcher, urlWatcher.watch)
- }
- }, config || {})
- }, serviceAdapter(angularService));
- return compiler.compile($element)($element, rootScope);
+ $element = jqLite(element);
+ return compiler.compile($element)($element, parentScope, overrides);
}
/////////////////////////////////////////////////
@@ -404,11 +343,10 @@ function toKeyValue(obj) {
parts.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
});
return parts.length ? parts.join('&') : '';
-};
+}
function angularInit(config){
if (config.autobind) {
- compile(window.document, config).$init();
+ compile(window.document, null, {'$config':config}).$init();
}
}
-
diff --git a/src/Browser.js b/src/Browser.js
new file mode 100644
index 00000000..bdf57386
--- /dev/null
+++ b/src/Browser.js
@@ -0,0 +1,46 @@
+
+//////////////////////////////
+// Browser
+//////////////////////////////
+
+function Browser(location) {
+ this.location = location;
+ this.delay = 25;
+ this.setTimeout = function(fn, delay) {
+ window.setTimeout(fn, delay);
+ };
+ this.expectedUrl = location.href;
+ this.listeners = [];
+}
+
+Browser.prototype = {
+ watchUrl: function(fn){
+ this.listeners.push(fn);
+ },
+
+ startUrlWatcher: function() {
+ var self = this;
+ (function pull () {
+ if (self.expectedUrl !== self.location.href) {
+ foreach(self.listeners, function(listener){
+ listener(self.location.href);
+ });
+ self.expectedUrl = self.location.href;
+ }
+ self.setTimeout(pull, self.delay);
+ })();
+ },
+
+ setUrl: function(url) {
+ var existingURL = this.location.href;
+ if (!existingURL.match(/#/))
+ existingURL += '#';
+ if (existingURL != url)
+ this.location.href = url;
+ this.existingURL = url;
+ },
+
+ getUrl: function() {
+ return this.location.href;
+ }
+};
diff --git a/src/Compiler.js b/src/Compiler.js
index c9039928..dac4931f 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -1,5 +1,5 @@
/**
- * Template provides directions an how to bind to a given element.
+= * Template provides directions an how to bind to a given element.
* It contains a list of init functions which need to be called to
* bind to a new instance of elements. It also provides a list
* of child paths which contain child templates
@@ -43,7 +43,7 @@ Template.prototype = {
},
empty: function() {
- return this.inits.length == 0 && this.paths.length == 0;
+ return this.inits.length === 0 && this.paths.length === 0;
}
};
@@ -63,8 +63,9 @@ Compiler.prototype = {
var template = this.templatize(rawElement) || new Template();
return function(element, parentScope){
element = jqLite(element);
- parentScope = parentScope || {};
- var scope = createScope(parentScope);
+ var scope = parentScope && parentScope.$eval ?
+ parentScope :
+ createScope(parentScope || {}, angularService);
return extend(scope, {
$element:element,
$init: function() {
@@ -161,7 +162,7 @@ function eachNode(element, fn){
function eachAttribute(element, fn){
var i, attrs = element[0].attributes || [], size = attrs.length, chld, attr, attrValue = {};
for (i = 0; i < size; i++) {
- var attr = attrs[i];
+ attr = attrs[i];
attrValue[attr.name] = attr.value;
}
foreach(attrValue, fn);
diff --git a/src/Formatters.js b/src/Formatters.js
index c1ff82c6..ee63c1a5 100644
--- a/src/Formatters.js
+++ b/src/Formatters.js
@@ -1,5 +1,5 @@
function formater(format, parse) {return {'format':format, 'parse':parse || format};}
-function toString(obj) {return isDefined(obj) ? "" + obj : obj;};
+function toString(obj) {return isDefined(obj) ? "" + obj : obj;}
extend(angularFormatter, {
'noop':formater(identity, identity),
'boolean':formater(toString, toBoolean),
diff --git a/src/JSON.js b/src/JSON.js
index 69e1b4c0..5c3e1043 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -4,11 +4,11 @@ function toJson(obj, pretty){
var buf = [];
toJsonArray(buf, obj, pretty ? "\n " : null, []);
return buf.join('');
-};
+}
function toPrettyJson(obj) {
return toJson(obj, true);
-};
+}
function fromJson(json) {
if (!json) return json;
@@ -21,7 +21,7 @@ function fromJson(json) {
error("fromJson error: ", json, e);
throw e;
}
-};
+}
angular['toJson'] = toJson;
angular['fromJson'] = fromJson;
@@ -102,4 +102,4 @@ function toJsonArray(buf, obj, pretty, stack){
if (typeof obj == "object") {
stack.pop();
}
-};
+}
diff --git a/src/Parser.js b/src/Parser.js
index ec58295a..8e42f18a 100644
--- a/src/Parser.js
+++ b/src/Parser.js
@@ -4,7 +4,7 @@ function Lexer(text, parsStrings){
this.dateParseLength = parsStrings ? 20 : -1;
this.tokens = [];
this.index = 0;
-};
+}
Lexer.OPERATORS = {
'null':function(self){return null;},
@@ -244,7 +244,7 @@ function Parser(text, parseStrings){
this.text = text;
this.tokens = new Lexer(text, parseStrings).parse();
this.index = 0;
-};
+}
Parser.ZERO = function(){
return 0;
diff --git a/src/Resource.js b/src/Resource.js
index 27ce8aa9..9fe60788 100644
--- a/src/Resource.js
+++ b/src/Resource.js
@@ -15,7 +15,7 @@ Route.prototype = {
var self = this;
var url = this.template;
params = params || {};
- foreach(this.urlParams, function(value, urlParam){
+ foreach(this.urlParams, function(_, urlParam){
var value = params[urlParam] || self.defaults[urlParam] || "";
url = url.replace(new RegExp(":" + urlParam + "(\\W)"), value + "$1");
});
@@ -57,7 +57,7 @@ ResourceFactory.prototype = {
function Resource(value){
copy(value || {}, this);
- };
+ }
foreach(actions, function(action, name){
var isGet = action.method == 'GET';
@@ -105,7 +105,7 @@ ResourceFactory.prototype = {
var params = {};
var callback = noop;
switch(arguments.length) {
- case 2: params = a1, callback = a2;
+ case 2: params = a1; callback = a2;
case 1: if (typeof a1 == 'function') callback = a1; else params = a1;
case 0: break;
default:
diff --git a/src/Scope.js b/src/Scope.js
index 26a3f85b..52ab3ed7 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -26,7 +26,7 @@ function getter(instance, path) {
return bind(lastInstance, instance);
}
return instance;
-};
+}
function setter(instance, path, value){
var element = path.split('.');
@@ -41,7 +41,7 @@ function setter(instance, path, value){
}
instance[element.shift()] = value;
return value;
-};
+}
var compileCache = {};
function expressionCompile(exp){
@@ -54,7 +54,7 @@ function expressionCompile(exp){
compileCache[exp] = expFn;
}
return parserNewScopeAdapter(expFn);
-};
+}
// return expFn
// TODO(remove this hack)
@@ -85,21 +85,16 @@ function errorHandlerFor(element, error) {
}
var scopeId = 0;
-function createScope(parent, Class) {
+function createScope(parent, services, existing) {
function Parent(){}
function API(){}
function Behavior(){}
- var instance, behavior, api, evalLists = {};
- if (isFunction(parent)) {
- Class = parent;
- parent = {};
- }
+ var instance, behavior, api, evalLists = {}, servicesCache = extend({}, existing);
- Class = Class || noop;
- parent = Parent.prototype = parent || {};
+ parent = Parent.prototype = (parent || {});
api = API.prototype = new Parent();
- behavior = Behavior.prototype = extend(new API(), Class.prototype);
+ behavior = Behavior.prototype = new API();
instance = new Behavior();
extend(api, {
@@ -161,22 +156,28 @@ function createScope(parent, Class) {
}
});
- if (isUndefined(instance.$root)) {
- behavior.$root = instance;
- behavior.$parent = instance;
+ if (!parent.$root) {
+ api.$root = instance;
+ api.$parent = instance;
}
- (parent.$onEval || noop)(instance.$eval);
- Class.apply(instance, slice.call(arguments, 2, arguments.length));
+ function inject(name){
+ var service = getter(servicesCache, name), factory, args = [];
+ if (isUndefined(service)) {
+ factory = services[name];
+ if (!isFunction(factory))
+ throw "Don't know how to inject '" + name + "'.";
+ foreach(factory.inject, function(dependency){
+ args.push(inject(dependency));
+ });
+ setter(servicesCache, name, service = factory.apply(instance, args));
+ }
+ return service;
+ }
+
+ foreach(services, function(_, name){
+ instance[name] = inject(name);
+ });
return instance;
}
-
-function serviceAdapter(services) {
- return function(){
- var self = this;
- foreach(services, function(service, name){
- self[name] = service.call(self);
- });
- };
-};
diff --git a/src/Widgets.js b/src/Widgets.js
index a05ea63c..1e703a56 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -23,7 +23,7 @@ function valueAccessor(scope, element) {
validator = compileValidator(validatorName),
required = element.attr('ng-required'),
lastError;
- required = required || required == '';
+ required = required || required === '';
if (!validator) throw "Validator named '" + validatorName + "' not found.";
function validate(value) {
var error = required && !trim(value) ? "Required" : validator({self:scope, scope:{get:scope.$get, set:scope.$set}}, value);
@@ -115,7 +115,7 @@ function radioInit(model, view, element) {
var modelValue = model.get(), viewValue = view.get(), input = element[0];
input.name = this.$id + '@' + input.name;
if (isUndefined(modelValue)) model.set(null);
- if (viewValue != null) model.set(viewValue);
+ if (viewValue !== null) model.set(viewValue);
}
function inputWidget(events, modelAccessor, viewAccessor, initFn) {
@@ -126,14 +126,17 @@ function inputWidget(events, modelAccessor, viewAccessor, initFn) {
action = element.attr('ng-change') || '';
initFn.call(scope, model, view, element);
this.$eval(element.attr('ng-init')||'');
- element.bind(events, function(){
- model.set(view.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;
- });
+ // Don't register a handler if we are a button (noopAccessor) and there is no action
+ if (action || modelAccessor !== noopAccessor) {
+ element.bind(events, function(){
+ model.set(view.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;
+ });
+ }
view.set(model.get());
scope.$watch(model.get, view.set);
};
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index b0a3aa4f..7484b0c3 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -46,6 +46,7 @@
addScript("/jqlite.js");
addScript("/Parser.js");
addScript("/Resource.js");
+ addScript("/Browser.js");
// Extension points
addScript("/apis.js");
diff --git a/src/directives.js b/src/directives.js
index de68360e..4f2916da 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -52,7 +52,8 @@ function compileBindTemplate(template){
};
}
return fn;
-};
+}
+
angularDirective("ng-bind-template", function(expression){
var templateFn = compileBindTemplate(expression);
return function(element) {
@@ -120,7 +121,7 @@ angularWidget("@ng-repeat", function(expression, element){
assign(childScope = children[index]);
} else {
// grow children
- assign(childScope = template(element.clone(), currentScope));
+ assign(childScope = template(element.clone(), createScope(currentScope)));
lastElement.after(childScope.$element);
childScope.$index = index;
childScope.$element.attr('ng-repeat-index', index);
@@ -144,7 +145,7 @@ angularDirective("ng-click", function(expression, element){
var self = this;
element.click(function(){
self.$tryEval(expression, element);
- self.$eval();
+ self.$root.$eval();
return false;
});
};
@@ -180,8 +181,8 @@ function ngClass(selector) {
}
angularDirective("ng-class", ngClass(function(){return true;}));
-angularDirective("ng-class-odd", ngClass(function(i){return i % 2 == 0;}));
-angularDirective("ng-class-even", ngClass(function(i){return i % 2 == 1;}));
+angularDirective("ng-class-odd", ngClass(function(i){return i % 2 === 0;}));
+angularDirective("ng-class-even", ngClass(function(i){return i % 2 === 1;}));
angularDirective("ng-show", function(expression, element){
return function(element){
diff --git a/src/jqLite.js b/src/jqLite.js
index 3baafd51..ec77a6fb 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -5,7 +5,7 @@
var jqCache = {};
var jqName = 'ng-' + new Date().getTime();
var jqId = 1;
-function jqNextId() { return jqId++; }
+function jqNextId() { return (jqId++); }
var addEventListener = window.document.attachEvent ?
function(element, type, fn) {
@@ -31,7 +31,7 @@ function jqClearData(element) {
delete jqCache[cacheId];
delete element[jqName];
}
-};
+}
function JQLite(element) {
this[0] = element;
diff --git a/src/markups.js b/src/markups.js
index 3ae713fb..5c069f49 100644
--- a/src/markups.js
+++ b/src/markups.js
@@ -16,16 +16,16 @@ function parseBindings(string) {
if (lastIndex != string.length)
results.push(string.substr(lastIndex, string.length - lastIndex));
return results.length === 0 ? [ string ] : results;
-};
+}
function binding(string) {
var binding = string.replace(/\n/gm, ' ').match(/^\{\{(.*)\}\}$/);
return binding ? binding[1] : null;
-};
+}
function hasBindings(bindings) {
return bindings.length > 1 || binding(bindings[0]) !== null;
-};
+}
angularTextMarkup('{{}}', function(text, textNode, parentElement) {
var bindings = parseBindings(text),
diff --git a/src/services.js b/src/services.js
index fc12b22b..59c21d36 100644
--- a/src/services.js
+++ b/src/services.js
@@ -1,8 +1,11 @@
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 DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp':21};
-angularService("$location", function(){
+angularService("$location", function(browser){
var scope = this;
function location(url){
if (isDefined(url)) {
@@ -24,17 +27,29 @@ angularService("$location", function(){
return location.href +
(location.hashPath ? location.hashPath : '') +
(hashKeyValue ? '?' + hashKeyValue : '');
- };
- this.$config.location.watch(function(url){
+ }
+ browser.watchUrl(function(url){
location(url);
});
- location(this.$config.location.get());
+ location(browser.getUrl());
this.$onEval(PRIORITY_LAST, function(){
var href = location();
if (href != location.href) {
- scope.$config.location.set(location());
+ browser.setUrl(href);
location.href = href;
}
});
return location;
-});
+}, {inject: ['$browser']});
+
+if (!angularService['$browser']) {
+ var browserSingleton;
+ angularService('$browser', function browserFactory(){
+ if (!browserSingleton) {
+ browserSingleton = new Browser(window.location);
+ browserSingleton.startUrlWatcher();
+ }
+ return browserSingleton;
+ });
+}
+
--
cgit v1.2.3
From 5dcf9bb4feb144b3a54a43524210dd7d0bb4213e Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sat, 3 Apr 2010 20:19:55 -0700
Subject: browser is now injectable into the system
---
src/Angular.js | 16 ----------------
src/AngularPublic.js | 17 +++++++++++++++++
src/Browser.js | 1 -
src/angular-bootstrap.js | 1 +
src/services.js | 4 ++--
5 files changed, 20 insertions(+), 19 deletions(-)
create mode 100644 src/AngularPublic.js
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 86fb5291..d00a9bf6 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -33,22 +33,6 @@ function angularAlert(){
log(arguments); window.alert.apply(window, arguments);
}
-extend(angular, {
- 'compile': compile,
- 'copy': copy,
- 'extend': extend,
- 'foreach': foreach,
- 'noop':noop,
- 'identity':identity,
- 'isUndefined': isUndefined,
- 'isDefined': isDefined,
- 'isString': isString,
- 'isFunction': isFunction,
- 'isNumber': isNumber,
- 'isArray': isArray,
- 'alert': angularAlert
-});
-
function foreach(obj, iterator, context) {
var key;
if (obj) {
diff --git a/src/AngularPublic.js b/src/AngularPublic.js
new file mode 100644
index 00000000..b9d0f9d7
--- /dev/null
+++ b/src/AngularPublic.js
@@ -0,0 +1,17 @@
+extend(angular, {
+ 'element': jqLite,
+ 'compile': compile,
+ 'scope': createScope,
+ 'copy': copy,
+ 'extend': extend,
+ 'foreach': foreach,
+ 'noop':noop,
+ 'identity':identity,
+ 'isUndefined': isUndefined,
+ 'isDefined': isDefined,
+ 'isString': isString,
+ 'isFunction': isFunction,
+ 'isNumber': isNumber,
+ 'isArray': isArray
+});
+
diff --git a/src/Browser.js b/src/Browser.js
index bdf57386..893459ae 100644
--- a/src/Browser.js
+++ b/src/Browser.js
@@ -37,7 +37,6 @@ Browser.prototype = {
existingURL += '#';
if (existingURL != url)
this.location.href = url;
- this.existingURL = url;
},
getUrl: function() {
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index 7484b0c3..d9633854 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -47,6 +47,7 @@
addScript("/Parser.js");
addScript("/Resource.js");
addScript("/Browser.js");
+ addScript("/AngularPublic.js");
// Extension points
addScript("/apis.js");
diff --git a/src/services.js b/src/services.js
index 59c21d36..16b48031 100644
--- a/src/services.js
+++ b/src/services.js
@@ -24,9 +24,9 @@ angularService("$location", function(browser){
}
}
var hashKeyValue = toKeyValue(location.hashSearch);
- return location.href +
- (location.hashPath ? location.hashPath : '') +
+ var hash = (location.hashPath ? location.hashPath : '') +
(hashKeyValue ? '?' + hashKeyValue : '');
+ return location.href.split('#')[0] + '#' + (hash ? hash : '');
}
browser.watchUrl(function(url){
location(url);
--
cgit v1.2.3
From 4bfa4e230d5ebdd582068effe7f4f1b60c43093a Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Sun, 4 Apr 2010 16:39:17 -0700
Subject: had to rename the flie so that it is the last file loaded.
---
src/AngularPublic.js | 17 -----------------
src/~AngularPublic.js | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 17 deletions(-)
delete mode 100644 src/AngularPublic.js
create mode 100644 src/~AngularPublic.js
(limited to 'src')
diff --git a/src/AngularPublic.js b/src/AngularPublic.js
deleted file mode 100644
index b9d0f9d7..00000000
--- a/src/AngularPublic.js
+++ /dev/null
@@ -1,17 +0,0 @@
-extend(angular, {
- 'element': jqLite,
- 'compile': compile,
- 'scope': createScope,
- 'copy': copy,
- 'extend': extend,
- 'foreach': foreach,
- 'noop':noop,
- 'identity':identity,
- 'isUndefined': isUndefined,
- 'isDefined': isDefined,
- 'isString': isString,
- 'isFunction': isFunction,
- 'isNumber': isNumber,
- 'isArray': isArray
-});
-
diff --git a/src/~AngularPublic.js b/src/~AngularPublic.js
new file mode 100644
index 00000000..b9d0f9d7
--- /dev/null
+++ b/src/~AngularPublic.js
@@ -0,0 +1,17 @@
+extend(angular, {
+ 'element': jqLite,
+ 'compile': compile,
+ 'scope': createScope,
+ 'copy': copy,
+ 'extend': extend,
+ 'foreach': foreach,
+ 'noop':noop,
+ 'identity':identity,
+ 'isUndefined': isUndefined,
+ 'isDefined': isDefined,
+ 'isString': isString,
+ 'isFunction': isFunction,
+ 'isNumber': isNumber,
+ 'isArray': isArray
+});
+
--
cgit v1.2.3
From 7a4b48020688060debe9cb0f9c17615d7585cbe7 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 5 Apr 2010 11:46:53 -0700
Subject: added ng:switch widget
---
src/Angular.js | 9 ++++++++
src/AngularPublic.js | 35 ++++++++++++++++++++++++++++
src/Browser.js | 20 ++++++++++++++--
src/Compiler.js | 1 +
src/Scope.js | 17 ++++----------
src/UrlWatcher.js | 46 -------------------------------------
src/Widgets.js | 59 +++++++++++++++++++++++++++---------------------
src/angular-bootstrap.js | 2 +-
src/jqLite.js | 7 ++++++
src/services.js | 29 ++++++++----------------
src/~AngularPublic.js | 17 --------------
11 files changed, 119 insertions(+), 123 deletions(-)
create mode 100644 src/AngularPublic.js
delete mode 100644 src/UrlWatcher.js
delete mode 100644 src/~AngularPublic.js
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index d00a9bf6..0952a352 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -247,7 +247,16 @@ function escapeHtml(html) {
replace(/>/g, '>');
}
+
+function isRenderableElement(element) {
+ var name = element && element[0] && element[0].nodeName;
+ return name && name.charAt(0) != '#' &&
+ !includes(['TR', 'COL', 'COLGROUP', 'TBODY', 'THEAD', 'TFOOT'], name);
+}
function elementError(element, type, error) {
+ while (!isRenderableElement(element)) {
+ element = element.parent() || jqLite(document.body);
+ }
if (error) {
element.addClass(type);
element.attr(NG_ERROR, error);
diff --git a/src/AngularPublic.js b/src/AngularPublic.js
new file mode 100644
index 00000000..470eb258
--- /dev/null
+++ b/src/AngularPublic.js
@@ -0,0 +1,35 @@
+var browserSingleton;
+angularService('$browser', function browserFactory(){
+ if (!browserSingleton) {
+ var XHR = XMLHttpRequest;
+ if (isUndefined(XHR)) {
+ XHR = function () {
+ try { return new ActiveXObject("Msxml2.XMLHTTP.6.0"); } catch (e1) {}
+ try { return new ActiveXObject("Msxml2.XMLHTTP.3.0"); } catch (e2) {}
+ try { return new ActiveXObject("Msxml2.XMLHTTP"); } catch (e3) {}
+ throw new Error("This browser does not support XMLHttpRequest.");
+ };
+ }
+ browserSingleton = new Browser(window.location, XHR);
+ browserSingleton.startUrlWatcher();
+ }
+ return browserSingleton;
+});
+
+extend(angular, {
+ 'element': jqLite,
+ 'compile': compile,
+ 'scope': createScope,
+ 'copy': copy,
+ 'extend': extend,
+ 'foreach': foreach,
+ 'noop':noop,
+ 'identity':identity,
+ 'isUndefined': isUndefined,
+ 'isDefined': isDefined,
+ 'isString': isString,
+ 'isFunction': isFunction,
+ 'isNumber': isNumber,
+ 'isArray': isArray
+});
+
diff --git a/src/Browser.js b/src/Browser.js
index 893459ae..6036884f 100644
--- a/src/Browser.js
+++ b/src/Browser.js
@@ -3,9 +3,10 @@
// Browser
//////////////////////////////
-function Browser(location) {
+function Browser(location, XHR) {
this.location = location;
this.delay = 25;
+ this.XHR = XHR;
this.setTimeout = function(fn, delay) {
window.setTimeout(fn, delay);
};
@@ -14,6 +15,17 @@ function Browser(location) {
}
Browser.prototype = {
+ xhr: function(method, url, callback){
+ var xhr = new this.XHR();
+ xhr.open(method, url, true);
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4) {
+ callback(xhr.status, xhr.responseText);
+ }
+ };
+ xhr.send('');
+ },
+
watchUrl: function(fn){
this.listeners.push(fn);
},
@@ -23,7 +35,11 @@ Browser.prototype = {
(function pull () {
if (self.expectedUrl !== self.location.href) {
foreach(self.listeners, function(listener){
- listener(self.location.href);
+ try {
+ listener(self.location.href);
+ } catch (e) {
+ error(e);
+ }
});
self.expectedUrl = self.location.href;
}
diff --git a/src/Compiler.js b/src/Compiler.js
index dac4931f..67c22461 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -71,6 +71,7 @@ Compiler.prototype = {
$init: function() {
template.init(element, scope);
scope.$eval();
+ delete scope.$init;
return scope;
}
});
diff --git a/src/Scope.js b/src/Scope.js
index 52ab3ed7..562dfbd8 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -70,17 +70,8 @@ function parserNewScopeAdapter(fn) {
};
}
-function isRenderableElement(element) {
- var name = element && element[0] && element[0].nodeName;
- return name && name.charAt(0) != '#' &&
- !includes(['TR', 'COL', 'COLGROUP', 'TBODY', 'THEAD', 'TFOOT'], name);
-}
-
function rethrow(e) { throw e; }
function errorHandlerFor(element, error) {
- while (!isRenderableElement(element)) {
- element = element.parent() || jqLite(document.body);
- }
elementError(element, NG_EXCEPTION, isDefined(error) ? toJson(error) : error);
}
@@ -132,14 +123,16 @@ function createScope(parent, services, existing) {
$watch: function(watchExp, listener, exceptionHandler) {
var watch = expressionCompile(watchExp),
- last = watch.call(instance);
- instance.$onEval(PRIORITY_WATCH, function(){
+ last;
+ function watcher(){
var value = watch.call(instance);
if (last !== value) {
instance.$tryEval(listener, exceptionHandler, value, last);
last = value;
}
- });
+ }
+ instance.$onEval(PRIORITY_WATCH, watcher);
+ watcher();
},
$onEval: function(priority, expr, exceptionHandler){
diff --git a/src/UrlWatcher.js b/src/UrlWatcher.js
deleted file mode 100644
index 1b2a9cf0..00000000
--- a/src/UrlWatcher.js
+++ /dev/null
@@ -1,46 +0,0 @@
-
-// ////////////////////////////
-// UrlWatcher
-// ////////////////////////////
-
-function UrlWatcher(location) {
- this.location = location;
- this.delay = 25;
- this.setTimeout = function(fn, delay) {
- window.setTimeout(fn, delay);
- };
- this.expectedUrl = location.href;
- this.listeners = [];
-}
-
-UrlWatcher.prototype = {
- watch: function(fn){
- this.listeners.push(fn);
- },
-
- start: function() {
- var self = this;
- (function pull () {
- if (self.expectedUrl !== self.location.href) {
- foreach(self.listeners, function(listener){
- listener(self.location.href);
- });
- self.expectedUrl = self.location.href;
- }
- self.setTimeout(pull, self.delay);
- })();
- },
-
- set: function(url) {
- var existingURL = this.location.href;
- if (!existingURL.match(/#/))
- existingURL += '#';
- if (existingURL != url)
- this.location.href = url;
- this.existingURL = url;
- },
-
- get: function() {
- return this.location.href;
- }
-};
diff --git a/src/Widgets.js b/src/Widgets.js
index 1e703a56..8e668c8f 100644
--- a/src/Widgets.js
+++ b/src/Widgets.js
@@ -156,40 +156,47 @@ angularWidget('SELECT', function(element){
});
-angularWidget('INLINE', function(element){
- element.replaceWith(this.element("div"));
+angularWidget('NG:INCLUDE', function(element){
var compiler = this,
- behavior = element.attr("behavior"),
- template = element.attr("template"),
- initExpr = element.attr("init");
- return function(boundElement){
- var scope = this;
- boundElement.load(template, function(){
- var templateScope = compiler.compile(boundElement)(boundElement, scope);
- templateScope.$tryEval(initExpr, boundElement);
- templateScope.$init();
+ src = element.attr("src");
+ return element.attr('switch-instance') ? null : function(element){
+ var scope = this, childScope;
+ element.attr('switch-instance', 'compiled');
+ scope.$browser.xhr('GET', src, function(code, response){
+ element.html(response);
+ childScope = createScope(scope);
+ compiler.compile(element)(element, childScope);
+ childScope.$init();
});
+ scope.$onEval(function(){ if (childScope) childScope.$eval(); });
};
});
-angularWidget('INCLUDE', function(element){
- element.replaceWith(this.element("div"));
- var matches = [];
- element.find("INLINE").each(function(){
- matches.push({match: jQuery(this).attr("match"), element: jQuery(this)});
- });
+angularWidget('NG:SWITCH', function(element){
var compiler = this,
- watchExpr = element.attr("watch");
- return function(boundElement){
+ watchExpr = element.attr("on"),
+ cases = [];
+ eachNode(element, function(caseElement){
+ var when = caseElement.attr('ng-switch-when');
+ if (when) {
+ cases.push({
+ when: function(value){ return value == when; },
+ element: caseElement,
+ template: compiler.compile(caseElement)
+ });
+ }
+ });
+ element.html('');
+ return function(element){
var scope = this;
this.$watch(watchExpr, function(value){
- foreach(matches, function(inline){
- if(inline.match == value) {
- var template = inline.element.attr("template");
- boundElement.load(template, function(){
- var templateScope = compiler.compile(boundElement)(boundElement, scope);
- templateScope.$init();
- });
+ element.html('');
+ foreach(cases, function(switchCase){
+ if (switchCase.when(value)) {
+ element.append(switchCase.element);
+ var childScope = createScope(scope);
+ switchCase.template(switchCase.element, childScope);
+ childScope.$init();
}
});
});
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index d9633854..ce7849d8 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -47,7 +47,7 @@
addScript("/Parser.js");
addScript("/Resource.js");
addScript("/Browser.js");
- addScript("/AngularPublic.js");
+ addScript("/~AngularPublic.js");
// Extension points
addScript("/apis.js");
diff --git a/src/jqLite.js b/src/jqLite.js
index ec77a6fb..f8ed4d7d 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -109,6 +109,10 @@ JQLite.prototype = {
this[0].parentNode.replaceChild(jqLite(replaceNode)[0], this[0]);
},
+ append: function(node) {
+ this[0].appendChild(jqLite(node)[0]);
+ },
+
remove: function() {
this.dealoc();
this[0].parentNode.removeChild(this[0]);
@@ -182,6 +186,9 @@ JQLite.prototype = {
html: function(value) {
if (isDefined(value)) {
+ for ( var i = 0, children = this[0].childNodes; i < children.length; i++) {
+ jqLite(children[i]).dealoc();
+ }
this[0].innerHTML = value;
}
return this[0].innerHTML;
diff --git a/src/services.js b/src/services.js
index 16b48031..2532d3d3 100644
--- a/src/services.js
+++ b/src/services.js
@@ -6,8 +6,8 @@ angularService("$document", function(window){
var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.]*)(:([0-9]+))?([^\?#]+)(\?([^#]*))?((#([^\?]*))?(\?([^\?]*))?)$/;
var DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp':21};
angularService("$location", function(browser){
- var scope = this;
- function location(url){
+ var scope = this, location = {parse:parse, toString:toString};
+ function parse(url){
if (isDefined(url)) {
var match = URL_MATCH.exec(url);
if (match) {
@@ -23,17 +23,19 @@ angularService("$location", function(browser){
location.hashSearch = parseKeyValue(match[13]);
}
}
- var hashKeyValue = toKeyValue(location.hashSearch);
- var hash = (location.hashPath ? location.hashPath : '') +
- (hashKeyValue ? '?' + hashKeyValue : '');
+ }
+ function toString() {
+ var hashKeyValue = toKeyValue(location.hashSearch),
+ hash = (location.hashPath ? location.hashPath : '') + (hashKeyValue ? '?' + hashKeyValue : '');
return location.href.split('#')[0] + '#' + (hash ? hash : '');
}
browser.watchUrl(function(url){
- location(url);
+ parse(url);
+ scope.$root.$eval();
});
- location(browser.getUrl());
+ parse(browser.getUrl());
this.$onEval(PRIORITY_LAST, function(){
- var href = location();
+ var href = toString();
if (href != location.href) {
browser.setUrl(href);
location.href = href;
@@ -42,14 +44,3 @@ angularService("$location", function(browser){
return location;
}, {inject: ['$browser']});
-if (!angularService['$browser']) {
- var browserSingleton;
- angularService('$browser', function browserFactory(){
- if (!browserSingleton) {
- browserSingleton = new Browser(window.location);
- browserSingleton.startUrlWatcher();
- }
- return browserSingleton;
- });
-}
-
diff --git a/src/~AngularPublic.js b/src/~AngularPublic.js
deleted file mode 100644
index b9d0f9d7..00000000
--- a/src/~AngularPublic.js
+++ /dev/null
@@ -1,17 +0,0 @@
-extend(angular, {
- 'element': jqLite,
- 'compile': compile,
- 'scope': createScope,
- 'copy': copy,
- 'extend': extend,
- 'foreach': foreach,
- 'noop':noop,
- 'identity':identity,
- 'isUndefined': isUndefined,
- 'isDefined': isDefined,
- 'isString': isString,
- 'isFunction': isFunction,
- 'isNumber': isNumber,
- 'isArray': isArray
-});
-
--
cgit v1.2.3
From 1c670b2a7c3f6153ea2e5047722f7151b9795b33 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 5 Apr 2010 14:09:25 -0700
Subject: added ng:include
---
src/delete/Widgets.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/delete/Widgets.js b/src/delete/Widgets.js
index 74f70f21..96b63793 100644
--- a/src/delete/Widgets.js
+++ b/src/delete/Widgets.js
@@ -729,7 +729,7 @@ PopUp.onOver = function(e) {
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 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...";
--
cgit v1.2.3
From 2107eafcde390eebbf59e829194626c488de9e29 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 5 Apr 2010 20:53:33 -0700
Subject: added hover service
---
src/Angular.js | 10 +++++++---
src/AngularPublic.js | 12 ++----------
src/Browser.js | 48 +++++++++++++++++++++++++++++++++++++++++-------
src/angular-bootstrap.js | 2 +-
src/jqLite.js | 2 +-
src/services.js | 43 +++++++++++++++++++++++++++++++++++++++++++
6 files changed, 95 insertions(+), 22 deletions(-)
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 0952a352..2d67b2cb 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -313,8 +313,10 @@ function merge(src, dst) {
function compile(element, parentScope, overrides) {
var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget);
- $element = jqLite(element);
- return compiler.compile($element)($element, parentScope, overrides);
+ $element = jqLite(element),
+ parent = extend({}, parentScope);
+ parent.$element = $element;
+ return compiler.compile($element)($element, parent, overrides);
}
/////////////////////////////////////////////////
@@ -340,6 +342,8 @@ function toKeyValue(obj) {
function angularInit(config){
if (config.autobind) {
- compile(window.document, null, {'$config':config}).$init();
+ var scope = compile(window.document, null, {'$config':config});
+ scope.$browser.addCss('../css/angular.css');
+ scope.$init();
}
}
diff --git a/src/AngularPublic.js b/src/AngularPublic.js
index 470eb258..176d6a91 100644
--- a/src/AngularPublic.js
+++ b/src/AngularPublic.js
@@ -1,17 +1,9 @@
var browserSingleton;
angularService('$browser', function browserFactory(){
if (!browserSingleton) {
- var XHR = XMLHttpRequest;
- if (isUndefined(XHR)) {
- XHR = function () {
- try { return new ActiveXObject("Msxml2.XMLHTTP.6.0"); } catch (e1) {}
- try { return new ActiveXObject("Msxml2.XMLHTTP.3.0"); } catch (e2) {}
- try { return new ActiveXObject("Msxml2.XMLHTTP"); } catch (e3) {}
- throw new Error("This browser does not support XMLHttpRequest.");
- };
- }
- browserSingleton = new Browser(window.location, XHR);
+ browserSingleton = new Browser(window.location, window.document);
browserSingleton.startUrlWatcher();
+ browserSingleton.bind();
}
return browserSingleton;
});
diff --git a/src/Browser.js b/src/Browser.js
index 6036884f..69f3eb9a 100644
--- a/src/Browser.js
+++ b/src/Browser.js
@@ -3,18 +3,52 @@
// Browser
//////////////////////////////
-function Browser(location, XHR) {
- this.location = location;
+function Browser(location, document) {
this.delay = 25;
- this.XHR = XHR;
+ this.expectedUrl = location.href;
+ this.urlListeners = [];
+ this.hoverListener = noop;
+
+ this.XHR = XMLHttpRequest || function () {
+ try { return new ActiveXObject("Msxml2.XMLHTTP.6.0"); } catch (e1) {}
+ try { return new ActiveXObject("Msxml2.XMLHTTP.3.0"); } catch (e2) {}
+ try { return new ActiveXObject("Msxml2.XMLHTTP"); } catch (e3) {}
+ throw new Error("This browser does not support XMLHttpRequest.");
+ };
this.setTimeout = function(fn, delay) {
window.setTimeout(fn, delay);
};
- this.expectedUrl = location.href;
- this.listeners = [];
+
+ this.location = location;
+ this.document = jqLite(document);
+ this.body = jqLite(document.body);
}
Browser.prototype = {
+
+ bind: function() {
+ var self = this;
+ self.document.bind("mouseover", function(event){
+ self.hoverListener(jqLite(event.target), true);
+ return true;
+ });
+ self.document.bind("mouseleave mouseout click dblclick keypress keyup", function(event){
+ self.hoverListener(jqLite(event.target), false);
+ return true;
+ });
+ },
+
+ hover: function(hoverListener) {
+ this.hoverListener = hoverListener;
+ },
+
+ addCss: function(url) {
+ var head = jqLite(this.document[0].getElementsByTagName('head')[0]),
+ link = jqLite('');
+ link.attr('href', url);
+ head.append(link);
+ },
+
xhr: function(method, url, callback){
var xhr = new this.XHR();
xhr.open(method, url, true);
@@ -27,14 +61,14 @@ Browser.prototype = {
},
watchUrl: function(fn){
- this.listeners.push(fn);
+ this.urlListeners.push(fn);
},
startUrlWatcher: function() {
var self = this;
(function pull () {
if (self.expectedUrl !== self.location.href) {
- foreach(self.listeners, function(listener){
+ foreach(self.urlListeners, function(listener){
try {
listener(self.location.href);
} catch (e) {
diff --git a/src/angular-bootstrap.js b/src/angular-bootstrap.js
index ce7849d8..d9633854 100644
--- a/src/angular-bootstrap.js
+++ b/src/angular-bootstrap.js
@@ -47,7 +47,7 @@
addScript("/Parser.js");
addScript("/Resource.js");
addScript("/Browser.js");
- addScript("/~AngularPublic.js");
+ addScript("/AngularPublic.js");
// Extension points
addScript("/apis.js");
diff --git a/src/jqLite.js b/src/jqLite.js
index f8ed4d7d..331db68d 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -78,7 +78,7 @@ JQLite.prototype = {
bind[type] = eventHandler = function(event) {
var bubbleEvent = false;
foreach(eventHandler.fns, function(fn){
- bubbleEvent = bubbleEvent || fn.apply(self, arguments);
+ bubbleEvent = bubbleEvent || fn.call(self, event);
});
if (!bubbleEvent) {
event.preventDefault();
diff --git a/src/services.js b/src/services.js
index 2532d3d3..173cee98 100644
--- a/src/services.js
+++ b/src/services.js
@@ -44,3 +44,46 @@ angularService("$location", function(browser){
return location;
}, {inject: ['$browser']});
+angularService("$hover", function(browser) {
+ var tooltip, self = this, error, width = 300, arrowWidth = 10;
+ browser.hover(function(element, show){
+ if (show && (error = element.attr('ng-error'))) {
+ if (!tooltip) {
+ tooltip = {
+ callout: jqLite(''),
+ arrow: jqLite(''),
+ title: jqLite(''),
+ content: jqLite('')
+ };
+ tooltip.callout.append(tooltip.arrow);
+ tooltip.callout.append(tooltip.title);
+ tooltip.callout.append(tooltip.content);
+ self.$browser.body.append(tooltip.callout);
+ }
+ var docRect = self.$browser.body[0].getBoundingClientRect(),
+ elementRect = element[0].getBoundingClientRect(),
+ leftSpace = docRect.right - elementRect.right - arrowWidth;
+ tooltip.title.text(element.hasClass("ng-exception") ? "EXCEPTION:" : "Validation error...");
+ tooltip.content.text(error);
+ if (leftSpace < width) {
+ tooltip.arrow.addClass('ng-arrow-right');
+ tooltip.arrow.css({left: (width + 1)+'px'});
+ tooltip.callout.css({
+ left: (elementRect.left - arrowWidth - width - 4) + "px",
+ top: (elementRect.top - 3) + "px",
+ width: width + "px"
+ });
+ } else {
+ tooltip.arrow.addClass('ng-arrow-left');
+ tooltip.callout.css({
+ left: (elementRect.right + arrowWidth) + "px",
+ top: (elementRect.top - 3) + "px",
+ width: width + "px"
+ });
+ }
+ } else if (tooltip) {
+ tooltip.callout.remove();
+ tooltip = null;
+ }
+ });
+}, {inject:['$browser']});
--
cgit v1.2.3
From e6460685869e16b5016de975fd0ba15a7e436951 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 5 Apr 2010 21:26:52 -0700
Subject: added ng-controller directive
---
src/Scope.js | 14 ++++++++++++--
src/directives.js | 11 +++++++++++
src/jqLite.js | 3 ++-
3 files changed, 25 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/Scope.js b/src/Scope.js
index 562dfbd8..b41f7436 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -1,4 +1,4 @@
-function getter(instance, path) {
+function getter(instance, path, unboundFn) {
if (!path) return instance;
var element = path.split('.');
var key;
@@ -22,7 +22,7 @@ function getter(instance, path) {
}
}
}
- if (typeof instance === 'function' && !instance['$$factory']) {
+ if (!unboundFn && isFunction(instance) && !instance['$$factory']) {
return bind(lastInstance, instance);
}
return instance;
@@ -146,7 +146,17 @@ function createScope(parent, services, existing) {
fn: expressionCompile(expr),
handler: exceptionHandler
});
+ },
+
+ $become: function(Class) {
+ // remove existing
+ foreach(behavior, function(value, key){ delete behavior[key]; });
+ foreach((Class || noop).prototype, function(fn, name){
+ behavior[name] = bind(instance, fn);
+ });
+ (Class || noop).call(instance);
}
+
});
if (!parent.$root) {
diff --git a/src/directives.js b/src/directives.js
index 4f2916da..d1b1dba3 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -4,6 +4,17 @@ angularDirective("ng-init", function(expression){
};
});
+angularDirective("ng-controller", function(expression){
+ return function(element){
+ var controller = getter(window, expression, true) || getter(this, expression, true);
+ if (!controller)
+ throw "Can not find '"+expression+"' controller.";
+ if (!isFunction(controller))
+ throw "Reference '"+expression+"' is not a class.";
+ this.$become(controller);
+ };
+});
+
angularDirective("ng-eval", function(expression){
return function(element){
this.$onEval(expression, element);
diff --git a/src/jqLite.js b/src/jqLite.js
index 331db68d..9aa4f2c7 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -115,7 +115,8 @@ JQLite.prototype = {
remove: function() {
this.dealoc();
- this[0].parentNode.removeChild(this[0]);
+ var parentNode = this[0].parentNode;
+ if (parentNode) parentNode.removeChild(this[0]);
},
removeAttr: function(name) {
--
cgit v1.2.3
From ee327a1f4f75f57c2a2c6166520c092d4942ffe0 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Tue, 6 Apr 2010 14:04:08 -0700
Subject: few fixes to make tests pass with jquery
---
src/jqLite.js | 1 +
1 file changed, 1 insertion(+)
(limited to 'src')
diff --git a/src/jqLite.js b/src/jqLite.js
index 9aa4f2c7..e9407987 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -92,6 +92,7 @@ JQLite.prototype = {
});
},
+ //TODO: remove
trigger: function(type) {
var evnt = document.createEvent('MouseEvent');
evnt.initMouseEvent(type, true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
--
cgit v1.2.3
From 0df93fd49c1687b2eddaa79faa1c0adbef82bf72 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 7 Apr 2010 10:17:15 -0700
Subject: clean up, fixes for app
---
src/Angular.js | 17 ++-
src/Compiler.js | 2 +-
src/Filters.js | 320 -----------------------------------------------------
src/Formatters.js | 23 ----
src/Scope.js | 2 +-
src/Validators.js | 113 -------------------
src/Widgets.js | 204 ----------------------------------
src/angular.prefix | 2 +-
src/angular.suffix | 8 ++
src/directives.js | 1 +
src/filters.js | 320 +++++++++++++++++++++++++++++++++++++++++++++++++++++
src/formatters.js | 23 ++++
src/validators.js | 113 +++++++++++++++++++
src/widgets.js | 229 ++++++++++++++++++++++++++++++++++++++
14 files changed, 713 insertions(+), 664 deletions(-)
delete mode 100644 src/Filters.js
delete mode 100644 src/Formatters.js
delete mode 100644 src/Validators.js
delete mode 100644 src/Widgets.js
create mode 100644 src/filters.js
create mode 100644 src/formatters.js
create mode 100644 src/validators.js
create mode 100644 src/widgets.js
(limited to 'src')
diff --git a/src/Angular.js b/src/Angular.js
index 2d67b2cb..3b5e1c90 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -102,7 +102,7 @@ function isTextNode(node) { return nodeName(node) == '#text'; }
function lowercase(value){ return isString(value) ? value.toLowerCase() : value; }
function uppercase(value){ return isString(value) ? value.toUpperCase() : value; }
function trim(value) { return isString(value) ? value.replace(/^\s*/, '').replace(/\s*$/, '') : value; }
-function nodeName(element) { return (element[0] || element || {}).nodeName; }
+function nodeName(element) { return (element[0] || element).nodeName; }
function map(obj, iterator, context) {
var results = [];
foreach(obj, function(value, index, list) {
@@ -274,6 +274,8 @@ function escapeAttr(html) {
}
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)));
@@ -347,3 +349,16 @@ function angularInit(config){
scope.$init();
}
}
+
+function angularJsConfig(document) {
+ var filename = /(.*)\/angular(-(.*))?.js(#(.*))?/,
+ scripts = document.getElementsByTagName("SCRIPT"),
+ match;
+ for(var j = 0; j < scripts.length; j++) {
+ match = (scripts[j].src || "").match(filename);
+ if (match) {
+ return match[5];
+ }
+ }
+ return "";
+}
diff --git a/src/Compiler.js b/src/Compiler.js
index 67c22461..ae2bcdb6 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -1,5 +1,5 @@
/**
-= * Template provides directions an how to bind to a given element.
+ * Template provides directions an how to bind to a given element.
* It contains a list of init functions which need to be called to
* bind to a new instance of elements. It also provides a list
* of child paths which contain child templates
diff --git a/src/Filters.js b/src/Filters.js
deleted file mode 100644
index dac8d31d..00000000
--- a/src/Filters.js
+++ /dev/null
@@ -1,320 +0,0 @@
-angularFilter.Meta = function(obj){
- if (obj) {
- for ( var key in obj) {
- this[key] = obj[key];
- }
- }
-};
-angularFilter.Meta.get = function(obj, attr){
- attr = attr || 'text';
- switch(typeof obj) {
- case "string":
- return attr == "text" ? obj : undefined;
- case "object":
- if (obj && typeof obj[attr] !== "undefined") {
- return obj[attr];
- }
- return undefined;
- default:
- return obj;
- }
-};
-
-var angularFilterGoogleChartApi;
-
-foreach({
- 'currency': function(amount){
- jQuery(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) {
- jQuery(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 = new angularFilter.Meta({
- text:text,
- url:url,
- html: '' + text + '',
- trackingNo:trackingNo});
- }
- });
- });
- if (returnValue)
- return returnValue;
- else if (trackingNo)
- return noMatch || new angularFilter.Meta({text:trackingNo + " is not recognized"});
- else
- return null;
- };})(),
-
- 'link': function(obj, title) {
- var text = title || angularFilter.Meta.get(obj);
- var url = angularFilter.Meta.get(obj, "url") || angularFilter.Meta.get(obj);
- if (url) {
- if (angular.validator.email(url) === null) {
- url = "mailto:" + url;
- }
- var html = '' + text + '';
- return new angularFilter.Meta({text:text, url:url, html:html});
- }
- 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 = "";
- if (width) {
- style = ' style="max-width: ' + width +
- 'px; max-height: ' + (height || width) + 'px;"';
- }
- return new angularFilter.Meta({url:obj.url, text:obj.url,
- html:'' +
- '' +
+ '
' +
'' +
'' +
'
');
- this.console = this.body.find(".console");
- this.testFrame = this.body.find("iframe");
- this.console.find(".run").live("click", function(){
- jQuery(this).parent().find('.log').toggle();
- });
- },
-
-
- runScenarios:function(){
- var runner = new scenario.Runner(this.console, this.testFrame);
- _.stepper(this.scenarios, function(next, scenarioObj, name){
- new scenario.Scenario(name, scenarioObj).run(runner, next);
- }, function(){
- }
- );
- }
-};
-
-scenario.Runner = function(console, frame){
- this.console = console;
- this.current = null;
- this.tests = [];
- this.frame = frame;
-};
-scenario.Runner.prototype = {
- start:function(name){
- var current = this.current = {
- name:name,
- start:new Date().getTime(),
- scenario:jQuery('')
+ var console = body.find('#runner .console');
+ this.testFrame = body.find('#testView iframe');
+ this.testWindow = this.testFrame[0].contentWindow;
+ this.beginSpec = function(name){
+ var specElement = jQuery('');
+ var stepContainer = jQuery('' +
- '.' +
- '.' +
- '.' +
- '').find(".run");
- current.log = current.scenario.append('').find(".log");
- current.run.find(".name").text(name);
- this.tests.push(current);
- this.console.append(current.scenario);
- },
- end:function(name){
- var current = this.current;
- var run = current.run;
- this.current = null;
- current.end = new Date().getTime();
- current.time = current.end - current.start;
- run.find(".time").text(current.time);
- run.find(".state").text(current.error ? "FAIL" : "PASS");
- run.addClass(current.error ? "fail" : "pass");
- if (current.error)
- run.find(".run").append('').text(current.error);
- current.scenario.find(".log").hide();
+ this.execute("widgets: it should verify that basic widgets work");
},
- log:function(level) {
- var buf = [];
- for ( var i = 1; i < arguments.length; i++) {
- var arg = arguments[i];
- buf.push(typeof arg == "string" ?arg:toJson(arg));
- }
- var log = jQuery('');
- log.text(buf.join(" "));
- this.current.log.append(log);
- this.console.scrollTop(this.console[0].scrollHeight);
- if (level == "error")
- this.current.error = buf.join(" ");
- }
-};
-scenario.Scenario = function(name, scenario){
- this.name = name;
- this.scenario = scenario;
-};
-scenario.Scenario.prototype = {
- run:function(runner, callback) {
- var self = this;
- _.stepper(this.scenario, function(next, steps, name){
- if (name.charAt(0) == '$') {
- next();
- } else {
- runner.start(self.name + "::" + name);
- var allSteps = (self.scenario.$before||[]).concat(steps);
- _.stepper(allSteps, function(next, step){
- self.executeStep(runner, step, next);
- }, function(){
- runner.end();
- next();
- });
- }
- }, callback);
+ addStep: function(name, step) {
+ this.currentSpec.steps.push({name:name, fn:step});
},
-
- verb:function(step){
- var fn = null;
- if (!step) fn = function (){ throw "Step is null!"; };
- else if (step.Given) fn = scenario.GIVEN[step.Given];
- else if (step.When) fn = scenario.WHEN[step.When];
- else if (step.Then) fn = scenario.THEN[step.Then];
- return fn || function (){
- throw "ERROR: Need Given/When/Then got: " + toJson(step);
+ execute: function(name, callback) {
+ var spec = this.specs[name],
+ result = {
+ passed: false,
+ failed: false,
+ finished: false,
+ fail: function(error) {
+ result.passed = false;
+ result.failed = true;
+ result.error = error;
+ result.log(angular.isString(error) ? error : angular.toJson(error));
+ }
+ };
+ specThis = {
+ result: result,
+ testWindow: this.testWindow,
+ testFrame: this.testFrame
};
- },
-
-
- context: function(runner) {
- var frame = runner.frame;
- var window = frame[0].contentWindow;
- var document;
- if (window.jQuery)
- document = window.jQuery(window.document);
- var context = {
- frame:frame,
- window:window,
- log:_.bind(runner.log, runner, "info"),
- document:document,
- assert:function(element, path){
- if (element.size() != 1) {
- throw "Expected to find '1' found '"+
- element.size()+"' for '"+path+"'.";
- }
- return element;
- },
- element:function(path){
- var exp = path.replace("{{","[ng-bind=").replace("}}", "]");
- var element = document.find(exp);
- return context.assert(element, path);
- }
- };
- return context;
- },
-
-
- executeStep:function(runner, step, callback) {
- if (!step) {
- callback();
- return;
- }
- runner.log("info", toJson(step));
- var fn = this.verb(step);
- var context = this.context(runner);
- _.extend(context, step);
- try {
- (fn.call(context)||function(c){c();})(callback);
- } catch (e) {
- runner.log("error", "ERROR: " + toJson(e));
- }
+ var beginStep = this.beginSpec(name);
+ spec.nextStepIndex = 0;
+ function done() {
+ result.finished = true;
+ (callback||angular.noop).call(specThis);
+ }
+ function next(){
+ var step = spec.steps[spec.nextStepIndex];
+ if (step) {
+ spec.nextStepIndex ++;
+ result.log = beginStep(step.name);
+ try {
+ step.fn.call(specThis, next);
+ } catch (e) {
+ result.fail(e);
+ done();
+ }
+ } else {
+ result.passed = !result.failed;
+ done();
+ }
+ };
+ next();
+ return specThis;
}
-};
+};
\ No newline at end of file
diff --git a/src/scenario/Steps.js b/src/scenario/Steps.js
deleted file mode 100644
index ffe75933..00000000
--- a/src/scenario/Steps.js
+++ /dev/null
@@ -1,57 +0,0 @@
-angular.scenario.GIVEN = {
- browser:function(){
- var self = this;
- if (jQuery.browser.safari && this.frame.attr('src') == this.at) {
- this.window.location.reload();
- } else {
- this.frame.attr('src', this.at);
- }
- return function(done){
- self.frame.load(function(){
- self.frame.unbind();
- done();
- });
- };
- },
- dataset:function(){
- this.frame.name="$DATASET:" + toJson({dataset:this.dataset});
- }
-};
-angular.scenario.WHEN = {
- enter:function(){
- var element = this.element(this.at);
- element.attr('value', this.text);
- element.change();
- },
- click:function(){
- var element = this.element(this.at);
- var input = element[0];
- // emulate the browser behavior which causes it
- // to be overridden at the end.
- var checked = input.checked = !input.checked;
- element.trigger('click');
- input.checked = checked;
- },
- select:function(){
- var element = this.element(this.at);
- var path = "option[value=" + this.option + "]";
- var option = this.assert(element.find(path));
- option[0].selected = !option[0].selected;
- element.change();
- }
-};
-angular.scenario.THEN = {
- text:function(){
- var element = this.element(this.at);
- if (typeof this.should_be != undefined ) {
- var should_be = this.should_be;
- if (_.isArray(this.should_be))
- should_be = JSON.stringify(should_be);
- if (element.text() != should_be)
- throw "Expected " + should_be +
- " but was " + element.text() + ".";
- }
- },
- drainRequestQueue:function(){
- }
-};
diff --git a/src/scenario/_namespace.js b/src/scenario/_namespace.js
deleted file mode 100644
index 7da3a5d8..00000000
--- a/src/scenario/_namespace.js
+++ /dev/null
@@ -1,6 +0,0 @@
-if (!angular) var angular = window['angular'] = {};
-if (!angular['scenario']) var angularScenario = angular['scenario'] = {};
-if (!angular['scenarioDef']) var scenarioDef = angular['scenarioDef'] = {};
-if (!angular['scenario']['GIVEN']) angularScenario['GIVEN'] = {};
-if (!angular['scenario']['WHEN']) angularScenario['WHEN'] = {};
-if (!angular['scenario']['THEN']) angularScenario['THEN'] = {};
diff --git a/src/scenario/bootstrap.js b/src/scenario/bootstrap.js
index 169f1860..81272bdd 100644
--- a/src/scenario/bootstrap.js
+++ b/src/scenario/bootstrap.js
@@ -19,22 +19,8 @@
}
window.onload = function(){
- if (!_.stepper) {
- _.stepper = function(collection, iterator, done){
- var keys = _.keys(collection);
- function next() {
- if (keys.length) {
- var key = keys.shift();
- iterator(next, collection[key], key);
- } else {
- (done||_.identity)();
- }
- }
- next();
- };
- }
_.defer(function(){
- new angular.scenario.SuiteRunner(angular.scenarioDef, jQuery(document.body)).run();
+ $scenarioRunner.run(jQuery(document.body));
});
(onLoadDelegate||function(){})();
};
@@ -42,8 +28,7 @@
addScript("../../lib/underscore/underscore.js");
addScript("../../lib/jquery/jquery-1.4.2.js");
addScript("../angular-bootstrap.js");
- addScript("_namespace.js");
- addScript("Steps.js");
addScript("Runner.js");
+ document.write('');
})(window.onload);
--
cgit v1.2.3
From e3368e12a6207706d8a08b18f9958db3b86ca4e5 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 20 May 2010 16:55:47 -0700
Subject: semi working state
---
src/scenario/Runner.js | 63 +++++++++++++++++++++++++++++++-------------------
1 file changed, 39 insertions(+), 24 deletions(-)
(limited to 'src')
diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
index eeb4330d..970d0c66 100644
--- a/src/scenario/Runner.js
+++ b/src/scenario/Runner.js
@@ -20,8 +20,8 @@ angular.scenario.Runner = function(scope){
body();
self.currentSpec = null;
};
- this.beginSpec = function returnNoop(){
- return returnNoop;
+ this.logger = function returnNoop(){
+ return angular.extend(returnNoop, {close:angular.noop, fail:angular.noop});;
};
};
@@ -29,33 +29,45 @@ angular.scenario.Runner.prototype = {
run: function(body){
body.append(
'
' +
- '
' +
'' +
'' +
'
');
var console = body.find('#runner .console');
+ console.find('li').live('click', function(){
+ jQuery(this).toggleClass('collapsed');
+ });
this.testFrame = body.find('#testView iframe');
this.testWindow = this.testFrame[0].contentWindow;
- this.beginSpec = function(name){
- var specElement = jQuery('');
- var stepContainer = jQuery('' +
'' +
@@ -68,7 +70,19 @@ angular.scenario.Runner.prototype = {
};
}
this.logger = logger(console);
- this.execute("widgets: it should verify that basic widgets work");
+ var specNames = [];
+ angular.foreach(this.specs, function(spec, name){
+ specNames.push(name);
+ }, this);
+ specNames.sort();
+ var self = this;
+ function callback(){
+ var next = specNames.shift();
+ if(next) {
+ self.execute(next, callback);
+ }
+ };
+ callback();
},
addStep: function(name, step) {
@@ -102,21 +116,21 @@ angular.scenario.Runner.prototype = {
}
function next(){
var step = spec.steps[spec.nextStepIndex];
- (result.log || {close:angular.noop}).close();
- result.log = null;
- if (step) {
- spec.nextStepIndex ++;
- result.log = stepLogger('step', step.name);
- try {
- step.fn.call(specThis, next);
- } catch (e) {
- result.fail(e);
- done();
- }
- } else {
- result.passed = !result.failed;
+ (result.log || {close:angular.noop}).close();
+ result.log = null;
+ if (step) {
+ spec.nextStepIndex ++;
+ result.log = stepLogger('step', step.name);
+ try {
+ step.fn.call(specThis, next);
+ } catch (e) {
+ result.fail(e);
done();
}
+ } else {
+ result.passed = !result.failed;
+ done();
+ }
};
next();
return specThis;
diff --git a/src/scenario/bootstrap.js b/src/scenario/bootstrap.js
index 81272bdd..51d24c38 100644
--- a/src/scenario/bootstrap.js
+++ b/src/scenario/bootstrap.js
@@ -20,7 +20,7 @@
window.onload = function(){
_.defer(function(){
- $scenarioRunner.run(jQuery(document.body));
+ $scenarioRunner.run(jQuery(window.document.body));
});
(onLoadDelegate||function(){})();
};
@@ -29,6 +29,8 @@
addScript("../../lib/jquery/jquery-1.4.2.js");
addScript("../angular-bootstrap.js");
addScript("Runner.js");
- document.write('');
+ document.write('');
})(window.onload);
--
cgit v1.2.3
From 3fab5d9879272b9f991a67c8135754f00c055834 Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Mon, 24 May 2010 15:25:30 -0700
Subject: added error handling on scenario definition
---
src/scenario/DSL.js | 47 +++++++++++++++++++++++++++++++++++++++++++++++
src/scenario/Runner.js | 15 ++++++++++++---
src/scenario/bootstrap.js | 1 +
3 files changed, 60 insertions(+), 3 deletions(-)
create mode 100644 src/scenario/DSL.js
(limited to 'src')
diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
new file mode 100644
index 00000000..4bc21d6c
--- /dev/null
+++ b/src/scenario/DSL.js
@@ -0,0 +1,47 @@
+angular.scenario.dsl.browser = {
+ navigateTo: function(url){
+ $scenario.addStep('Navigate to: ' + url, function(done){
+ var self = this;
+ self.testFrame.load(function(){
+ self.testFrame.unbind();
+ self.testDocument = jQuery(self.testWindow.document);
+ done();
+ });
+ if (this.testFrame.attr('src') == url) {
+ this.testWindow.location.reload();
+ } else {
+ this.testFrame.attr('src', url);
+ }
+ });
+ }
+};
+
+angular.scenario.dsl.input = function(selector) {
+ return {
+ enter: function(value){
+ $scenario.addStep("Set input text of '" + selector + "' to value '" +
+ value + "'", function(done){
+ var input = this.testDocument.find('input[name=' + selector + ']');
+ input.val(value);
+ input.trigger('change');
+ this.testWindow.angular.element(input[0]).trigger('change');
+ done();
+ });
+ }
+ };
+};
+
+angular.scenario.dsl.expect = function(selector) {
+ return {
+ toEqual: function(expected) {
+ $scenario.addStep("Expect that " + selector + " equals '" + expected + "'", function(done){
+ var attrName = selector.substring(2, selector.length - 2);
+ var binding = this.testDocument.find('span[ng-bind=' + attrName + ']');
+ if (binding.text() != expected) {
+ this.result.fail("Expected '" + expected + "' but was '" + binding.text() + "'");
+ }
+ done();
+ });
+ }
+ };
+};
diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
index 9e20d394..003ce487 100644
--- a/src/scenario/Runner.js
+++ b/src/scenario/Runner.js
@@ -1,9 +1,11 @@
-angular['scenario'] = (angular['scenario'] = {});
+angular['scenario'] = (angular['scenario'] = {});
+angular.scenario['dsl'] = (angular.scenario['dsl'] = {});
angular.scenario.Runner = function(scope, jQuery){
var self = scope.$scenario = this;
this.scope = scope;
this.jQuery = jQuery;
+ angular.extend(scope, angular.scenario.dsl);
var specs = this.specs = {};
var path = [];
@@ -18,7 +20,13 @@ angular.scenario.Runner = function(scope, jQuery){
name: specName,
steps:[]
};
- body();
+ try {
+ body();
+ } catch(err) {
+ self.addStep(err.message || 'ERROR', function(){
+ throw err;
+ });
+ }
self.currentSpec = null;
};
this.logger = function returnNoop(){
@@ -55,6 +63,7 @@ angular.scenario.Runner.prototype = {
return angular.extend(logger(element), {
close: function(){
element.removeClass('running');
+ console.scrollTop(console[0].scrollHeight);
},
fail: function(){
element.removeClass('running');
@@ -66,7 +75,7 @@ angular.scenario.Runner.prototype = {
current = current.parent();
}
}
- });;
+ });
};
}
this.logger = logger(console);
diff --git a/src/scenario/bootstrap.js b/src/scenario/bootstrap.js
index 51d24c38..4c9cdc8d 100644
--- a/src/scenario/bootstrap.js
+++ b/src/scenario/bootstrap.js
@@ -29,6 +29,7 @@
addScript("../../lib/jquery/jquery-1.4.2.js");
addScript("../angular-bootstrap.js");
addScript("Runner.js");
+ addScript("DSL.js");
document.write('');
--
cgit v1.2.3
From 55c0767f16e60e77e9d1b4d46698ddbf343ed8b1 Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Mon, 24 May 2010 17:48:17 -0700
Subject: added dsl tests and select method
---
src/scenario/DSL.js | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index 4bc21d6c..842f7c7a 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -19,14 +19,24 @@ angular.scenario.dsl.browser = {
angular.scenario.dsl.input = function(selector) {
return {
enter: function(value){
- $scenario.addStep("Set input text of '" + selector + "' to value '" +
+ $scenario.addStep("Set input text of '" + selector + "' to '" +
value + "'", function(done){
var input = this.testDocument.find('input[name=' + selector + ']');
input.val(value);
- input.trigger('change');
this.testWindow.angular.element(input[0]).trigger('change');
done();
});
+ },
+ select: function(value){
+ $scenario.addStep("Select radio '" + selector + "' to '" +
+ value + "'", function(done){
+ var input = this.testDocument.
+ find(':radio[name$=@' + selector + '][value=' + value + ']');
+ var event = this.testWindow.document.createEvent('MouseEvent');
+ event.initMouseEvent('click', true, true, this.testWindow, 0,0,0,0,0, false, false, false, false, 0, null);
+ input[0].dispatchEvent(event);
+ done();
+ });
}
};
};
--
cgit v1.2.3
From 2cce1ffc15ae6483da9cf354f7a5d2d26317427e Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Tue, 25 May 2010 13:05:23 -0700
Subject: fixed collapsed issue
---
src/scenario/Runner.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
index 003ce487..8669f56b 100644
--- a/src/scenario/Runner.js
+++ b/src/scenario/Runner.js
@@ -57,12 +57,14 @@ angular.scenario.Runner.prototype = {
container = jQuery('