updated js libraries,
require, jquery, backbone shortcuts backbone modelbinder
This commit is contained in:
parent
33aad6e8ef
commit
98df1be981
|
@ -1,4 +1,4 @@
|
||||||
// Backbone.ModelBinder v1.0.1
|
// Backbone.ModelBinder v1.0.2
|
||||||
// (c) 2013 Bart Wood
|
// (c) 2013 Bart Wood
|
||||||
// Distributed Under MIT License
|
// Distributed Under MIT License
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
// Current version of the library.
|
// Current version of the library.
|
||||||
Backbone.ModelBinder.VERSION = '1.0.1';
|
Backbone.ModelBinder.VERSION = '1.0.2';
|
||||||
Backbone.ModelBinder.Constants = {};
|
Backbone.ModelBinder.Constants = {};
|
||||||
Backbone.ModelBinder.Constants.ModelToView = 'ModelToView';
|
Backbone.ModelBinder.Constants.ModelToView = 'ModelToView';
|
||||||
Backbone.ModelBinder.Constants.ViewToModel = 'ViewToModel';
|
Backbone.ModelBinder.Constants.ViewToModel = 'ViewToModel';
|
||||||
|
@ -83,7 +83,7 @@
|
||||||
this._options['modelSetOptions'].changeSource = 'ModelBinder';
|
this._options['modelSetOptions'].changeSource = 'ModelBinder';
|
||||||
|
|
||||||
if(!this._options['changeTriggers']){
|
if(!this._options['changeTriggers']){
|
||||||
this._options['changeTriggers'] = {'': 'change', '[contenteditable]': 'blur'};
|
this._options['changeTriggers'] = {'*': 'change', '[contenteditable]': 'blur'};
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!this._options['initialCopyDirection']){
|
if(!this._options['initialCopyDirection']){
|
||||||
|
@ -240,17 +240,11 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
_unbindViewToModel: function () {
|
_unbindViewToModel: function () {
|
||||||
if (this._rootEl) {
|
if(this._options && this._options['changeTriggers']){
|
||||||
if (this._triggers) {
|
_.each(this._options['changeTriggers'], function (event, selector) {
|
||||||
_.each(this._triggers, function (event, selector) {
|
|
||||||
$(this._rootEl).undelegate(selector, event, this._onElChanged);
|
$(this._rootEl).undelegate(selector, event, this._onElChanged);
|
||||||
}, this);
|
}, this);
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
$(this._rootEl).undelegate('', 'change', this._onElChanged);
|
|
||||||
$(this._rootEl).undelegate('[contenteditable]', 'blur', this._onElChanged);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
_onElChanged:function (event) {
|
_onElChanged:function (event) {
|
||||||
|
@ -389,7 +383,9 @@
|
||||||
break;
|
break;
|
||||||
case 'class':
|
case 'class':
|
||||||
var previousValue = this._model.previous(elementBinding.attributeBinding.attributeName);
|
var previousValue = this._model.previous(elementBinding.attributeBinding.attributeName);
|
||||||
if(!_.isUndefined(previousValue)){
|
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
|
||||||
|
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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,8 +16,13 @@
|
||||||
_results = [];
|
_results = [];
|
||||||
for (shortcut in _ref) {
|
for (shortcut in _ref) {
|
||||||
callback = _ref[shortcut];
|
callback = _ref[shortcut];
|
||||||
if (!_.isFunction(callback)) method = this[callback];
|
if (!_.isFunction(callback)){
|
||||||
|
method = this[callback];
|
||||||
if (!method) throw new Error("Method " + callback + " does not exist");
|
if (!method) throw new Error("Method " + callback + " does not exist");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
method = callback;
|
||||||
|
}
|
||||||
match = shortcut.match(/^(\S+)\s*(.*)$/);
|
match = shortcut.match(/^(\S+)\s*(.*)$/);
|
||||||
shortcutKey = match[1];
|
shortcutKey = match[1];
|
||||||
scope = match[2] === "" ? "all" : match[2];
|
scope = match[2] === "" ? "all" : match[2];
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/*!
|
/*!
|
||||||
* jQuery JavaScript Library v1.9.1
|
* jQuery JavaScript Library v1.9.1
|
||||||
* http://jquery.com/
|
* http://jquery.com/
|
||||||
*
|
*
|
||||||
|
@ -3292,8 +3292,7 @@
|
||||||
var e = jQuery.extend(
|
var e = jQuery.extend(
|
||||||
new jQuery.Event(),
|
new jQuery.Event(),
|
||||||
event,
|
event,
|
||||||
{
|
{ type: type,
|
||||||
type: type,
|
|
||||||
isSimulated: true,
|
isSimulated: true,
|
||||||
originalEvent: {}
|
originalEvent: {}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/** vim: et:ts=4:sw=4:sts=4
|
/** vim: et:ts=4:sw=4:sts=4
|
||||||
* @license RequireJS 2.1.4 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
|
* @license RequireJS 2.1.5 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
|
||||||
* Available via the MIT or new BSD license.
|
* Available via the MIT or new BSD license.
|
||||||
* see: http://github.com/jrburke/requirejs for details
|
* see: http://github.com/jrburke/requirejs for details
|
||||||
*/
|
*/
|
||||||
|
@ -12,7 +12,7 @@ var requirejs, require, define;
|
||||||
(function (global) {
|
(function (global) {
|
||||||
var req, s, head, baseElement, dataMain, src,
|
var req, s, head, baseElement, dataMain, src,
|
||||||
interactiveScript, currentlyAddingScript, mainScript, subPath,
|
interactiveScript, currentlyAddingScript, mainScript, subPath,
|
||||||
version = '2.1.4',
|
version = '2.1.5',
|
||||||
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
|
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
|
||||||
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
|
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
|
||||||
jsSuffixRegExp = /\.js$/,
|
jsSuffixRegExp = /\.js$/,
|
||||||
|
@ -191,15 +191,21 @@ var requirejs, require, define;
|
||||||
var inCheckLoaded, Module, context, handlers,
|
var inCheckLoaded, Module, context, handlers,
|
||||||
checkLoadedTimeoutId,
|
checkLoadedTimeoutId,
|
||||||
config = {
|
config = {
|
||||||
|
//Defaults. Do not set a default for map
|
||||||
|
//config to speed up normalize(), which
|
||||||
|
//will run faster if there is no default.
|
||||||
waitSeconds: 7,
|
waitSeconds: 7,
|
||||||
baseUrl: './',
|
baseUrl: './',
|
||||||
paths: {},
|
paths: {},
|
||||||
pkgs: {},
|
pkgs: {},
|
||||||
shim: {},
|
shim: {},
|
||||||
map: {},
|
|
||||||
config: {}
|
config: {}
|
||||||
},
|
},
|
||||||
registry = {},
|
registry = {},
|
||||||
|
//registry of just enabled modules, to speed
|
||||||
|
//cycle breaking code when lots of modules
|
||||||
|
//are registered, but not activated.
|
||||||
|
enabledRegistry = {},
|
||||||
undefEvents = {},
|
undefEvents = {},
|
||||||
defQueue = [],
|
defQueue = [],
|
||||||
defined = {},
|
defined = {},
|
||||||
|
@ -295,7 +301,7 @@ var requirejs, require, define;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Apply map config if available.
|
//Apply map config if available.
|
||||||
if (applyMap && (baseParts || starMap) && map) {
|
if (applyMap && map && (baseParts || starMap)) {
|
||||||
nameParts = name.split('/');
|
nameParts = name.split('/');
|
||||||
|
|
||||||
for (i = nameParts.length; i > 0; i -= 1) {
|
for (i = nameParts.length; i > 0; i -= 1) {
|
||||||
|
@ -576,6 +582,7 @@ var requirejs, require, define;
|
||||||
function cleanRegistry(id) {
|
function cleanRegistry(id) {
|
||||||
//Clean up machinery used for waiting modules.
|
//Clean up machinery used for waiting modules.
|
||||||
delete registry[id];
|
delete registry[id];
|
||||||
|
delete enabledRegistry[id];
|
||||||
}
|
}
|
||||||
|
|
||||||
function breakCycle(mod, traced, processed) {
|
function breakCycle(mod, traced, processed) {
|
||||||
|
@ -624,7 +631,7 @@ var requirejs, require, define;
|
||||||
inCheckLoaded = true;
|
inCheckLoaded = true;
|
||||||
|
|
||||||
//Figure out the state of all the modules.
|
//Figure out the state of all the modules.
|
||||||
eachProp(registry, function (mod) {
|
eachProp(enabledRegistry, function (mod) {
|
||||||
map = mod.map;
|
map = mod.map;
|
||||||
modId = map.id;
|
modId = map.id;
|
||||||
|
|
||||||
|
@ -805,7 +812,7 @@ var requirejs, require, define;
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks is the module is ready to define itself, and if so,
|
* Checks if the module is ready to define itself, and if so,
|
||||||
* define it.
|
* define it.
|
||||||
*/
|
*/
|
||||||
check: function () {
|
check: function () {
|
||||||
|
@ -883,7 +890,7 @@ var requirejs, require, define;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Clean up
|
//Clean up
|
||||||
delete registry[id];
|
cleanRegistry(id);
|
||||||
|
|
||||||
this.defined = true;
|
this.defined = true;
|
||||||
}
|
}
|
||||||
|
@ -1049,6 +1056,7 @@ var requirejs, require, define;
|
||||||
},
|
},
|
||||||
|
|
||||||
enable: function () {
|
enable: function () {
|
||||||
|
enabledRegistry[this.map.id] = this;
|
||||||
this.enabled = true;
|
this.enabled = true;
|
||||||
|
|
||||||
//Set flag mentioning that the module is enabling,
|
//Set flag mentioning that the module is enabling,
|
||||||
|
@ -1208,6 +1216,7 @@ var requirejs, require, define;
|
||||||
Module: Module,
|
Module: Module,
|
||||||
makeModuleMap: makeModuleMap,
|
makeModuleMap: makeModuleMap,
|
||||||
nextTick: req.nextTick,
|
nextTick: req.nextTick,
|
||||||
|
onError: onError,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set a configuration for the context.
|
* Set a configuration for the context.
|
||||||
|
@ -1234,6 +1243,9 @@ var requirejs, require, define;
|
||||||
eachProp(cfg, function (value, prop) {
|
eachProp(cfg, function (value, prop) {
|
||||||
if (objs[prop]) {
|
if (objs[prop]) {
|
||||||
if (prop === 'map') {
|
if (prop === 'map') {
|
||||||
|
if (!config.map) {
|
||||||
|
config.map = {};
|
||||||
|
}
|
||||||
mixin(config[prop], value, true, true);
|
mixin(config[prop], value, true, true);
|
||||||
} else {
|
} else {
|
||||||
mixin(config[prop], value, true);
|
mixin(config[prop], value, true);
|
||||||
|
@ -1345,7 +1357,7 @@ var requirejs, require, define;
|
||||||
//Synchronous access to one module. If require.get is
|
//Synchronous access to one module. If require.get is
|
||||||
//available (as in the Node adapter), prefer that.
|
//available (as in the Node adapter), prefer that.
|
||||||
if (req.get) {
|
if (req.get) {
|
||||||
return req.get(context, deps, relMap);
|
return req.get(context, deps, relMap, localRequire);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Normalize module name, if it contains . or ..
|
//Normalize module name, if it contains . or ..
|
||||||
|
@ -1396,7 +1408,7 @@ var requirejs, require, define;
|
||||||
* plain URLs like nameToUrl.
|
* plain URLs like nameToUrl.
|
||||||
*/
|
*/
|
||||||
toUrl: function (moduleNamePlusExt) {
|
toUrl: function (moduleNamePlusExt) {
|
||||||
var ext, url,
|
var ext,
|
||||||
index = moduleNamePlusExt.lastIndexOf('.'),
|
index = moduleNamePlusExt.lastIndexOf('.'),
|
||||||
segment = moduleNamePlusExt.split('/')[0],
|
segment = moduleNamePlusExt.split('/')[0],
|
||||||
isRelative = segment === '.' || segment === '..';
|
isRelative = segment === '.' || segment === '..';
|
||||||
|
@ -1408,9 +1420,8 @@ var requirejs, require, define;
|
||||||
moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
|
moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
|
||||||
}
|
}
|
||||||
|
|
||||||
url = context.nameToUrl(normalize(moduleNamePlusExt,
|
return context.nameToUrl(normalize(moduleNamePlusExt,
|
||||||
relMap && relMap.id, true), ext || '.fake');
|
relMap && relMap.id, true), ext, true);
|
||||||
return ext ? url : url.substring(0, url.length - 5);
|
|
||||||
},
|
},
|
||||||
|
|
||||||
defined: function (id) {
|
defined: function (id) {
|
||||||
|
@ -1529,7 +1540,7 @@ var requirejs, require, define;
|
||||||
* it is assumed to have already been normalized. This is an
|
* it is assumed to have already been normalized. This is an
|
||||||
* internal API, not a public one. Use toUrl for the public API.
|
* internal API, not a public one. Use toUrl for the public API.
|
||||||
*/
|
*/
|
||||||
nameToUrl: function (moduleName, ext) {
|
nameToUrl: function (moduleName, ext, skipExt) {
|
||||||
var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url,
|
var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url,
|
||||||
parentPath;
|
parentPath;
|
||||||
|
|
||||||
|
@ -1578,7 +1589,7 @@ var requirejs, require, define;
|
||||||
|
|
||||||
//Join the path parts together, then figure out if baseUrl is needed.
|
//Join the path parts together, then figure out if baseUrl is needed.
|
||||||
url = syms.join('/');
|
url = syms.join('/');
|
||||||
url += (ext || (/\?/.test(url) ? '' : '.js'));
|
url += (ext || (/\?/.test(url) || skipExt ? '' : '.js'));
|
||||||
url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
|
url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1817,7 +1828,7 @@ var requirejs, require, define;
|
||||||
node.attachEvent('onreadystatechange', context.onScriptLoad);
|
node.attachEvent('onreadystatechange', context.onScriptLoad);
|
||||||
//It would be great to add an error handler here to catch
|
//It would be great to add an error handler here to catch
|
||||||
//404s in IE9+. However, onreadystatechange will fire before
|
//404s in IE9+. However, onreadystatechange will fire before
|
||||||
//the error handler, so that does not help. If addEvenListener
|
//the error handler, so that does not help. If addEventListener
|
||||||
//is used, then IE will fire error before load, but we cannot
|
//is used, then IE will fire error before load, but we cannot
|
||||||
//use that pathway given the connect.microsoft.com issue
|
//use that pathway given the connect.microsoft.com issue
|
||||||
//mentioned above about not doing the 'script execute,
|
//mentioned above about not doing the 'script execute,
|
||||||
|
@ -1846,6 +1857,7 @@ var requirejs, require, define;
|
||||||
|
|
||||||
return node;
|
return node;
|
||||||
} else if (isWebWorker) {
|
} else if (isWebWorker) {
|
||||||
|
try {
|
||||||
//In a web worker, use importScripts. This is not a very
|
//In a web worker, use importScripts. This is not a very
|
||||||
//efficient use of importScripts, importScripts will block until
|
//efficient use of importScripts, importScripts will block until
|
||||||
//its script is downloaded and evaluated. However, if web workers
|
//its script is downloaded and evaluated. However, if web workers
|
||||||
|
@ -1856,6 +1868,13 @@ var requirejs, require, define;
|
||||||
|
|
||||||
//Account for anonymous modules
|
//Account for anonymous modules
|
||||||
context.completeLoad(moduleName);
|
context.completeLoad(moduleName);
|
||||||
|
} catch (e) {
|
||||||
|
context.onError(makeError('importscripts',
|
||||||
|
'importScripts failed for ' +
|
||||||
|
moduleName + ' at ' + url,
|
||||||
|
e,
|
||||||
|
[moduleName]));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1932,12 +1951,13 @@ var requirejs, require, define;
|
||||||
//This module may not have dependencies
|
//This module may not have dependencies
|
||||||
if (!isArray(deps)) {
|
if (!isArray(deps)) {
|
||||||
callback = deps;
|
callback = deps;
|
||||||
deps = [];
|
deps = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
//If no name, and callback is a function, then figure out if it a
|
//If no name, and callback is a function, then figure out if it a
|
||||||
//CommonJS thing with dependencies.
|
//CommonJS thing with dependencies.
|
||||||
if (!deps.length && isFunction(callback)) {
|
if (!deps && isFunction(callback)) {
|
||||||
|
deps = [];
|
||||||
//Remove comments from the callback string,
|
//Remove comments from the callback string,
|
||||||
//look for require calls, and pull them into the dependencies,
|
//look for require calls, and pull them into the dependencies,
|
||||||
//but only if there are function args.
|
//but only if there are function args.
|
||||||
|
|
Loading…
Reference in New Issue