Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated modelbinder, mutator, pagable, lunr.

This commit is contained in:
kay.one 2013-05-20 14:10:21 -07:00
parent 41c886b5dc
commit 8528bb1301
4 changed files with 132 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
UI/JsLibraries/backbone.modelbinder.js
View File

@ -38,7 +38,7 @@
this._model = model; this._model = model;
this._rootEl = rootEl; this._rootEl = rootEl;
this._setOptions(options); this._setOptions(options);
if (!this._model) this._throwException('model must be specified'); if (!this._model) this._throwException('model must be specified');
if (!this._rootEl) this._throwException('rootEl must be specified'); if (!this._rootEl) this._throwException('rootEl must be specified');
@ -58,10 +58,10 @@
this._bindViewToModel(); this._bindViewToModel();
}, },
bindCustomTriggers: function (model, rootEl, triggers, attributeBindings, modelSetOptions) { bindCustomTriggers: function (model, rootEl, triggers, attributeBindings, modelSetOptions) {
this._triggers = triggers; this._triggers = triggers;
this.bind(model, rootEl, attributeBindings, modelSetOptions) this.bind(model, rootEl, attributeBindings, modelSetOptions)
}, },
unbind:function () { unbind:function () {
this._unbindModelToView(); this._unbindModelToView();
@ -74,7 +74,9 @@
}, },
_setOptions: function(options){ _setOptions: function(options){
this._options = _.extend({}, Backbone.ModelBinder.options, options); this._options = _.extend({
boundAttribute: 'name'
}, Backbone.ModelBinder.options, options);
// initialize default options // initialize default options
if(!this._options['modelSetOptions']){ if(!this._options['modelSetOptions']){
@ -122,24 +124,25 @@
} }
}, },
// If the bindings are not specified, the default binding is performed on the name attribute // If the bindings are not specified, the default binding is performed on the specified attribute, name by default
_initializeDefaultBindings: function(){ _initializeDefaultBindings: function(){
var elCount, namedEls, namedEl, name, attributeBinding; var elCount, elsWithAttribute, matchedEl, name, attributeBinding;
this._attributeBindings = {};
namedEls = $('[name]', this._rootEl);
for(elCount = 0; elCount < namedEls.length; elCount++){ this._attributeBindings = {};
namedEl = namedEls[elCount]; elsWithAttribute = $('[' + this._options['boundAttribute'] + ']', this._rootEl);
name = $(namedEl).attr('name');
for(elCount = 0; elCount < elsWithAttribute.length; elCount++){
matchedEl = elsWithAttribute[elCount];
name = $(matchedEl).attr(this._options['boundAttribute']);
// For elements like radio buttons we only want a single attribute binding with possibly multiple element bindings // For elements like radio buttons we only want a single attribute binding with possibly multiple element bindings
if(!this._attributeBindings[name]){ if(!this._attributeBindings[name]){
attributeBinding = {attributeName: name}; attributeBinding = {attributeName: name};
attributeBinding.elementBindings = [{attributeBinding: attributeBinding, boundEls: [namedEl]}]; attributeBinding.elementBindings = [{attributeBinding: attributeBinding, boundEls: [matchedEl]}];
this._attributeBindings[name] = attributeBinding; this._attributeBindings[name] = attributeBinding;
} }
else{ else{
this._attributeBindings[name].elementBindings.push({attributeBinding: this._attributeBindings[name], boundEls: [namedEl]}); this._attributeBindings[name].elementBindings.push({attributeBinding: this._attributeBindings[name], boundEls: [matchedEl]});
} }
} }
}, },
@ -370,7 +373,7 @@
el.text(convertedValue); el.text(convertedValue);
break; break;
case 'enabled': case 'enabled':
el.attr('disabled', !convertedValue); el.prop('disabled', !convertedValue);
break; break;
case 'displayed': case 'displayed':
el[convertedValue ? 'show' : 'hide'](); el[convertedValue ? 'show' : 'hide']();
@ -383,8 +386,8 @@
break; break;
case 'class': case 'class':
var previousValue = this._model.previous(elementBinding.attributeBinding.attributeName); var previousValue = this._model.previous(elementBinding.attributeBinding.attributeName);
var currentValue = this._model.get(elementBinding.attributeBinding.attributeName); var currentValue = this._model.get(elementBinding.attributeBinding.attributeName);
// is current value is now defined then remove the class the may have been set for the undefined value // is current value is now defined then remove the class the may have been set for the undefined value
if(!_.isUndefined(previousValue) || !_.isUndefined(currentValue)){ if(!_.isUndefined(previousValue) || !_.isUndefined(currentValue)){
previousValue = this._getConvertedValue(Backbone.ModelBinder.Constants.ModelToView, elementBinding, previousValue); previousValue = this._getConvertedValue(Backbone.ModelBinder.Constants.ModelToView, elementBinding, previousValue);
el.removeClass(previousValue); el.removeClass(previousValue);
@ -404,22 +407,21 @@
switch (el.attr('type')) { switch (el.attr('type')) {
case 'radio': case 'radio':
if (el.val() === convertedValue) { if (el.val() === convertedValue) {
el.attr('checked', 'checked'); // must defer the change trigger or the change will actually fire with the old value
el.prop('checked') || _.defer(function() { el.trigger('change'); });
el.prop('checked', true);
} }
else { else {
el.removeAttr('checked'); // must defer the change trigger or the change will actually fire with the old value
el.prop('checked', false);
} }
break; break;
case 'checkbox': case 'checkbox':
if (convertedValue) { // must defer the change trigger or the change will actually fire with the old value
//Fixing this while we wait for an official update el.prop('checked') === !!convertedValue || _.defer(function() { el.trigger('change') });
el.prop('checked', 'checked'); el.prop('checked', !!convertedValue);
}
else {
el.removeAttr('checked');
}
break; break;
case 'file': case 'file':
break; break;
default: default:
el.val(convertedValue); el.val(convertedValue);
@ -571,4 +573,4 @@
return Backbone.ModelBinder; return Backbone.ModelBinder;
})); }));

145
UI/JsLibraries/backbone.mutators.js
View File

@ -1,11 +1,36 @@
(function (root, define, require, exports, module, factory, undef) { /*! Backbone.Mutators - v0.4.0
------------------------------
Build @ 2013-05-01
Documentation and Full License Available at:
http://asciidisco.github.com/Backbone.Mutators/index.html
git://github.com/asciidisco/Backbone.Mutators.git
Copyright (c) 2013 Sebastian Golasch <public@asciidisco.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 (root, factory, undef) {
'use strict'; 'use strict';
if (typeof exports === 'object') { if (typeof exports === 'object') {
// Node. Does not work with strict CommonJS, but // Node. Does not work with strict CommonJS, but
// only CommonJS-like enviroments that support module.exports, // only CommonJS-like enviroments that support module.exports,
// like Node. // like Node.
module.exports = factory(require('underscore'), require('backbone')); module.exports = factory(require('underscore'), require('Backbone'));
} else if (typeof define === 'function' && define.amd) { } else if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module. // AMD. Register as an anonymous module.
define(['underscore', 'backbone'], function (_, Backbone) { define(['underscore', 'backbone'], function (_, Backbone) {
@ -19,45 +44,45 @@
root.returnExportsGlobal = factory(root._, root.Backbone); root.returnExportsGlobal = factory(root._, root.Backbone);
} }
// Usage: // Usage:
// //
// Note: This plugin is UMD compatible, you can use it in node, amd and vanilla js envs // Note: This plugin is UMD compatible, you can use it in node, amd and vanilla js envs
// //
// Vanilla JS: // Vanilla JS:
// <script src="underscore.js"></script> // <script src="underscore.js"></script>
// <script src="backbone.js"></script> // <script src="backbone.js"></script>
// <script src="backbone.mutators.js"></script> // <script src="backbone.mutators.js"></script>
// //
// Node: // Node:
// var _ = require('underscore'); // var _ = require('underscore');
// var Backbone = require('backbone'); // var Backbone = require('backbone');
// var Mutators = require('backbone.mutators'); // var Mutators = require('backbone.mutators');
// //
// //
// AMD: // AMD:
// define(['underscore', 'backbone', 'backbone.mutators'], function (_, Backbone, Mutators) { // define(['underscore', 'backbone', 'backbone.mutators'], function (_, Backbone, Mutators) {
// // insert sample from below // // insert sample from below
// return User; // return User;
// }); // });
// //
// var User = Backbone.Model.extend({ // var User = Backbone.Model.extend({
// mutators: { // mutators: {
// fullname: function () { // fullname: function () {
// return this.firstname + ' ' + this.lastname; // return this.firstname + ' ' + this.lastname;
// } // }
// }, // },
// //
// defaults: { // defaults: {
// firstname: 'Sebastian', // firstname: 'Sebastian',
// lastname: 'Golasch' // lastname: 'Golasch'
// } // }
// }); // });
// //
// var user = new User(); // var user = new User();
// user.get('fullname') // returns 'Sebastian Golasch' // user.get('fullname') // returns 'Sebastian Golasch'
// user.toJSON() // return '{firstname: 'Sebastian', lastname: 'Golasch', fullname: 'Sebastian Golasch'}' // user.toJSON() // return '{firstname: 'Sebastian', lastname: 'Golasch', fullname: 'Sebastian Golasch'}'
}(this, this.define, this.require, this.exports, this.module, function (_, Backbone, root, undef) { }(this, function (_, Backbone, root, undef) {
'use strict'; 'use strict';
// check if we use the amd branch of backbone and underscore // check if we use the amd branch of backbone and underscore
@ -65,10 +90,10 @@
_ = _ === undef ? root._ : _; _ = _ === undef ? root._ : _;
// extend backbones model prototype with the mutator functionality // extend backbones model prototype with the mutator functionality
var Mutator = function () { }, var Mutator = function () {},
oldGet = Backbone.Model.prototype.get, oldGet = Backbone.Model.prototype.get,
oldSet = Backbone.Model.prototype.set, oldSet = Backbone.Model.prototype.set,
oldToJson = Backbone.Model.prototype.toJSON; oldToJson = Backbone.Model.prototype.toJSON;
// This is necessary to ensure that Models declared without the mutators object do not throw and error // This is necessary to ensure that Models declared without the mutators object do not throw and error
Mutator.prototype.mutators = {}; Mutator.prototype.mutators = {};
@ -94,12 +119,11 @@
Mutator.prototype.set = function (key, value, options) { Mutator.prototype.set = function (key, value, options) {
var isMutator = this.mutators !== undef, var isMutator = this.mutators !== undef,
ret = null, ret = null,
attrs = null, attrs = null;
attr = null;
// seamleassly stolen from backbone core // seamleassly stolen from backbone core
// check if the setter action is triggered // check if the setter action is triggered
// using key <-> value or object // using key <-> value or object
if (_.isObject(key) || key === null) { if (_.isObject(key) || key === null) {
attrs = key; attrs = key;
options = value; options = value;
@ -114,29 +138,36 @@
// check if we need to set a single value // check if we need to set a single value
if (_.isFunction(this.mutators[key].set) === true) { if (_.isFunction(this.mutators[key].set) === true) {
ret = this.mutators[key].set.call(this, key, attrs[key], options, _.bind(oldSet, this)); ret = this.mutators[key].set.call(this, key, attrs[key], options, _.bind(oldSet, this));
} else if (_.isFunction(this.mutators[key])) { } else if(_.isFunction(this.mutators[key])){
ret = this.mutators[key].call(this, key, attrs[key], options, _.bind(oldSet, this)); ret = this.mutators[key].call(this, key, attrs[key], options, _.bind(oldSet, this));
} }
} }
if (_.isObject(attrs)) { if (_.isObject(attrs)) {
_.each(attrs, _.bind(function (attr, attrKey) { _.each(attrs, _.bind(function (attr, attrKey) {
var cur_ret = null;
if (isMutator === true && _.isObject(this.mutators[attrKey]) === true) { if (isMutator === true && _.isObject(this.mutators[attrKey]) === true) {
// check if we need to set a single value // check if we need to set a single value
var meth = this.mutators[attrKey]; var meth = this.mutators[attrKey];
if (_.isFunction(meth.set)) { if(_.isFunction(meth.set)){
meth = meth.set; meth = meth.set;
} }
if (_.isFunction(meth)) { if(_.isFunction(meth)){
if (options === undef || (_.isObject(options) === true && options.silent !== true && (options.mutators !== undef && options.mutators.silent !== true))) { if (options === undef || (_.isObject(options) === true && options.silent !== true && (options.mutators !== undef && options.mutators.silent !== true))) {
this.trigger('mutators:set:' + attrKey); this.trigger('mutators:set:' + attrKey);
} }
ret = meth.call(this, attrKey, attr, options, _.bind(oldSet, this)); cur_ret = meth.call(this, attrKey, attr, options, _.bind(oldSet, this));
} }
} }
if (cur_ret === null) {
cur_ret = _.bind(oldSet, this)(attrKey, attr, options);
}
if (ret !== false) { ret = cur_ret; }
}, this)); }, this));
} }
@ -154,7 +185,7 @@
var attr = oldToJson.call(this); var attr = oldToJson.call(this);
// iterate over all mutators (if there are some) // iterate over all mutators (if there are some)
_.each(this.mutators, _.bind(function (mutator, name) { _.each(this.mutators, _.bind(function (mutator, name) {
// check if we have some getter mutations (nested or ) // check if we have some getter mutations
if (_.isObject(this.mutators[name]) === true && _.isFunction(this.mutators[name].get)) { if (_.isObject(this.mutators[name]) === true && _.isFunction(this.mutators[name].get)) {
attr[name] = _.bind(this.mutators[name].get, this)(); attr[name] = _.bind(this.mutators[name].get, this)();
} else { } else {
@ -165,10 +196,16 @@
return attr; return attr;
}; };
// override get functionality to get HTML-escaped the mutator props
Mutator.prototype.escape = function (attr){
var val = this.get(attr);
return _.escape(val == null ? '' : '' + val);
};
// extend the models prototype // extend the models prototype
_.extend(Backbone.Model.prototype, Mutator.prototype); _.extend(Backbone.Model.prototype, Mutator.prototype);
// make mutators globally available under the Backbone namespace // make mutators globally available under the Backbone namespace
Backbone.Mutators = Mutator; Backbone.Mutators = Mutator;
return Mutator; return Mutator;
})); }));

4
UI/JsLibraries/backbone.pageable.js
View File

@ -506,8 +506,8 @@
} }
pageCol.state = pageCol._checkState(state); pageCol.state = pageCol._checkState(state);
if (collection == pageCol) fullCol.trigger(event, fullCol, options); if (collection == pageCol) fullCol.trigger(event, fullCol, options);
resetQuickly(pageCol, fullCol.models.slice(pageStart, pageEnd), else resetQuickly(pageCol, fullCol.models.slice(pageStart, pageEnd),
_extend({}, options, {parse: false})); _extend({}, options, {parse: false}));
} }
} }

12
UI/JsLibraries/lunr.js
View File

@ -1,5 +1,5 @@
/** /**
* lunr - http://lunrjs.com - A bit like Solr, but much smaller and not as bright - 0.3.1 * lunr - http://lunrjs.com - A bit like Solr, but much smaller and not as bright - 0.3.2
* Copyright (C) 2013 Oliver Nightingale * Copyright (C) 2013 Oliver Nightingale
* MIT Licensed * MIT Licensed
* @license * @license
@ -50,7 +50,7 @@ var lunr = function (config) {
return idx return idx
} }
lunr.version = "0.3.1" lunr.version = "0.3.2"
if (typeof module !== 'undefined') { if (typeof module !== 'undefined') {
module.exports = lunr module.exports = lunr
@ -69,6 +69,7 @@ if (typeof module !== 'undefined') {
* @returns {Array} * @returns {Array}
*/ */
lunr.tokenizer = function (str) { lunr.tokenizer = function (str) {
if (!str) return []
if (Array.isArray(str)) return str if (Array.isArray(str)) return str
var str = str.replace(/^\s+/, '') var str = str.replace(/^\s+/, '')
@ -737,8 +738,11 @@ lunr.Index.prototype.add = function (doc) {
for (var i = 0; i < allDocumentTokens.length; i++) { for (var i = 0; i < allDocumentTokens.length; i++) {
var token = allDocumentTokens.elements[i] var token = allDocumentTokens.elements[i]
var tf = this._fields.reduce(function (memo, field) { var tf = this._fields.reduce(function (memo, field) {
var tokenCount = docTokens[field.name].filter(function (t) { return t === token }).length, var fieldLength = docTokens[field.name].length
fieldLength = docTokens[field.name].length
if (!fieldLength) return memo
var tokenCount = docTokens[field.name].filter(function (t) { return t === token }).length
return memo + (tokenCount / fieldLength * field.boost) return memo + (tokenCount / fieldLength * field.boost)
}, 0) }, 0)