You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2014/01/09 15:03:44 UTC
[1/3] git commit: updated refs/heads/master to b9a87c8
Updated Branches:
refs/heads/master d13bff47c -> b9a87c875
Fauxton: Update Backbone to v1.1.0
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b058aefb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b058aefb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b058aefb
Branch: refs/heads/master
Commit: b058aefbaacff25f33175ce41133948249aef379
Parents: d13bff4
Author: Garren Smith <ga...@gmail.com>
Authored: Thu Jan 9 16:02:24 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Thu Jan 9 16:02:24 2014 +0200
----------------------------------------------------------------------
src/fauxton/assets/js/libs/backbone.js | 272 +++++++++++++++-------------
1 file changed, 142 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b058aefb/src/fauxton/assets/js/libs/backbone.js
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/js/libs/backbone.js b/src/fauxton/assets/js/libs/backbone.js
index 3512d42..58ec2ab 100644
--- a/src/fauxton/assets/js/libs/backbone.js
+++ b/src/fauxton/assets/js/libs/backbone.js
@@ -1,6 +1,7 @@
-// Backbone.js 1.0.0
+// Backbone.js 1.1.0
-// (c) 2010-2013 Jeremy Ashkenas, DocumentCloud Inc.
+// (c) 2010-2011 Jeremy Ashkenas, DocumentCloud Inc.
+// (c) 2011-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
// Backbone may be freely distributed under the MIT license.
// For all details and documentation:
// http://backbonejs.org
@@ -34,7 +35,7 @@
}
// Current version of the library. Keep in sync with `package.json`.
- Backbone.VERSION = '1.0.0';
+ Backbone.VERSION = '1.1.0';
// Require Underscore, if we're on the server, and it's not already present.
var _ = root._;
@@ -52,7 +53,7 @@
};
// Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option
- // will fake `"PUT"` and `"DELETE"` requests via the `_method` parameter and
+ // will fake `"PATCH"`, `"PUT"` and `"DELETE"` requests via the `_method` parameter and
// set a `X-Http-Method-Override` header.
Backbone.emulateHTTP = false;
@@ -111,7 +112,6 @@
this._events = {};
return this;
}
-
names = name ? [name] : _.keys(this._events);
for (i = 0, l = names.length; i < l; i++) {
name = names[i];
@@ -151,14 +151,15 @@
// Tell this object to stop listening to either specific events ... or
// to every object it's currently listening to.
stopListening: function(obj, name, callback) {
- var listeners = this._listeners;
- if (!listeners) return this;
- var deleteListener = !name && !callback;
- if (typeof name === 'object') callback = this;
- if (obj) (listeners = {})[obj._listenerId] = obj;
- for (var id in listeners) {
- listeners[id].off(name, callback, this);
- if (deleteListener) delete this._listeners[id];
+ var listeningTo = this._listeningTo;
+ if (!listeningTo) return this;
+ var remove = !name && !callback;
+ if (!callback && typeof name === 'object') callback = this;
+ if (obj) (listeningTo = {})[obj._listenId] = obj;
+ for (var id in listeningTo) {
+ obj = listeningTo[id];
+ obj.off(name, callback, this);
+ if (remove || _.isEmpty(obj._events)) delete this._listeningTo[id];
}
return this;
}
@@ -215,10 +216,10 @@
// listening to.
_.each(listenMethods, function(implementation, method) {
Events[method] = function(obj, name, callback) {
- var listeners = this._listeners || (this._listeners = {});
- var id = obj._listenerId || (obj._listenerId = _.uniqueId('l'));
- listeners[id] = obj;
- if (typeof name === 'object') callback = this;
+ var listeningTo = this._listeningTo || (this._listeningTo = {});
+ var id = obj._listenId || (obj._listenId = _.uniqueId('l'));
+ listeningTo[id] = obj;
+ if (!callback && typeof name === 'object') callback = this;
obj[implementation](name, callback, this);
return this;
};
@@ -243,24 +244,18 @@
// Create a new model with the specified attributes. A client id (`cid`)
// is automatically generated and assigned for you.
var Model = Backbone.Model = function(attributes, options) {
- var defaults;
var attrs = attributes || {};
options || (options = {});
this.cid = _.uniqueId('c');
this.attributes = {};
- _.extend(this, _.pick(options, modelOptions));
+ if (options.collection) this.collection = options.collection;
if (options.parse) attrs = this.parse(attrs, options) || {};
- if (defaults = _.result(this, 'defaults')) {
- attrs = _.defaults({}, attrs, defaults);
- }
+ attrs = _.defaults({}, attrs, _.result(this, 'defaults'));
this.set(attrs, options);
this.changed = {};
this.initialize.apply(this, arguments);
};
- // A list of options to be attached directly to the model, if provided.
- var modelOptions = ['url', 'urlRoot', 'collection'];
-
// Attach all inheritable methods to the Model prototype.
_.extend(Model.prototype, Events, {
@@ -456,13 +451,16 @@
(attrs = {})[key] = val;
}
- // If we're not waiting and attributes exist, save acts as `set(attr).save(null, opts)`.
- if (attrs && (!options || !options.wait) && !this.set(attrs, options)) return false;
-
options = _.extend({validate: true}, options);
- // Do not persist invalid models.
- if (!this._validate(attrs, options)) return false;
+ // If we're not waiting and attributes exist, save acts as
+ // `set(attr).save(null, opts)` with validation. Otherwise, check if
+ // the model will be valid when the attributes, if any, are set.
+ if (attrs && !options.wait) {
+ if (!this.set(attrs, options)) return false;
+ } else {
+ if (!this._validate(attrs, options)) return false;
+ }
// Set temporary attributes if `{wait: true}`.
if (attrs && options.wait) {
@@ -563,7 +561,7 @@
attrs = _.extend({}, this.attributes, attrs);
var error = this.validationError = this.validate(attrs, options) || null;
if (!error) return true;
- this.trigger('invalid', this, error, _.extend(options || {}, {validationError: error}));
+ this.trigger('invalid', this, error, _.extend(options, {validationError: error}));
return false;
}
@@ -596,7 +594,6 @@
// its models in sort order, as they're added and removed.
var Collection = Backbone.Collection = function(models, options) {
options || (options = {});
- if (options.url) this.url = options.url;
if (options.model) this.model = options.model;
if (options.comparator !== void 0) this.comparator = options.comparator;
this._reset();
@@ -606,7 +603,7 @@
// Default options for `Collection#set`.
var setOptions = {add: true, remove: true, merge: true};
- var addOptions = {add: true, merge: false, remove: false};
+ var addOptions = {add: true, remove: false};
// Define the Collection's inheritable methods.
_.extend(Collection.prototype, Events, {
@@ -632,16 +629,17 @@
// Add a model, or list of models to the set.
add: function(models, options) {
- return this.set(models, _.defaults(options || {}, addOptions));
+ return this.set(models, _.extend({merge: false}, options, addOptions));
},
// Remove a model, or a list of models from the set.
remove: function(models, options) {
- models = _.isArray(models) ? models.slice() : [models];
+ var singular = !_.isArray(models);
+ models = singular ? [models] : _.clone(models);
options || (options = {});
var i, l, index, model;
for (i = 0, l = models.length; i < l; i++) {
- model = this.get(models[i]);
+ model = models[i] = this.get(models[i]);
if (!model) continue;
delete this._byId[model.id];
delete this._byId[model.cid];
@@ -654,7 +652,7 @@
}
this._removeReference(model);
}
- return this;
+ return singular ? models[0] : models;
},
// Update a collection by `set`-ing a new list of models, adding new ones,
@@ -662,31 +660,45 @@
// already exist in the collection, as necessary. Similar to **Model#set**,
// the core operation for updating the data contained by the collection.
set: function(models, options) {
- options = _.defaults(options || {}, setOptions);
+ options = _.defaults({}, options, setOptions);
if (options.parse) models = this.parse(models, options);
- if (!_.isArray(models)) models = models ? [models] : [];
- var i, l, model, attrs, existing, sort;
+ var singular = !_.isArray(models);
+ models = singular ? (models ? [models] : []) : _.clone(models);
+ var i, l, id, model, attrs, existing, sort;
var at = options.at;
+ var targetModel = this.model;
var sortable = this.comparator && (at == null) && options.sort !== false;
var sortAttr = _.isString(this.comparator) ? this.comparator : null;
var toAdd = [], toRemove = [], modelMap = {};
+ var add = options.add, merge = options.merge, remove = options.remove;
+ var order = !sortable && add && remove ? [] : false;
// Turn bare objects into model references, and prevent invalid models
// from being added.
for (i = 0, l = models.length; i < l; i++) {
- if (!(model = this._prepareModel(models[i], options))) continue;
+ attrs = models[i];
+ if (attrs instanceof Model) {
+ id = model = attrs;
+ } else {
+ id = attrs[targetModel.prototype.idAttribute];
+ }
// If a duplicate is found, prevent it from being added and
// optionally merge it into the existing model.
- if (existing = this.get(model)) {
- if (options.remove) modelMap[existing.cid] = true;
- if (options.merge) {
- existing.set(model.attributes, options);
+ if (existing = this.get(id)) {
+ if (remove) modelMap[existing.cid] = true;
+ if (merge) {
+ attrs = attrs === model ? model.attributes : attrs;
+ if (options.parse) attrs = existing.parse(attrs, options);
+ existing.set(attrs, options);
if (sortable && !sort && existing.hasChanged(sortAttr)) sort = true;
}
+ models[i] = existing;
- // This is a new model, push it to the `toAdd` list.
- } else if (options.add) {
+ // If this is a new, valid model, push it to the `toAdd` list.
+ } else if (add) {
+ model = models[i] = this._prepareModel(attrs, options);
+ if (!model) continue;
toAdd.push(model);
// Listen to added models' events, and index models for lookup by
@@ -695,10 +707,11 @@
this._byId[model.cid] = model;
if (model.id != null) this._byId[model.id] = model;
}
+ if (order) order.push(existing || model);
}
// Remove nonexistent models if appropriate.
- if (options.remove) {
+ if (remove) {
for (i = 0, l = this.length; i < l; ++i) {
if (!modelMap[(model = this.models[i]).cid]) toRemove.push(model);
}
@@ -706,29 +719,35 @@
}
// See if sorting is needed, update `length` and splice in new models.
- if (toAdd.length) {
+ if (toAdd.length || (order && order.length)) {
if (sortable) sort = true;
this.length += toAdd.length;
if (at != null) {
- splice.apply(this.models, [at, 0].concat(toAdd));
+ for (i = 0, l = toAdd.length; i < l; i++) {
+ this.models.splice(at + i, 0, toAdd[i]);
+ }
} else {
- push.apply(this.models, toAdd);
+ if (order) this.models.length = 0;
+ var orderedModels = order || toAdd;
+ for (i = 0, l = orderedModels.length; i < l; i++) {
+ this.models.push(orderedModels[i]);
+ }
}
}
// Silently sort the collection if appropriate.
if (sort) this.sort({silent: true});
- if (options.silent) return this;
-
- // Trigger `add` events.
- for (i = 0, l = toAdd.length; i < l; i++) {
- (model = toAdd[i]).trigger('add', model, this, options);
+ // Unless silenced, it's time to fire all appropriate add/sort events.
+ if (!options.silent) {
+ for (i = 0, l = toAdd.length; i < l; i++) {
+ (model = toAdd[i]).trigger('add', model, this, options);
+ }
+ if (sort || (order && order.length)) this.trigger('sort', this, options);
}
-
- // Trigger `sort` if the collection was sorted.
- if (sort) this.trigger('sort', this, options);
- return this;
+
+ // Return the added (or merged) model (or models).
+ return singular ? models[0] : models;
},
// When you have more items than you want to add or remove individually,
@@ -742,16 +761,14 @@
}
options.previousModels = this.models;
this._reset();
- this.add(models, _.extend({silent: true}, options));
+ models = this.add(models, _.extend({silent: true}, options));
if (!options.silent) this.trigger('reset', this, options);
- return this;
+ return models;
},
// Add a model to the end of the collection.
push: function(model, options) {
- model = this._prepareModel(model, options);
- this.add(model, _.extend({at: this.length}, options));
- return model;
+ return this.add(model, _.extend({at: this.length}, options));
},
// Remove a model from the end of the collection.
@@ -763,9 +780,7 @@
// Add a model to the beginning of the collection.
unshift: function(model, options) {
- model = this._prepareModel(model, options);
- this.add(model, _.extend({at: 0}, options));
- return model;
+ return this.add(model, _.extend({at: 0}, options));
},
// Remove a model from the beginning of the collection.
@@ -776,14 +791,14 @@
},
// Slice out a sub-array of models from the collection.
- slice: function(begin, end) {
- return this.models.slice(begin, end);
+ slice: function() {
+ return slice.apply(this.models, arguments);
},
// Get a model from the set by id.
get: function(obj) {
if (obj == null) return void 0;
- return this._byId[obj.id != null ? obj.id : obj.cid || obj];
+ return this._byId[obj.id] || this._byId[obj.cid] || this._byId[obj];
},
// Get the model at the given index.
@@ -827,16 +842,6 @@
return this;
},
- // Figure out the smallest index at which a model should be inserted so as
- // to maintain order.
- sortedIndex: function(model, value, context) {
- value || (value = this.comparator);
- var iterator = _.isFunction(value) ? value : function(model) {
- return model.get(value);
- };
- return _.sortedIndex(this.models, model, iterator, context);
- },
-
// Pluck an attribute from each model in the collection.
pluck: function(attr) {
return _.invoke(this.models, 'get', attr);
@@ -869,7 +874,7 @@
if (!options.wait) this.add(model, options);
var collection = this;
var success = options.success;
- options.success = function(resp) {
+ options.success = function(model, resp, options) {
if (options.wait) collection.add(model, options);
if (success) success(model, resp, options);
};
@@ -903,14 +908,12 @@
if (!attrs.collection) attrs.collection = this;
return attrs;
}
- options || (options = {});
+ options = options ? _.clone(options) : {};
options.collection = this;
var model = new this.model(attrs, options);
- if (!model._validate(attrs, options)) {
- this.trigger('invalid', this, attrs, options);
- return false;
- }
- return model;
+ if (!model.validationError) return model;
+ this.trigger('invalid', this, model.validationError, options);
+ return false;
},
// Internal method to sever a model's ties to a collection.
@@ -942,8 +945,8 @@
'inject', 'reduceRight', 'foldr', 'find', 'detect', 'filter', 'select',
'reject', 'every', 'all', 'some', 'any', 'include', 'contains', 'invoke',
'max', 'min', 'toArray', 'size', 'first', 'head', 'take', 'initial', 'rest',
- 'tail', 'drop', 'last', 'without', 'indexOf', 'shuffle', 'lastIndexOf',
- 'isEmpty', 'chain'];
+ 'tail', 'drop', 'last', 'without', 'difference', 'indexOf', 'shuffle',
+ 'lastIndexOf', 'isEmpty', 'chain'];
// Mix in each Underscore method as a proxy to `Collection#models`.
_.each(methods, function(method) {
@@ -982,7 +985,8 @@
// if an existing element is not provided...
var View = Backbone.View = function(options) {
this.cid = _.uniqueId('view');
- this._configure(options || {});
+ options || (options = {});
+ _.extend(this, _.pick(options, viewOptions));
this._ensureElement();
this.initialize.apply(this, arguments);
this.delegateEvents();
@@ -1001,7 +1005,7 @@
tagName: 'div',
// jQuery delegate for element lookup, scoped to DOM elements within the
- // current view. This should be prefered to global lookups where possible.
+ // current view. This should be preferred to global lookups where possible.
$: function(selector) {
return this.$el.find(selector);
},
@@ -1041,7 +1045,7 @@
//
// {
// 'mousedown .title': 'edit',
- // 'click .button': 'save'
+ // 'click .button': 'save',
// 'click .open': function(e) { ... }
// }
//
@@ -1079,16 +1083,6 @@
return this;
},
- // Performs the initial configuration of a View with a set of options.
- // Keys with special meaning *(e.g. model, collection, id, className)* are
- // attached directly to the view. See `viewOptions` for an exhaustive
- // list.
- _configure: function(options) {
- if (this.options) options = _.extend({}, _.result(this, 'options'), options);
- _.extend(this, _.pick(options, viewOptions));
- this.options = options;
- },
-
// Ensure that the View has a DOM element to render into.
// If `this.el` is a string, pass it through `$()`, take the first
// matching element, and re-assign it to `el`. Otherwise, create
@@ -1174,8 +1168,7 @@
// If we're sending a `PATCH` request, and we're in an old Internet Explorer
// that still has ActiveX enabled by default, override jQuery to use that
// for XHR instead. Remove this line when jQuery supports `PATCH` on IE8.
- if (params.type === 'PATCH' && window.ActiveXObject &&
- !(window.external && window.external.msActiveXFilteringEnabled)) {
+ if (params.type === 'PATCH' && noXhrPatch) {
params.xhr = function() {
return new ActiveXObject("Microsoft.XMLHTTP");
};
@@ -1187,6 +1180,8 @@
return xhr;
};
+ var noXhrPatch = typeof window !== 'undefined' && !!window.ActiveXObject && !(window.XMLHttpRequest && (new XMLHttpRequest).dispatchEvent);
+
// Map from CRUD to HTTP for our default `Backbone.sync` implementation.
var methodMap = {
'create': 'POST',
@@ -1275,7 +1270,7 @@
_routeToRegExp: function(route) {
route = route.replace(escapeRegExp, '\\$&')
.replace(optionalParam, '(?:$1)?')
- .replace(namedParam, function(match, optional){
+ .replace(namedParam, function(match, optional) {
return optional ? match : '([^\/]+)';
})
.replace(splatParam, '(.*?)');
@@ -1325,6 +1320,9 @@
// Cached regex for removing a trailing slash.
var trailingSlash = /\/$/;
+ // Cached regex for stripping urls of hash and query.
+ var pathStripper = /[?#].*$/;
+
// Has the history handling already been started?
History.started = false;
@@ -1349,7 +1347,7 @@
if (this._hasPushState || !this._wantsHashChange || forcePushState) {
fragment = this.location.pathname;
var root = this.root.replace(trailingSlash, '');
- if (!fragment.indexOf(root)) fragment = fragment.substr(root.length);
+ if (!fragment.indexOf(root)) fragment = fragment.slice(root.length);
} else {
fragment = this.getHash();
}
@@ -1365,7 +1363,7 @@
// Figure out the initial configuration. Do we need an iframe?
// Is pushState desired ... is it available?
- this.options = _.extend({}, {root: '/'}, this.options, options);
+ this.options = _.extend({root: '/'}, this.options, options);
this.root = this.options.root;
this._wantsHashChange = this.options.hashChange !== false;
this._wantsPushState = !!this.options.pushState;
@@ -1398,19 +1396,25 @@
var loc = this.location;
var atRoot = loc.pathname.replace(/[^\/]$/, '$&/') === this.root;
- // If we've started off with a route from a `pushState`-enabled browser,
- // but we're currently in a browser that doesn't support it...
- if (this._wantsHashChange && this._wantsPushState && !this._hasPushState && !atRoot) {
- this.fragment = this.getFragment(null, true);
- this.location.replace(this.root + this.location.search + '#' + this.fragment);
- // Return immediately as browser will do redirect to new url
- return true;
+ // Transition from hashChange to pushState or vice versa if both are
+ // requested.
+ if (this._wantsHashChange && this._wantsPushState) {
+
+ // If we've started off with a route from a `pushState`-enabled
+ // browser, but we're currently in a browser that doesn't support it...
+ if (!this._hasPushState && !atRoot) {
+ this.fragment = this.getFragment(null, true);
+ this.location.replace(this.root + this.location.search + '#' + this.fragment);
+ // Return immediately as browser will do redirect to new url
+ return true;
+
+ // Or if we've started out with a hash-based route, but we're currently
+ // in a browser where it could be `pushState`-based instead...
+ } else if (this._hasPushState && atRoot && loc.hash) {
+ this.fragment = this.getHash().replace(routeStripper, '');
+ this.history.replaceState({}, document.title, this.root + this.fragment + loc.search);
+ }
- // Or if we've started out with a hash-based route, but we're currently
- // in a browser where it could be `pushState`-based instead...
- } else if (this._wantsPushState && this._hasPushState && atRoot && loc.hash) {
- this.fragment = this.getHash().replace(routeStripper, '');
- this.history.replaceState({}, document.title, this.root + this.fragment + loc.search);
}
if (!this.options.silent) return this.loadUrl();
@@ -1439,21 +1443,20 @@
}
if (current === this.fragment) return false;
if (this.iframe) this.navigate(current);
- this.loadUrl() || this.loadUrl(this.getHash());
+ this.loadUrl();
},
// Attempt to load the current URL fragment. If a route succeeds with a
// match, returns `true`. If no defined routes matches the fragment,
// returns `false`.
- loadUrl: function(fragmentOverride) {
- var fragment = this.fragment = this.getFragment(fragmentOverride);
- var matched = _.any(this.handlers, function(handler) {
+ loadUrl: function(fragment) {
+ fragment = this.fragment = this.getFragment(fragment);
+ return _.any(this.handlers, function(handler) {
if (handler.route.test(fragment)) {
handler.callback(fragment);
return true;
}
});
- return matched;
},
// Save a fragment into the hash history, or replace the URL state if the
@@ -1465,11 +1468,20 @@
// you wish to modify the current URL without adding an entry to the history.
navigate: function(fragment, options) {
if (!History.started) return false;
- if (!options || options === true) options = {trigger: options};
- fragment = this.getFragment(fragment || '');
+ if (!options || options === true) options = {trigger: !!options};
+
+ var url = this.root + (fragment = this.getFragment(fragment || ''));
+
+ // GARREN -this line doesn't make any sense and removes query code. New release of Backbone
+ // Should fix this
+ // Strip the fragment of the query and hash for matching.
+ //fragment = fragment.replace(pathStripper, '');
+
if (this.fragment === fragment) return;
this.fragment = fragment;
- var url = this.root + fragment;
+
+ // Don't include a trailing slash on the root.
+ if (fragment === '' && url !== '/') url = url.slice(0, -1);
// If pushState is available, we use it to set the fragment as a real URL.
if (this._hasPushState) {
@@ -1492,7 +1504,7 @@
} else {
return this.location.assign(url);
}
- if (options.trigger) this.loadUrl(fragment);
+ if (options.trigger) return this.loadUrl(fragment);
},
// Update the hash location, either replacing the current entry, or adding
@@ -1560,7 +1572,7 @@
};
// Wrap an optional error callback with a fallback error event.
- var wrapError = function (model, options) {
+ var wrapError = function(model, options) {
var error = options.error;
options.error = function(resp) {
if (error) error(model, resp, options);
[3/3] git commit: updated refs/heads/master to b9a87c8
Posted by ga...@apache.org.
Fauxton: Update paginate to work with new backbone
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b9a87c87
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b9a87c87
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b9a87c87
Branch: refs/heads/master
Commit: b9a87c875ef0eef2f920781805d26b0dd14e7871
Parents: c894491
Author: Garren Smith <ga...@gmail.com>
Authored: Thu Jan 9 16:03:25 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Thu Jan 9 16:03:25 2014 +0200
----------------------------------------------------------------------
src/fauxton/app/modules/documents/routes.js | 11 +++--
src/fauxton/app/modules/documents/views.js | 57 +++---------------------
src/fauxton/app/modules/fauxton/base.js | 1 -
3 files changed, 13 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b9a87c87/src/fauxton/app/modules/documents/routes.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/routes.js b/src/fauxton/app/modules/documents/routes.js
index dbad6d0..435ed5e 100644
--- a/src/fauxton/app/modules/documents/routes.js
+++ b/src/fauxton/app/modules/documents/routes.js
@@ -297,10 +297,14 @@ function(app, FauxtonAPI, Documents, Databases) {
docOptions = app.getParams(),
ddoc = event.ddoc;
+ this.documentsView && this.documentsView.remove();
+
if (event.allDocs) {
- this.documentsView.collection = this.data.database.buildAllDocs(docOptions);
- this.documentsView.cleanup();
- return this.documentsView.forceRender();
+ this.data.database.buildAllDocs(docOptions);
+ this.documentsView = this.setView("#dashboard-lower-content", new Documents.Views.AllDocsList({
+ collection: this.data.database.allDocs
+ }));
+ return;
}
this.data.indexedDocs = new Documents.IndexCollection(null, {
@@ -310,7 +314,6 @@ function(app, FauxtonAPI, Documents, Databases) {
params: app.getParams()
});
- this.documentsView && this.documentsView.remove();
this.documentsView = this.setView("#dashboard-lower-content", new Documents.Views.AllDocsList({
database: this.data.database,
collection: this.data.indexedDocs,
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b9a87c87/src/fauxton/app/modules/documents/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index 1642f1f..05c86f8 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -31,56 +31,6 @@ define([
function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColumns) {
var Views = {};
- // Views.Tabs = FauxtonAPI.View.extend({
- // template: "templates/documents/tabs",
- // initialize: function(options){
- // this.collection = options.collection;
- // this.database = options.database;
- // this.active_id = options.active_id;
- // },
-
- // events: {
- // "click #delete-database": "delete_database"
- // },
-
- // serialize: function () {
- // return {
- // // TODO make this not hard coded here
- // changes_url: '#' + this.database.url('changes'),
- // db_url: '#' + this.database.url('index') + '?limit=' + Databases.DocLimit,
- // };
- // },
-
- // beforeRender: function(manage) {
- // this.insertView("#search", new Views.SearchBox({
- // collection: this.collection,
- // database: this.database.id
- // }));
- // },
-
- // afterRender: function () {
- // if (this.active_id) {
- // this.$('.active').removeClass('active');
- // this.$('#'+this.active_id).addClass('active');
- // }
- // },
-
- // delete_database: function (event) {
- // event.preventDefault();
-
- // var result = confirm("Are you sure you want to delete this database?");
-
- // if (!result) { return; }
- // FauxtonAPI.addNotification({
- // msg: "Deleting your database...",
- // type: "error"
- // });
- // return this.database.destroy().done(function () {
- // app.router.navigate('#/_all_dbs', {trigger: true});
- // });
- // }
- // });
-
Views.SearchBox = FauxtonAPI.View.extend({
template: "templates/documents/search",
tagName: "form",
@@ -714,7 +664,9 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum
},
cleanup: function () {
+ //if (!this.pagination) { return; }
this.pagination.remove();
+ //this.pagination = null;
this.allDocsNumber.remove();
_.each(this.rows, function (row) {row.remove();});
},
@@ -722,7 +674,10 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum
beforeRender: function() {
var showNumbers = true;
- this.addPagination();
+ if (!this.pagination) {
+ this.addPagination();
+ }
+
this.insertView('#documents-pagination', this.pagination);
if (this.designDocs || this.collection.idxType === '_view' || this.collection.params.startkey === '"_design"') {
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b9a87c87/src/fauxton/app/modules/fauxton/base.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/fauxton/base.js b/src/fauxton/app/modules/fauxton/base.js
index 01c2928..cf6305c 100644
--- a/src/fauxton/app/modules/fauxton/base.js
+++ b/src/fauxton/app/modules/fauxton/base.js
@@ -20,7 +20,6 @@ define([
function(app, Backbone, resizeColumns) {
-
//resizeAnimation
app.resizeColumns = new resizeColumns({});
app.resizeColumns.onResizeHandler();
[2/3] git commit: updated refs/heads/master to b9a87c8
Posted by ga...@apache.org.
Fauxton: Update backbone.layoutmanager to V0.9.4
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c8944911
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c8944911
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c8944911
Branch: refs/heads/master
Commit: c8944911766816638682996eb6fd9efe890f3486
Parents: b058aef
Author: Garren Smith <ga...@gmail.com>
Authored: Thu Jan 9 16:02:58 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Thu Jan 9 16:02:58 2014 +0200
----------------------------------------------------------------------
.../assets/js/plugins/backbone.layoutmanager.js | 418 +++++++++----------
1 file changed, 199 insertions(+), 219 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c8944911/src/fauxton/assets/js/plugins/backbone.layoutmanager.js
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/js/plugins/backbone.layoutmanager.js b/src/fauxton/assets/js/plugins/backbone.layoutmanager.js
index b8296b4..c5d4a80 100644
--- a/src/fauxton/assets/js/plugins/backbone.layoutmanager.js
+++ b/src/fauxton/assets/js/plugins/backbone.layoutmanager.js
@@ -1,5 +1,5 @@
/*!
- * backbone.layoutmanager.js v0.9.1
+ * backbone.layoutmanager.js v0.9.4
* Copyright 2013, Tim Branyen (@tbranyen)
* backbone.layoutmanager.js may be freely distributed under the MIT license.
*/
@@ -24,30 +24,29 @@
// `window` object; in Node, it will be `global`.
var window = this;
-// Hoisted, referenced at the bottom of the source. This caches a list of all
-// LayoutManager options at definition time.
-var keys;
-
-// Maintain references to the two `Backbone.View` functions that are
-// overwritten so that they can be proxied.
-var _configure = Backbone.View.prototype._configure;
+// Maintain reference to the original constructor.
+var ViewConstructor = Backbone.View;
// Cache these methods for performance.
var aPush = Array.prototype.push;
var aConcat = Array.prototype.concat;
var aSplice = Array.prototype.splice;
+var trim = String.prototype.trim ?
+ _.bind(String.prototype.trim.call, String.prototype.trim) :
+ $.trim;
// LayoutManager is a wrapper around a `Backbone.View`.
+// Backbone.View.extend takes options (protoProps, staticProps)
var LayoutManager = Backbone.View.extend({
- _render: function(manage, options) {
+ _render: function() {
// Keep the view consistent between callbacks and deferreds.
var view = this;
// Shorthand the manager.
var manager = view.__manager__;
// Cache these properties.
- var beforeRender = options.beforeRender;
+ var beforeRender = view.beforeRender;
// Create a deferred instead of going off
- var def = options.deferred();
+ var def = view.deferred();
// Ensure all nested Views are properly scrubbed if re-rendering.
if (view.hasRendered) {
@@ -64,7 +63,7 @@ var LayoutManager = Backbone.View.extend({
view.trigger("beforeRender", view);
// Render!
- manage(view, options).render().then(function() {
+ view._viewRender(manager).render().then(function() {
// Complete this deferred once resolved.
def.resolve();
});
@@ -82,18 +81,142 @@ var LayoutManager = Backbone.View.extend({
// Return this intermediary promise.
return def.promise();
},
-
+
+ // This function is responsible for pairing the rendered template into the
+ // DOM element.
+ _applyTemplate: function(rendered, manager, def) {
+ // Actually put the rendered contents into the element.
+ if (_.isString(rendered)) {
+ // If no container is specified, we must replace the content.
+ if (manager.noel) {
+ rendered = $.parseHTML(rendered, true);
+
+ // Remove extra root elements.
+ this.$el.slice(1).remove();
+
+ // Swap out the View on the first top level element to avoid
+ // duplication.
+ this.$el.replaceWith(rendered);
+
+ // Don't delegate events here - we'll do that in resolve()
+ this.setElement(rendered, false);
+ } else {
+ this.html(this.$el, rendered);
+ }
+ }
+
+ // Resolve only after fetch and render have succeeded.
+ def.resolveWith(this, [this]);
+ },
+
+ // Creates a deferred and returns a function to call when finished.
+ // This gets passed to all _render methods. The `root` value here is passed
+ // from the `manage(this).render()` line in the `_render` function
+ _viewRender: function(manager) {
+ var url, contents, def;
+ var root = this;
+
+ // Once the template is successfully fetched, use its contents to proceed.
+ // Context argument is first, since it is bound for partial application
+ // reasons.
+ function done(context, template) {
+ // Store the rendered template someplace so it can be re-assignable.
+ var rendered;
+
+ // Trigger this once the render method has completed.
+ manager.callback = function(rendered) {
+ // Clean up asynchronous manager properties.
+ delete manager.isAsync;
+ delete manager.callback;
+
+ root._applyTemplate(rendered, manager, def);
+ };
+
+ // Ensure the cache is up-to-date.
+ LayoutManager.cache(url, template);
+
+ // Render the View into the el property.
+ if (template) {
+ rendered = root.renderTemplate.call(root, template, context);
+ }
+
+ // If the function was synchronous, continue execution.
+ if (!manager.isAsync) {
+ root._applyTemplate(rendered, manager, def);
+ }
+ }
+
+ return {
+ // This `render` function is what gets called inside of the View render,
+ // when `manage(this).render` is called. Returns a promise that can be
+ // used to know when the element has been rendered into its parent.
+ render: function() {
+ var context = root.serialize;
+ var template = root.template;
+
+ // Create a deferred specifically for fetching.
+ def = root.deferred();
+
+ // If data is a function, immediately call it.
+ if (_.isFunction(context)) {
+ context = context.call(root);
+ }
+
+ // Set the internal callback to trigger once the asynchronous or
+ // synchronous behavior has completed.
+ manager.callback = function(contents) {
+ // Clean up asynchronous manager properties.
+ delete manager.isAsync;
+ delete manager.callback;
+
+ done(context, contents);
+ };
+
+ // Set the url to the prefix + the view's template property.
+ if (typeof template === "string") {
+ url = root.prefix + template;
+ }
+
+ // Check if contents are already cached and if they are, simply process
+ // the template with the correct data.
+ if (contents = LayoutManager.cache(url)) {
+ done(context, contents, url);
+
+ return def;
+ }
+
+ // Fetch layout and template contents.
+ if (typeof template === "string") {
+ contents = root.fetchTemplate.call(root, root.prefix +
+ template);
+ // If the template is already a function, simply call it.
+ } else if (typeof template === "function") {
+ contents = template;
+ // If its not a string and not undefined, pass the value to `fetch`.
+ } else if (template != null) {
+ contents = root.fetchTemplate.call(root, template);
+ }
+
+ // If the function was synchronous, continue execution.
+ if (!manager.isAsync) {
+ done(context, contents);
+ }
+
+ return def;
+ }
+ };
+ },
+
// This named function allows for significantly easier debugging.
constructor: function Layout(options) {
- // Options may not always be passed to the constructor, this ensures it is
- // always an object.
- options = options || {};
-
// Grant this View superpowers.
- LayoutManager.setupView(this, options);
+ this.manage = true;
+
+ // Give this View access to all passed options as instance properties.
+ _.extend(this, options);
// Have Backbone set up the rest of this View.
- Backbone.View.call(this, options);
+ Backbone.View.apply(this, arguments);
},
// This method is used within specific methods to indicate that they should
@@ -122,8 +245,7 @@ var LayoutManager = Backbone.View.extend({
renderViews: function() {
var root = this;
var manager = root.__manager__;
- var options = root.getAllOptions();
- var newDeferred = options.deferred();
+ var newDeferred = root.deferred();
// Collect all promises from rendering the child views and wait till they
// all complete.
@@ -136,7 +258,7 @@ var LayoutManager = Backbone.View.extend({
// Once all child views have completed rendering, resolve parent deferred
// with the correct context.
- options.when(promises).then(function() {
+ root.when(promises).then(function() {
newDeferred.resolveWith(root, [root]);
});
@@ -239,7 +361,7 @@ var LayoutManager = Backbone.View.extend({
// Must definitely wrap any render method passed in or defaults to a
// typical render function `return layout(this).render()`.
setView: function(name, view, insert) {
- var manager, options, selector;
+ var manager, selector;
// Parent view, the one you are setting a View on.
var root = this;
@@ -261,18 +383,12 @@ var LayoutManager = Backbone.View.extend({
"Backbone.View instances.");
}
- // Assign options.
- options = view.getAllOptions();
-
// Add reference to the parentView.
manager.parent = root;
// Add reference to the placement selector used.
selector = manager.selector = root.sections[name] || name;
- // Call the `setup` method, since we now have a relationship created.
- _.result(view, "setup");
-
// Code path is less complex for Views that are not being inserted. Simply
// remove existing Views and bail out with the assignment.
if (!insert) {
@@ -280,7 +396,7 @@ var LayoutManager = Backbone.View.extend({
// into the parent.
if (view.hasRendered) {
// Apply the partial.
- options.partial(root.$el, view.$el, root.__manager__, manager);
+ view.partial(root.$el, view.$el, root.__manager__, manager);
}
// Ensure remove is called when swapping View's.
@@ -327,11 +443,10 @@ var LayoutManager = Backbone.View.extend({
// once all subviews and main view have been rendered into the view.el.
render: function() {
var root = this;
- var options = root.getAllOptions();
var manager = root.__manager__;
var parent = manager.parent;
var rentManager = parent && parent.__manager__;
- var def = options.deferred();
+ var def = root.deferred();
// Triggered once the render has succeeded.
function resolve() {
@@ -341,16 +456,16 @@ var LayoutManager = Backbone.View.extend({
_.each(root.views, function(views, selector) {
// Fragments aren't used on arrays of subviews.
if (_.isArray(views)) {
- options.htmlBatch(root, views, selector);
+ root.htmlBatch(root, views, selector);
}
});
// If there is a parent and we weren't attached to it via the previous
// method (single view), attach.
if (parent && !manager.insertedViaFragment) {
- if (!options.contains(parent.el, root.el)) {
+ if (!root.contains(parent.el, root.el)) {
// Apply the partial using parent's html() method.
- parent.getAllOptions().partial(parent.$el, root.$el, rentManager,
+ parent.partial(parent.$el, root.$el, rentManager,
manager);
}
}
@@ -377,7 +492,7 @@ var LayoutManager = Backbone.View.extend({
// and setting the hasRendered flag.
function completeRender() {
var console = window.console;
- var afterRender = options.afterRender;
+ var afterRender = root.afterRender;
if (afterRender) {
afterRender.call(root, root);
@@ -391,7 +506,7 @@ var LayoutManager = Backbone.View.extend({
if (manager.noel && root.$el.length > 1) {
// Do not display a warning while testing or if warning suppression
// is enabled.
- if (_.isFunction(console.warn) && !options.suppressWarnings) {
+ if (_.isFunction(console.warn) && !root.suppressWarnings) {
console.warn("`el: false` with multiple top level elements is " +
"not supported.");
@@ -420,11 +535,10 @@ var LayoutManager = Backbone.View.extend({
// Actually facilitate a render.
function actuallyRender() {
- var options = root.getAllOptions();
// The `_viewRender` method is broken out to abstract away from having
// too much code in `actuallyRender`.
- root._render(LayoutManager._viewRender, options).done(function() {
+ root._render().done(function() {
// If there are no children to worry about, complete the render
// instantly.
if (!_.keys(root.views).length) {
@@ -443,7 +557,7 @@ var LayoutManager = Backbone.View.extend({
// Mark each subview's manager so they don't attempt to attach by
// themselves. Return a single promise representing the entire
// render.
- return options.when(_.map(view, function(subView) {
+ return root.when(_.map(view, function(subView) {
subView.__manager__.insertedViaFragment = true;
return subView.render().__manager__.renderDeferred;
}));
@@ -456,7 +570,7 @@ var LayoutManager = Backbone.View.extend({
// Once all nested Views have been rendered, resolve this View's
// deferred.
- options.when(promises).done(resolve);
+ root.when(promises).done(resolve);
});
}
@@ -489,148 +603,14 @@ var LayoutManager = Backbone.View.extend({
// Call the original remove function.
return this._remove.apply(this, arguments);
- },
-
- // Merge instance and global options.
- getAllOptions: function() {
- // Instance overrides take precedence, fallback to prototype options.
- return _.extend({}, this, LayoutManager.prototype.options, this.options);
}
},
+
+// Static Properties
{
// Clearable cache.
_cache: {},
- // Creates a deferred and returns a function to call when finished.
- // This gets passed to all _render methods. The `root` value here is passed
- // from the `manage(this).render()` line in the `_render` function
- _viewRender: function(root, options) {
- var url, contents, def, renderedEl;
- var manager = root.__manager__;
-
- // This function is responsible for pairing the rendered template into
- // the DOM element.
- function applyTemplate(rendered) {
- // Actually put the rendered contents into the element.
- if (_.isString(rendered)) {
- // If no container is specified, we must replace the content.
- if (manager.noel) {
- // Trim off the whitespace, since the contents are passed into `$()`.
- rendered = $.trim(rendered);
-
- // Hold a reference to created element as replaceWith doesn't return
- // new el.
- renderedEl = $(rendered);
-
- // Remove extra root elements.
- root.$el.slice(1).remove();
-
- // Swap out the View on the first top level element to avoid
- // duplication.
- root.$el.replaceWith(renderedEl);
-
- // Don't delegate events here - we'll do that in resolve()
- root.setElement(renderedEl, false);
- } else {
- options.html(root.$el, rendered);
- }
- }
-
- // Resolve only after fetch and render have succeeded.
- def.resolveWith(root, [root]);
- }
-
- // Once the template is successfully fetched, use its contents to proceed.
- // Context argument is first, since it is bound for partial application
- // reasons.
- function done(context, contents) {
- // Store the rendered template someplace so it can be re-assignable.
- var rendered;
-
- // Trigger this once the render method has completed.
- manager.callback = function(rendered) {
- // Clean up asynchronous manager properties.
- delete manager.isAsync;
- delete manager.callback;
-
- applyTemplate(rendered);
- };
-
- // Ensure the cache is up-to-date.
- LayoutManager.cache(url, contents);
-
- // Render the View into the el property.
- if (contents) {
- rendered = options.renderTemplate.call(root, contents, context);
- }
-
- // If the function was synchronous, continue execution.
- if (!manager.isAsync) {
- applyTemplate(rendered);
- }
- }
-
- return {
- // This `render` function is what gets called inside of the View render,
- // when `manage(this).render` is called. Returns a promise that can be
- // used to know when the element has been rendered into its parent.
- render: function() {
- var context = root.serialize || options.serialize;
- var template = root.template || options.template;
-
- // Create a deferred specifically for fetching.
- def = options.deferred();
-
- // If data is a function, immediately call it.
- if (_.isFunction(context)) {
- context = context.call(root);
- }
-
- // Set the internal callback to trigger once the asynchronous or
- // synchronous behavior has completed.
- manager.callback = function(contents) {
- // Clean up asynchronous manager properties.
- delete manager.isAsync;
- delete manager.callback;
-
- done(context, contents);
- };
-
- // Set the url to the prefix + the view's template property.
- if (typeof template === "string") {
- url = options.prefix + template;
- }
-
- // Check if contents are already cached and if they are, simply process
- // the template with the correct data.
- if (contents = LayoutManager.cache(url)) {
- done(context, contents, url);
-
- return def;
- }
-
- // Fetch layout and template contents.
- if (typeof template === "string") {
- contents = options.fetchTemplate.call(root, options.prefix +
- template);
- // If the template is already a function, simply call it.
- } else if (typeof template === "function") {
- contents = template;
- // If its not a string and not undefined, pass the value to `fetch`.
- } else if (template != null) {
- contents = options.fetchTemplate.call(root, template);
- }
-
- // If the function was synchronous, continue execution.
- if (!manager.isAsync) {
- done(context, contents);
- }
-
- return def;
- }
- };
- },
-
// Remove all nested Views.
_removeViews: function(root, force) {
// Shift arguments around.
@@ -713,8 +693,6 @@ var LayoutManager = Backbone.View.extend({
cleanViews: function(views) {
// Clear out all existing views.
_.each(aConcat.call([], views), function(view) {
- var cleanup;
-
// Remove all custom events attached to this View.
view.unbind();
@@ -733,16 +711,15 @@ var LayoutManager = Backbone.View.extend({
// If a custom cleanup method was provided on the view, call it after
// the initial cleanup is done
- cleanup = view.getAllOptions().cleanup;
- if (_.isFunction(cleanup)) {
- cleanup.call(view);
+ if (_.isFunction(view.cleanup)) {
+ view.cleanup();
}
});
},
// This static method allows for global configuration of LayoutManager.
configure: function(options) {
- _.extend(LayoutManager.prototype.options, options);
+ _.extend(LayoutManager.prototype, options);
// Allow LayoutManager to manage Backbone.View.prototype.
if (options.manage) {
@@ -762,6 +739,9 @@ var LayoutManager = Backbone.View.extend({
// Configure a View to work with the LayoutManager plugin.
setupView: function(views, options) {
+ // Don't break the options object (passed into Backbone.View#initialize).
+ options = options || {};
+
// Set up all Views passed.
_.each(aConcat.call([], views), function(view) {
// If the View has already been setup, no need to do it again.
@@ -769,9 +749,8 @@ var LayoutManager = Backbone.View.extend({
return;
}
- var views, declaredViews, viewOptions;
+ var views, declaredViews;
var proto = LayoutManager.prototype;
- var viewOverrides = _.pick(view, keys);
// Ensure necessary properties are set.
_.defaults(view, {
@@ -795,20 +774,11 @@ var LayoutManager = Backbone.View.extend({
// Mix in all LayoutManager prototype properties as well.
}, LayoutManager.prototype);
- // Extend the options with the prototype and passed options.
- options = view.options = _.defaults(options || {}, view.options,
- proto.options);
-
- // Ensure view events are properly copied over.
- viewOptions = _.pick(options, aConcat.call(["events", "sections"],
- _.values(options.events)));
+ // Assign passed options.
+ view.options = options;
// Merge the View options into the View.
- _.extend(view, viewOptions);
-
- // Pick out the specific properties that can be dynamically added at
- // runtime and ensure they are available on the view object.
- _.extend(options, viewOverrides);
+ _.extend(view, options);
// By default the original Remove function is the Backbone.View one.
view._remove = Backbone.View.prototype.remove;
@@ -835,43 +805,42 @@ var LayoutManager = Backbone.View.extend({
// Reset the property to avoid duplication or overwritting.
view.views = {};
+ // If any declared view is wrapped in a function, invoke it.
+ _.each(declaredViews, function(declaredView, key) {
+ if (typeof declaredView === "function") {
+ declaredViews[key] = declaredView.call(view, view);
+ }
+ });
+
// Set the declared Views.
view.setViews(declaredViews);
}
-
- // If a template is passed use that instead.
- if (view.options.template) {
- view.options.template = options.template;
- // Ensure the template is mapped over.
- } else if (view.template) {
- options.template = view.template;
- }
});
}
});
-// Tack on the version.
-LayoutManager.VERSION = "0.9.1";
+LayoutManager.VERSION = "0.9.4";
+// Expose through Backbone object.
Backbone.Layout = LayoutManager;
// Override _configure to provide extra functionality that is necessary in
// order for the render function reference to be bound during initialize.
-Backbone.View.prototype._configure = function(options) {
- var noel, retVal;
+Backbone.View = function(options) {
+ var noel;
+
+ // Ensure options is always an object.
+ options = options || {};
// Remove the container element provided by Backbone.
if ("el" in options ? options.el === false : this.el === false) {
noel = true;
}
- // Run the original _configure.
- retVal = _configure.apply(this, arguments);
-
// If manage is set, do it!
if (options.manage || this.manage) {
// Set up this View.
- LayoutManager.setupView(this);
+ LayoutManager.setupView(this, options);
}
// Assign the `noel` property once we're sure the View we're working with is
@@ -882,11 +851,17 @@ Backbone.View.prototype._configure = function(options) {
}
// Act like nothing happened.
- return retVal;
+ ViewConstructor.apply(this, arguments);
};
+// Copy over the extend method.
+Backbone.View.extend = ViewConstructor.extend;
+
+// Copy over the prototype as well.
+Backbone.View.prototype = ViewConstructor.prototype;
+
// Default configuration options; designed to be overriden.
-LayoutManager.prototype.options = {
+var defaultOptions = {
// Prefix template/layout paths.
prefix: "",
@@ -901,9 +876,14 @@ LayoutManager.prototype.options = {
return _.template($(path).html());
},
- // By default, render using underscore's templating.
+ // By default, render using underscore's templating and trim output.
renderTemplate: function(template, context) {
- return template(context);
+ return trim(template(context));
+ },
+
+ // By default, pass model attributes to the templates
+ serialize: function() {
+ return this.model ? _.clone(this.model.attributes) : {};
},
// This is the most common way you will want to partially apply a view into
@@ -987,8 +967,8 @@ LayoutManager.prototype.options = {
}
};
-// Maintain a list of the keys at define time.
-keys = _.keys(LayoutManager.prototype.options);
+// Extend LayoutManager with default options.
+_.extend(LayoutManager.prototype, defaultOptions);
// Assign `LayoutManager` object for AMD loaders.
return LayoutManager;