diff --git a/.gitignore b/.gitignore
index 8d6f7c26c..1c0d103f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ npm-debug.log*
yarn-error.log
yarn.lock
style/.sass-cache/
+stats.json
img/
images/
diff --git a/dist/grapes.js b/dist/grapes.js
index f5ec39526..2cb6064db 100644
--- a/dist/grapes.js
+++ b/dist/grapes.js
@@ -70,7 +70,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ __webpack_require__.p = "";
/******/
/******/ // Load entry module and return exports
-/******/ return __webpack_require__(__webpack_require__.s = 59);
+/******/ return __webpack_require__(__webpack_require__.s = 61);
/******/ })
/************************************************************************/
/******/ ([
@@ -93,7 +93,7 @@ return /******/ (function(modules) { // webpackBootstrap
// Set up Backbone appropriately for the environment. Start with AMD.
if (true) {
- !(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(1), __webpack_require__(9), exports], __WEBPACK_AMD_DEFINE_RESULT__ = (function(_, $, exports) {
+ !(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(1), __webpack_require__(10), exports], __WEBPACK_AMD_DEFINE_RESULT__ = (function(_, $, exports) {
// Export global even in AMD case in case this script is loaded with
// others that may still expect a global Backbone.
root.Backbone = factory(root, exports, _, $);
@@ -1999,15 +1999,15 @@ return /******/ (function(modules) { // webpackBootstrap
return Backbone;
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(10)))
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(7)))
/***/ }),
/* 1 */
/***/ (function(module, exports, __webpack_require__) {
-var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscore.js 1.8.3
+/* WEBPACK VAR INJECTION */(function(global, module) {var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscore.js 1.9.0
// http://underscorejs.org
-// (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+// (c) 2009-2018 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
// Underscore may be freely distributed under the MIT license.
(function() {
@@ -2015,29 +2015,32 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// Baseline setup
// --------------
- // Establish the root object, `window` in the browser, or `exports` on the server.
- var root = this;
+ // Establish the root object, `window` (`self`) in the browser, `global`
+ // on the server, or `this` in some virtual machines. We use `self`
+ // instead of `window` for `WebWorker` support.
+ var root = typeof self == 'object' && self.self === self && self ||
+ typeof global == 'object' && global.global === global && global ||
+ this ||
+ {};
// Save the previous value of the `_` variable.
var previousUnderscore = root._;
// Save bytes in the minified (but not gzipped) version:
- var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
+ var ArrayProto = Array.prototype, ObjProto = Object.prototype;
+ var SymbolProto = typeof Symbol !== 'undefined' ? Symbol.prototype : null;
// Create quick reference variables for speed access to core prototypes.
- var
- push = ArrayProto.push,
- slice = ArrayProto.slice,
- toString = ObjProto.toString,
- hasOwnProperty = ObjProto.hasOwnProperty;
+ var push = ArrayProto.push,
+ slice = ArrayProto.slice,
+ toString = ObjProto.toString,
+ hasOwnProperty = ObjProto.hasOwnProperty;
// All **ECMAScript 5** native function implementations that we hope to use
// are declared here.
- var
- nativeIsArray = Array.isArray,
- nativeKeys = Object.keys,
- nativeBind = FuncProto.bind,
- nativeCreate = Object.create;
+ var nativeIsArray = Array.isArray,
+ nativeKeys = Object.keys,
+ nativeCreate = Object.create;
// Naked function reference for surrogate-prototype-swapping.
var Ctor = function(){};
@@ -2050,10 +2053,12 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
};
// Export the Underscore object for **Node.js**, with
- // backwards-compatibility for the old `require()` API. If we're in
+ // backwards-compatibility for their old module API. If we're in
// the browser, add `_` as a global object.
- if (true) {
- if (typeof module !== 'undefined' && module.exports) {
+ // (`nodeType` is checked to ensure that `module`
+ // and `exports` are not HTML elements.)
+ if (typeof exports != 'undefined' && !exports.nodeType) {
+ if (typeof module != 'undefined' && !module.nodeType && module.exports) {
exports = module.exports = _;
}
exports._ = _;
@@ -2062,7 +2067,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
}
// Current version.
- _.VERSION = '1.8.3';
+ _.VERSION = '1.9.0';
// Internal function that returns an efficient (for current engines) version
// of the passed-in callback, to be repeatedly applied in other Underscore
@@ -2073,9 +2078,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
case 1: return function(value) {
return func.call(context, value);
};
- case 2: return function(value, other) {
- return func.call(context, value, other);
- };
+ // The 2-argument case is omitted because we’re not using it.
case 3: return function(value, index, collection) {
return func.call(context, value, index, collection);
};
@@ -2088,34 +2091,51 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
};
};
- // A mostly-internal function to generate callbacks that can be applied
- // to each element in a collection, returning the desired result — either
- // identity, an arbitrary callback, a property matcher, or a property accessor.
+ var builtinIteratee;
+
+ // An internal function to generate callbacks that can be applied to each
+ // element in a collection, returning the desired result — either `identity`,
+ // an arbitrary callback, a property matcher, or a property accessor.
var cb = function(value, context, argCount) {
+ if (_.iteratee !== builtinIteratee) return _.iteratee(value, context);
if (value == null) return _.identity;
if (_.isFunction(value)) return optimizeCb(value, context, argCount);
- if (_.isObject(value)) return _.matcher(value);
+ if (_.isObject(value) && !_.isArray(value)) return _.matcher(value);
return _.property(value);
};
- _.iteratee = function(value, context) {
+
+ // External wrapper for our callback generator. Users may customize
+ // `_.iteratee` if they want additional predicate/iteratee shorthand styles.
+ // This abstraction hides the internal-only argCount argument.
+ _.iteratee = builtinIteratee = function(value, context) {
return cb(value, context, Infinity);
};
- // An internal function for creating assigner functions.
- var createAssigner = function(keysFunc, undefinedOnly) {
- return function(obj) {
- var length = arguments.length;
- if (length < 2 || obj == null) return obj;
- for (var index = 1; index < length; index++) {
- var source = arguments[index],
- keys = keysFunc(source),
- l = keys.length;
- for (var i = 0; i < l; i++) {
- var key = keys[i];
- if (!undefinedOnly || obj[key] === void 0) obj[key] = source[key];
- }
- }
- return obj;
+ // Some functions take a variable number of arguments, or a few expected
+ // arguments at the beginning and then a variable number of values to operate
+ // on. This helper accumulates all remaining arguments past the function’s
+ // argument length (or an explicit `startIndex`), into an array that becomes
+ // the last argument. Similar to ES6’s "rest parameter".
+ var restArguments = function(func, startIndex) {
+ startIndex = startIndex == null ? func.length - 1 : +startIndex;
+ return function() {
+ var length = Math.max(arguments.length - startIndex, 0),
+ rest = Array(length),
+ index = 0;
+ for (; index < length; index++) {
+ rest[index] = arguments[index + startIndex];
+ }
+ switch (startIndex) {
+ case 0: return func.call(this, rest);
+ case 1: return func.call(this, arguments[0], rest);
+ case 2: return func.call(this, arguments[0], arguments[1], rest);
+ }
+ var args = Array(startIndex + 1);
+ for (index = 0; index < startIndex; index++) {
+ args[index] = arguments[index];
+ }
+ args[startIndex] = rest;
+ return func.apply(this, args);
};
};
@@ -2129,18 +2149,27 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
return result;
};
- var property = function(key) {
+ var shallowProperty = function(key) {
return function(obj) {
return obj == null ? void 0 : obj[key];
};
};
+ var deepGet = function(obj, path) {
+ var length = path.length;
+ for (var i = 0; i < length; i++) {
+ if (obj == null) return void 0;
+ obj = obj[path[i]];
+ }
+ return length ? obj : void 0;
+ };
+
// Helper for collection methods to determine whether a collection
- // should be iterated as an array or as an object
+ // should be iterated as an array or as an object.
// Related: http://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength
// Avoids a very nasty iOS 8 JIT bug on ARM-64. #2094
var MAX_ARRAY_INDEX = Math.pow(2, 53) - 1;
- var getLength = property('length');
+ var getLength = shallowProperty('length');
var isArrayLike = function(collection) {
var length = getLength(collection);
return typeof length == 'number' && length >= 0 && length <= MAX_ARRAY_INDEX;
@@ -2182,30 +2211,29 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
};
// Create a reducing function iterating left or right.
- function createReduce(dir) {
- // Optimized iterator function as using arguments.length
- // in the main function will deoptimize the, see #1991.
- function iterator(obj, iteratee, memo, keys, index, length) {
+ var createReduce = function(dir) {
+ // Wrap code that reassigns argument variables in a separate function than
+ // the one that accesses `arguments.length` to avoid a perf hit. (#1991)
+ var reducer = function(obj, iteratee, memo, initial) {
+ var keys = !isArrayLike(obj) && _.keys(obj),
+ length = (keys || obj).length,
+ index = dir > 0 ? 0 : length - 1;
+ if (!initial) {
+ memo = obj[keys ? keys[index] : index];
+ index += dir;
+ }
for (; index >= 0 && index < length; index += dir) {
var currentKey = keys ? keys[index] : index;
memo = iteratee(memo, obj[currentKey], currentKey, obj);
}
return memo;
- }
+ };
return function(obj, iteratee, memo, context) {
- iteratee = optimizeCb(iteratee, context, 4);
- var keys = !isArrayLike(obj) && _.keys(obj),
- length = (keys || obj).length,
- index = dir > 0 ? 0 : length - 1;
- // Determine the initial value if none is provided.
- if (arguments.length < 3) {
- memo = obj[keys ? keys[index] : index];
- index += dir;
- }
- return iterator(obj, iteratee, memo, keys, index, length);
+ var initial = arguments.length >= 3;
+ return reducer(obj, optimizeCb(iteratee, context, 4), memo, initial);
};
- }
+ };
// **Reduce** builds up a single result from a list of values, aka `inject`,
// or `foldl`.
@@ -2216,12 +2244,8 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// Return the first value which passes a truth test. Aliased as `detect`.
_.find = _.detect = function(obj, predicate, context) {
- var key;
- if (isArrayLike(obj)) {
- key = _.findIndex(obj, predicate, context);
- } else {
- key = _.findKey(obj, predicate, context);
- }
+ var keyFinder = isArrayLike(obj) ? _.findIndex : _.findKey;
+ var key = keyFinder(obj, predicate, context);
if (key !== void 0 && key !== -1) return obj[key];
};
@@ -2276,14 +2300,26 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
};
// Invoke a method (with arguments) on every item in a collection.
- _.invoke = function(obj, method) {
- var args = slice.call(arguments, 2);
- var isFunc = _.isFunction(method);
- return _.map(obj, function(value) {
- var func = isFunc ? method : value[method];
- return func == null ? func : func.apply(value, args);
+ _.invoke = restArguments(function(obj, path, args) {
+ var contextPath, func;
+ if (_.isFunction(path)) {
+ func = path;
+ } else if (_.isArray(path)) {
+ contextPath = path.slice(0, -1);
+ path = path[path.length - 1];
+ }
+ return _.map(obj, function(context) {
+ var method = func;
+ if (!method) {
+ if (contextPath && contextPath.length) {
+ context = deepGet(context, contextPath);
+ }
+ if (context == null) return void 0;
+ method = context[path];
+ }
+ return method == null ? method : method.apply(context, args);
});
- };
+ });
// Convenience version of a common use case of `map`: fetching a property.
_.pluck = function(obj, key) {
@@ -2306,20 +2342,20 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
_.max = function(obj, iteratee, context) {
var result = -Infinity, lastComputed = -Infinity,
value, computed;
- if (iteratee == null && obj != null) {
+ if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) {
obj = isArrayLike(obj) ? obj : _.values(obj);
for (var i = 0, length = obj.length; i < length; i++) {
value = obj[i];
- if (value > result) {
+ if (value != null && value > result) {
result = value;
}
}
} else {
iteratee = cb(iteratee, context);
- _.each(obj, function(value, index, list) {
- computed = iteratee(value, index, list);
+ _.each(obj, function(v, index, list) {
+ computed = iteratee(v, index, list);
if (computed > lastComputed || computed === -Infinity && result === -Infinity) {
- result = value;
+ result = v;
lastComputed = computed;
}
});
@@ -2331,20 +2367,20 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
_.min = function(obj, iteratee, context) {
var result = Infinity, lastComputed = Infinity,
value, computed;
- if (iteratee == null && obj != null) {
+ if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) {
obj = isArrayLike(obj) ? obj : _.values(obj);
for (var i = 0, length = obj.length; i < length; i++) {
value = obj[i];
- if (value < result) {
+ if (value != null && value < result) {
result = value;
}
}
} else {
iteratee = cb(iteratee, context);
- _.each(obj, function(value, index, list) {
- computed = iteratee(value, index, list);
+ _.each(obj, function(v, index, list) {
+ computed = iteratee(v, index, list);
if (computed < lastComputed || computed === Infinity && result === Infinity) {
- result = value;
+ result = v;
lastComputed = computed;
}
});
@@ -2352,21 +2388,13 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
return result;
};
- // Shuffle a collection, using the modern version of the
- // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle).
+ // Shuffle a collection.
_.shuffle = function(obj) {
- var set = isArrayLike(obj) ? obj : _.values(obj);
- var length = set.length;
- var shuffled = Array(length);
- for (var index = 0, rand; index < length; index++) {
- rand = _.random(0, index);
- if (rand !== index) shuffled[index] = shuffled[rand];
- shuffled[rand] = set[index];
- }
- return shuffled;
+ return _.sample(obj, Infinity);
};
- // Sample **n** random values from a collection.
+ // Sample **n** random values from a collection using the modern version of the
+ // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle).
// If **n** is not specified, returns a single random element.
// The internal `guard` argument allows it to work with `map`.
_.sample = function(obj, n, guard) {
@@ -2374,17 +2402,28 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
if (!isArrayLike(obj)) obj = _.values(obj);
return obj[_.random(obj.length - 1)];
}
- return _.shuffle(obj).slice(0, Math.max(0, n));
+ var sample = isArrayLike(obj) ? _.clone(obj) : _.values(obj);
+ var length = getLength(sample);
+ n = Math.max(Math.min(n, length), 0);
+ var last = length - 1;
+ for (var index = 0; index < n; index++) {
+ var rand = _.random(index, last);
+ var temp = sample[index];
+ sample[index] = sample[rand];
+ sample[rand] = temp;
+ }
+ return sample.slice(0, n);
};
// Sort the object's values by a criterion produced by an iteratee.
_.sortBy = function(obj, iteratee, context) {
+ var index = 0;
iteratee = cb(iteratee, context);
- return _.pluck(_.map(obj, function(value, index, list) {
+ return _.pluck(_.map(obj, function(value, key, list) {
return {
value: value,
- index: index,
- criteria: iteratee(value, index, list)
+ index: index++,
+ criteria: iteratee(value, key, list)
};
}).sort(function(left, right) {
var a = left.criteria;
@@ -2398,9 +2437,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
};
// An internal function used for aggregate "group by" operations.
- var group = function(behavior) {
+ var group = function(behavior, partition) {
return function(obj, iteratee, context) {
- var result = {};
+ var result = partition ? [[], []] : {};
iteratee = cb(iteratee, context);
_.each(obj, function(value, index) {
var key = iteratee(value, index, obj);
@@ -2429,10 +2468,15 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
if (_.has(result, key)) result[key]++; else result[key] = 1;
});
+ var reStrSymbol = /[^\ud800-\udfff]|[\ud800-\udbff][\udc00-\udfff]|[\ud800-\udfff]/g;
// Safely create a real, live array from anything iterable.
_.toArray = function(obj) {
if (!obj) return [];
if (_.isArray(obj)) return slice.call(obj);
+ if (_.isString(obj)) {
+ // Keep surrogate pair characters together
+ return obj.match(reStrSymbol);
+ }
if (isArrayLike(obj)) return _.map(obj, _.identity);
return _.values(obj);
};
@@ -2445,14 +2489,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// Split a collection into two arrays: one whose elements all satisfy the given
// predicate, and one whose elements all do not satisfy the predicate.
- _.partition = function(obj, predicate, context) {
- predicate = cb(predicate, context);
- var pass = [], fail = [];
- _.each(obj, function(value, key, obj) {
- (predicate(value, key, obj) ? pass : fail).push(value);
- });
- return [pass, fail];
- };
+ _.partition = group(function(result, value, pass) {
+ result[pass ? 0 : 1].push(value);
+ }, true);
// Array Functions
// ---------------
@@ -2461,7 +2500,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// values in the array. Aliased as `head` and `take`. The **guard** check
// allows it to work with `_.map`.
_.first = _.head = _.take = function(array, n, guard) {
- if (array == null) return void 0;
+ if (array == null || array.length < 1) return void 0;
if (n == null || guard) return array[0];
return _.initial(array, array.length - n);
};
@@ -2476,7 +2515,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// Get the last element of an array. Passing **n** will return the last N
// values in the array.
_.last = function(array, n, guard) {
- if (array == null) return void 0;
+ if (array == null || array.length < 1) return void 0;
if (n == null || guard) return array[array.length - 1];
return _.rest(array, Math.max(0, array.length - n));
};
@@ -2490,21 +2529,23 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// Trim out all falsy values from an array.
_.compact = function(array) {
- return _.filter(array, _.identity);
+ return _.filter(array, Boolean);
};
// Internal implementation of a recursive `flatten` function.
- var flatten = function(input, shallow, strict, startIndex) {
- var output = [], idx = 0;
- for (var i = startIndex || 0, length = getLength(input); i < length; i++) {
+ var flatten = function(input, shallow, strict, output) {
+ output = output || [];
+ var idx = output.length;
+ for (var i = 0, length = getLength(input); i < length; i++) {
var value = input[i];
if (isArrayLike(value) && (_.isArray(value) || _.isArguments(value))) {
- //flatten current level of array or arguments object
- if (!shallow) value = flatten(value, shallow, strict);
- var j = 0, len = value.length;
- output.length += len;
- while (j < len) {
- output[idx++] = value[j++];
+ // Flatten current level of array or arguments object.
+ if (shallow) {
+ var j = 0, len = value.length;
+ while (j < len) output[idx++] = value[j++];
+ } else {
+ flatten(value, shallow, strict, output);
+ idx = output.length;
}
} else if (!strict) {
output[idx++] = value;
@@ -2519,12 +2560,15 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
};
// Return a version of the array that does not contain the specified value(s).
- _.without = function(array) {
- return _.difference(array, slice.call(arguments, 1));
- };
+ _.without = restArguments(function(array, otherArrays) {
+ return _.difference(array, otherArrays);
+ });
// Produce a duplicate-free version of the array. If the array has already
// been sorted, you have the option of using a faster algorithm.
+ // The faster algorithm will not work with an iteratee if the iteratee
+ // is not a one-to-one function, so providing an iteratee will disable
+ // the faster algorithm.
// Aliased as `unique`.
_.uniq = _.unique = function(array, isSorted, iteratee, context) {
if (!_.isBoolean(isSorted)) {
@@ -2538,7 +2582,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
for (var i = 0, length = getLength(array); i < length; i++) {
var value = array[i],
computed = iteratee ? iteratee(value, i, array) : value;
- if (isSorted) {
+ if (isSorted && !iteratee) {
if (!i || seen !== computed) result.push(value);
seen = computed;
} else if (iteratee) {
@@ -2555,9 +2599,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// Produce an array that contains the union: each distinct element from all of
// the passed-in arrays.
- _.union = function() {
- return _.uniq(flatten(arguments, true, true));
- };
+ _.union = restArguments(function(arrays) {
+ return _.uniq(flatten(arrays, true, true));
+ });
// Produce an array that contains every item shared between all the
// passed-in arrays.
@@ -2567,7 +2611,8 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
for (var i = 0, length = getLength(array); i < length; i++) {
var item = array[i];
if (_.contains(result, item)) continue;
- for (var j = 1; j < argsLength; j++) {
+ var j;
+ for (j = 1; j < argsLength; j++) {
if (!_.contains(arguments[j], item)) break;
}
if (j === argsLength) result.push(item);
@@ -2577,21 +2622,15 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// Take the difference between one array and a number of other arrays.
// Only the elements present in just the first array will remain.
- _.difference = function(array) {
- var rest = flatten(arguments, true, true, 1);
+ _.difference = restArguments(function(array, rest) {
+ rest = flatten(rest, true, true);
return _.filter(array, function(value){
return !_.contains(rest, value);
});
- };
-
- // Zip together multiple lists into a single array -- elements that share
- // an index go together.
- _.zip = function() {
- return _.unzip(arguments);
- };
+ });
// Complement of _.zip. Unzip accepts an array of arrays and groups
- // each array's elements on shared indices
+ // each array's elements on shared indices.
_.unzip = function(array) {
var length = array && _.max(array, getLength).length || 0;
var result = Array(length);
@@ -2602,9 +2641,13 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
return result;
};
+ // Zip together multiple lists into a single array -- elements that share
+ // an index go together.
+ _.zip = restArguments(_.unzip);
+
// Converts lists into objects. Pass either a single array of `[key, value]`
// pairs, or two parallel arrays of the same length -- one of keys, and one of
- // the corresponding values.
+ // the corresponding values. Passing by pairs is the reverse of _.pairs.
_.object = function(list, values) {
var result = {};
for (var i = 0, length = getLength(list); i < length; i++) {
@@ -2617,8 +2660,8 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
return result;
};
- // Generator function to create the findIndex and findLastIndex functions
- function createPredicateIndexFinder(dir) {
+ // Generator function to create the findIndex and findLastIndex functions.
+ var createPredicateIndexFinder = function(dir) {
return function(array, predicate, context) {
predicate = cb(predicate, context);
var length = getLength(array);
@@ -2628,9 +2671,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
}
return -1;
};
- }
+ };
- // Returns the first index on an array-like that passes a predicate test
+ // Returns the first index on an array-like that passes a predicate test.
_.findIndex = createPredicateIndexFinder(1);
_.findLastIndex = createPredicateIndexFinder(-1);
@@ -2647,15 +2690,15 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
return low;
};
- // Generator function to create the indexOf and lastIndexOf functions
- function createIndexFinder(dir, predicateFind, sortedIndex) {
+ // Generator function to create the indexOf and lastIndexOf functions.
+ var createIndexFinder = function(dir, predicateFind, sortedIndex) {
return function(array, item, idx) {
var i = 0, length = getLength(array);
if (typeof idx == 'number') {
if (dir > 0) {
- i = idx >= 0 ? idx : Math.max(idx + length, i);
+ i = idx >= 0 ? idx : Math.max(idx + length, i);
} else {
- length = idx >= 0 ? Math.min(idx + 1, length) : idx + length + 1;
+ length = idx >= 0 ? Math.min(idx + 1, length) : idx + length + 1;
}
} else if (sortedIndex && idx && length) {
idx = sortedIndex(array, item);
@@ -2670,7 +2713,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
}
return -1;
};
- }
+ };
// Return the position of the first occurrence of an item in an array,
// or -1 if the item is not included in the array.
@@ -2687,7 +2730,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
stop = start || 0;
start = 0;
}
- step = step || 1;
+ if (!step) {
+ step = stop < start ? -1 : 1;
+ }
var length = Math.max(Math.ceil((stop - start) / step), 0);
var range = Array(length);
@@ -2699,11 +2744,23 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
return range;
};
+ // Chunk a single array into multiple arrays, each containing `count` or fewer
+ // items.
+ _.chunk = function(array, count) {
+ if (count == null || count < 1) return [];
+ var result = [];
+ var i = 0, length = array.length;
+ while (i < length) {
+ result.push(slice.call(array, i, i += count));
+ }
+ return result;
+ };
+
// Function (ahem) Functions
// ------------------
// Determines whether to execute a function as a constructor
- // or a normal function with the provided arguments
+ // or a normal function with the provided arguments.
var executeBound = function(sourceFunc, boundFunc, context, callingContext, args) {
if (!(callingContext instanceof boundFunc)) return sourceFunc.apply(context, args);
var self = baseCreate(sourceFunc.prototype);
@@ -2715,45 +2772,46 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// Create a function bound to a given object (assigning `this`, and arguments,
// optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if
// available.
- _.bind = function(func, context) {
- if (nativeBind && func.bind === nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
+ _.bind = restArguments(function(func, context, args) {
if (!_.isFunction(func)) throw new TypeError('Bind must be called on a function');
- var args = slice.call(arguments, 2);
- var bound = function() {
- return executeBound(func, bound, context, this, args.concat(slice.call(arguments)));
- };
+ var bound = restArguments(function(callArgs) {
+ return executeBound(func, bound, context, this, args.concat(callArgs));
+ });
return bound;
- };
+ });
// Partially apply a function by creating a version that has had some of its
// arguments pre-filled, without changing its dynamic `this` context. _ acts
- // as a placeholder, allowing any combination of arguments to be pre-filled.
- _.partial = function(func) {
- var boundArgs = slice.call(arguments, 1);
+ // as a placeholder by default, allowing any combination of arguments to be
+ // pre-filled. Set `_.partial.placeholder` for a custom placeholder argument.
+ _.partial = restArguments(function(func, boundArgs) {
+ var placeholder = _.partial.placeholder;
var bound = function() {
var position = 0, length = boundArgs.length;
var args = Array(length);
for (var i = 0; i < length; i++) {
- args[i] = boundArgs[i] === _ ? arguments[position++] : boundArgs[i];
+ args[i] = boundArgs[i] === placeholder ? arguments[position++] : boundArgs[i];
}
while (position < arguments.length) args.push(arguments[position++]);
return executeBound(func, bound, this, this, args);
};
return bound;
- };
+ });
+
+ _.partial.placeholder = _;
// Bind a number of an object's methods to that object. Remaining arguments
// are the method names to be bound. Useful for ensuring that all callbacks
// defined on an object belong to it.
- _.bindAll = function(obj) {
- var i, length = arguments.length, key;
- if (length <= 1) throw new Error('bindAll must be passed function names');
- for (i = 1; i < length; i++) {
- key = arguments[i];
+ _.bindAll = restArguments(function(obj, keys) {
+ keys = flatten(keys, false, false);
+ var index = keys.length;
+ if (index < 1) throw new Error('bindAll must be passed function names');
+ while (index--) {
+ var key = keys[index];
obj[key] = _.bind(obj[key], obj);
}
- return obj;
- };
+ });
// Memoize an expensive function by storing its results.
_.memoize = function(func, hasher) {
@@ -2769,12 +2827,11 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// Delays a function for the given number of milliseconds, and then calls
// it with the arguments supplied.
- _.delay = function(func, wait) {
- var args = slice.call(arguments, 2);
- return setTimeout(function(){
+ _.delay = restArguments(function(func, wait, args) {
+ return setTimeout(function() {
return func.apply(null, args);
}, wait);
- };
+ });
// Defers a function, scheduling it to run after the current call stack has
// cleared.
@@ -2786,17 +2843,18 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// but if you'd like to disable the execution on the leading edge, pass
// `{leading: false}`. To disable execution on the trailing edge, ditto.
_.throttle = function(func, wait, options) {
- var context, args, result;
- var timeout = null;
+ var timeout, context, args, result;
var previous = 0;
if (!options) options = {};
+
var later = function() {
previous = options.leading === false ? 0 : _.now();
timeout = null;
result = func.apply(context, args);
if (!timeout) context = args = null;
};
- return function() {
+
+ var throttled = function() {
var now = _.now();
if (!previous && options.leading === false) previous = now;
var remaining = wait - (now - previous);
@@ -2815,6 +2873,14 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
}
return result;
};
+
+ throttled.cancel = function() {
+ clearTimeout(timeout);
+ previous = 0;
+ timeout = context = args = null;
+ };
+
+ return throttled;
};
// Returns a function, that, as long as it continues to be invoked, will not
@@ -2822,35 +2888,32 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// N milliseconds. If `immediate` is passed, trigger the function on the
// leading edge, instead of the trailing.
_.debounce = function(func, wait, immediate) {
- var timeout, args, context, timestamp, result;
+ var timeout, result;
- var later = function() {
- var last = _.now() - timestamp;
-
- if (last < wait && last >= 0) {
- timeout = setTimeout(later, wait - last);
- } else {
- timeout = null;
- if (!immediate) {
- result = func.apply(context, args);
- if (!timeout) context = args = null;
- }
- }
+ var later = function(context, args) {
+ timeout = null;
+ if (args) result = func.apply(context, args);
};
- return function() {
- context = this;
- args = arguments;
- timestamp = _.now();
- var callNow = immediate && !timeout;
- if (!timeout) timeout = setTimeout(later, wait);
- if (callNow) {
- result = func.apply(context, args);
- context = args = null;
+ var debounced = restArguments(function(args) {
+ if (timeout) clearTimeout(timeout);
+ if (immediate) {
+ var callNow = !timeout;
+ timeout = setTimeout(later, wait);
+ if (callNow) result = func.apply(this, args);
+ } else {
+ timeout = _.delay(later, wait, this, args);
}
return result;
+ });
+
+ debounced.cancel = function() {
+ clearTimeout(timeout);
+ timeout = null;
};
+
+ return debounced;
};
// Returns the first function passed as an argument to the second,
@@ -2905,18 +2968,20 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// often you call it. Useful for lazy initialization.
_.once = _.partial(_.before, 2);
+ _.restArguments = restArguments;
+
// Object Functions
// ----------------
// Keys in IE < 9 that won't be iterated by `for key in ...` and thus missed.
var hasEnumBug = !{toString: null}.propertyIsEnumerable('toString');
var nonEnumerableProps = ['valueOf', 'isPrototypeOf', 'toString',
- 'propertyIsEnumerable', 'hasOwnProperty', 'toLocaleString'];
+ 'propertyIsEnumerable', 'hasOwnProperty', 'toLocaleString'];
- function collectNonEnumProps(obj, keys) {
+ var collectNonEnumProps = function(obj, keys) {
var nonEnumIdx = nonEnumerableProps.length;
var constructor = obj.constructor;
- var proto = (_.isFunction(constructor) && constructor.prototype) || ObjProto;
+ var proto = _.isFunction(constructor) && constructor.prototype || ObjProto;
// Constructor is a special case.
var prop = 'constructor';
@@ -2928,10 +2993,10 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
keys.push(prop);
}
}
- }
+ };
// Retrieve the names of an object's own properties.
- // Delegates to **ECMAScript 5**'s native `Object.keys`
+ // Delegates to **ECMAScript 5**'s native `Object.keys`.
_.keys = function(obj) {
if (!_.isObject(obj)) return [];
if (nativeKeys) return nativeKeys(obj);
@@ -2963,22 +3028,22 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
return values;
};
- // Returns the results of applying the iteratee to each element of the object
- // In contrast to _.map it returns an object
+ // Returns the results of applying the iteratee to each element of the object.
+ // In contrast to _.map it returns an object.
_.mapObject = function(obj, iteratee, context) {
iteratee = cb(iteratee, context);
- var keys = _.keys(obj),
- length = keys.length,
- results = {},
- currentKey;
- for (var index = 0; index < length; index++) {
- currentKey = keys[index];
- results[currentKey] = iteratee(obj[currentKey], currentKey, obj);
- }
- return results;
+ var keys = _.keys(obj),
+ length = keys.length,
+ results = {};
+ for (var index = 0; index < length; index++) {
+ var currentKey = keys[index];
+ results[currentKey] = iteratee(obj[currentKey], currentKey, obj);
+ }
+ return results;
};
// Convert an object into a list of `[key, value]` pairs.
+ // The opposite of _.object.
_.pairs = function(obj) {
var keys = _.keys(obj);
var length = keys.length;
@@ -3000,7 +3065,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
};
// Return a sorted list of the function names available on the object.
- // Aliased as `methods`
+ // Aliased as `methods`.
_.functions = _.methods = function(obj) {
var names = [];
for (var key in obj) {
@@ -3009,14 +3074,33 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
return names.sort();
};
+ // An internal function for creating assigner functions.
+ var createAssigner = function(keysFunc, defaults) {
+ return function(obj) {
+ var length = arguments.length;
+ if (defaults) obj = Object(obj);
+ if (length < 2 || obj == null) return obj;
+ for (var index = 1; index < length; index++) {
+ var source = arguments[index],
+ keys = keysFunc(source),
+ l = keys.length;
+ for (var i = 0; i < l; i++) {
+ var key = keys[i];
+ if (!defaults || obj[key] === void 0) obj[key] = source[key];
+ }
+ }
+ return obj;
+ };
+ };
+
// Extend a given object with all the properties in passed-in object(s).
_.extend = createAssigner(_.allKeys);
- // Assigns a given object with all the own properties in the passed-in object(s)
+ // Assigns a given object with all the own properties in the passed-in object(s).
// (https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/assign)
_.extendOwn = _.assign = createAssigner(_.keys);
- // Returns the first key on an object that passes a predicate test
+ // Returns the first key on an object that passes a predicate test.
_.findKey = function(obj, predicate, context) {
predicate = cb(predicate, context);
var keys = _.keys(obj), key;
@@ -3026,16 +3110,21 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
}
};
+ // Internal pick helper function to determine if `obj` has key `key`.
+ var keyInObj = function(value, key, obj) {
+ return key in obj;
+ };
+
// Return a copy of the object only containing the whitelisted properties.
- _.pick = function(object, oiteratee, context) {
- var result = {}, obj = object, iteratee, keys;
+ _.pick = restArguments(function(obj, keys) {
+ var result = {}, iteratee = keys[0];
if (obj == null) return result;
- if (_.isFunction(oiteratee)) {
+ if (_.isFunction(iteratee)) {
+ if (keys.length > 1) iteratee = optimizeCb(iteratee, keys[1]);
keys = _.allKeys(obj);
- iteratee = optimizeCb(oiteratee, context);
} else {
- keys = flatten(arguments, false, false, 1);
- iteratee = function(value, key, obj) { return key in obj; };
+ iteratee = keyInObj;
+ keys = flatten(keys, false, false);
obj = Object(obj);
}
for (var i = 0, length = keys.length; i < length; i++) {
@@ -3044,20 +3133,22 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
if (iteratee(value, key, obj)) result[key] = value;
}
return result;
- };
+ });
- // Return a copy of the object without the blacklisted properties.
- _.omit = function(obj, iteratee, context) {
+ // Return a copy of the object without the blacklisted properties.
+ _.omit = restArguments(function(obj, keys) {
+ var iteratee = keys[0], context;
if (_.isFunction(iteratee)) {
iteratee = _.negate(iteratee);
+ if (keys.length > 1) context = keys[1];
} else {
- var keys = _.map(flatten(arguments, false, false, 1), String);
+ keys = _.map(flatten(keys, false, false), String);
iteratee = function(value, key) {
return !_.contains(keys, key);
};
}
return _.pick(obj, iteratee, context);
- };
+ });
// Fill in a given object with default properties.
_.defaults = createAssigner(_.allKeys, true);
@@ -3099,12 +3190,23 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// Internal recursive comparison function for `isEqual`.
- var eq = function(a, b, aStack, bStack) {
+ var eq, deepEq;
+ eq = function(a, b, aStack, bStack) {
// Identical objects are equal. `0 === -0`, but they aren't identical.
// See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
if (a === b) return a !== 0 || 1 / a === 1 / b;
- // A strict comparison is necessary because `null == undefined`.
- if (a == null || b == null) return a === b;
+ // `null` or `undefined` only equal to itself (strict comparison).
+ if (a == null || b == null) return false;
+ // `NaN`s are equivalent, but non-reflexive.
+ if (a !== a) return b !== b;
+ // Exhaust primitive checks
+ var type = typeof a;
+ if (type !== 'function' && type !== 'object' && typeof b != 'object') return false;
+ return deepEq(a, b, aStack, bStack);
+ };
+
+ // Internal recursive comparison function for `isEqual`.
+ deepEq = function(a, b, aStack, bStack) {
// Unwrap any wrapped objects.
if (a instanceof _) a = a._wrapped;
if (b instanceof _) b = b._wrapped;
@@ -3121,7 +3223,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
return '' + a === '' + b;
case '[object Number]':
// `NaN`s are equivalent, but non-reflexive.
- // Object(NaN) is equivalent to NaN
+ // Object(NaN) is equivalent to NaN.
if (+a !== +a) return +b !== +b;
// An `egal` comparison is performed for other numeric values.
return +a === 0 ? 1 / +a === 1 / b : +a === +b;
@@ -3131,6 +3233,8 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// millisecond representations. Note that invalid dates with millisecond representations
// of `NaN` are not equivalent.
return +a === +b;
+ case '[object Symbol]':
+ return SymbolProto.valueOf.call(a) === SymbolProto.valueOf.call(b);
}
var areArrays = className === '[object Array]';
@@ -3221,8 +3325,8 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
return type === 'function' || type === 'object' && !!obj;
};
- // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp, isError.
- _.each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp', 'Error'], function(name) {
+ // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp, isError, isMap, isWeakMap, isSet, isWeakSet.
+ _.each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp', 'Error', 'Symbol', 'Map', 'WeakMap', 'Set', 'WeakSet'], function(name) {
_['is' + name] = function(obj) {
return toString.call(obj) === '[object ' + name + ']';
};
@@ -3237,8 +3341,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
}
// Optimize `isFunction` if appropriate. Work around some typeof bugs in old v8,
- // IE 11 (#1621), and in Safari 8 (#1929).
- if (typeof /./ != 'function' && typeof Int8Array != 'object') {
+ // IE 11 (#1621), Safari 8 (#1929), and PhantomJS (#2236).
+ var nodelist = root.document && root.document.childNodes;
+ if (typeof /./ != 'function' && typeof Int8Array != 'object' && typeof nodelist != 'function') {
_.isFunction = function(obj) {
return typeof obj == 'function' || false;
};
@@ -3246,12 +3351,12 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// Is a given object a finite number?
_.isFinite = function(obj) {
- return isFinite(obj) && !isNaN(parseFloat(obj));
+ return !_.isSymbol(obj) && isFinite(obj) && !isNaN(parseFloat(obj));
};
- // Is the given value `NaN`? (NaN is the only number which does not equal itself).
+ // Is the given value `NaN`?
_.isNaN = function(obj) {
- return _.isNumber(obj) && obj !== +obj;
+ return _.isNumber(obj) && isNaN(obj);
};
// Is a given value a boolean?
@@ -3271,8 +3376,19 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// Shortcut function for checking if an object has a given property directly
// on itself (in other words, not on a prototype).
- _.has = function(obj, key) {
- return obj != null && hasOwnProperty.call(obj, key);
+ _.has = function(obj, path) {
+ if (!_.isArray(path)) {
+ return obj != null && hasOwnProperty.call(obj, path);
+ }
+ var length = path.length;
+ for (var i = 0; i < length; i++) {
+ var key = path[i];
+ if (obj == null || !hasOwnProperty.call(obj, key)) {
+ return false;
+ }
+ obj = obj[key];
+ }
+ return !!length;
};
// Utility Functions
@@ -3299,12 +3415,24 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
_.noop = function(){};
- _.property = property;
+ // Creates a function that, when passed an object, will traverse that object’s
+ // properties down the given `path`, specified as an array of keys or indexes.
+ _.property = function(path) {
+ if (!_.isArray(path)) {
+ return shallowProperty(path);
+ }
+ return function(obj) {
+ return deepGet(obj, path);
+ };
+ };
// Generates a function for a given object that returns a given property.
_.propertyOf = function(obj) {
- return obj == null ? function(){} : function(key) {
- return obj[key];
+ if (obj == null) {
+ return function(){};
+ }
+ return function(path) {
+ return !_.isArray(path) ? obj[path] : deepGet(obj, path);
};
};
@@ -3339,7 +3467,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
return new Date().getTime();
};
- // List of HTML entities for escaping.
+ // List of HTML entities for escaping.
var escapeMap = {
'&': '&',
'<': '<',
@@ -3355,7 +3483,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
var escaper = function(match) {
return map[match];
};
- // Regexes for identifying a key that needs to be escaped
+ // Regexes for identifying a key that needs to be escaped.
var source = '(?:' + _.keys(map).join('|') + ')';
var testRegexp = RegExp(source);
var replaceRegexp = RegExp(source, 'g');
@@ -3367,14 +3495,24 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
_.escape = createEscaper(escapeMap);
_.unescape = createEscaper(unescapeMap);
- // If the value of the named `property` is a function then invoke it with the
- // `object` as context; otherwise, return it.
- _.result = function(object, property, fallback) {
- var value = object == null ? void 0 : object[property];
- if (value === void 0) {
- value = fallback;
+ // Traverses the children of `obj` along `path`. If a child is a function, it
+ // is invoked with its parent as context. Returns the value of the final
+ // child, or `fallback` if any child is undefined.
+ _.result = function(obj, path, fallback) {
+ if (!_.isArray(path)) path = [path];
+ var length = path.length;
+ if (!length) {
+ return _.isFunction(fallback) ? fallback.call(obj) : fallback;
}
- return _.isFunction(value) ? value.call(object) : value;
+ for (var i = 0; i < length; i++) {
+ var prop = obj == null ? void 0 : obj[path[i]];
+ if (prop === void 0) {
+ prop = fallback;
+ i = length; // Ensure we don't continue iterating.
+ }
+ obj = _.isFunction(prop) ? prop.call(obj) : prop;
+ }
+ return obj;
};
// Generate a unique integer id (unique within the entire client session).
@@ -3388,9 +3526,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// By default, Underscore uses ERB-style template delimiters, change the
// following template settings to use alternative delimiters.
_.templateSettings = {
- evaluate : /<%([\s\S]+?)%>/g,
- interpolate : /<%=([\s\S]+?)%>/g,
- escape : /<%-([\s\S]+?)%>/g
+ evaluate: /<%([\s\S]+?)%>/g,
+ interpolate: /<%=([\s\S]+?)%>/g,
+ escape: /<%-([\s\S]+?)%>/g
};
// When customizing `templateSettings`, if you don't want to define an
@@ -3401,15 +3539,15 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// Certain characters need to be escaped so that they can be put into a
// string literal.
var escapes = {
- "'": "'",
- '\\': '\\',
- '\r': 'r',
- '\n': 'n',
+ "'": "'",
+ '\\': '\\',
+ '\r': 'r',
+ '\n': 'n',
'\u2028': 'u2028',
'\u2029': 'u2029'
};
- var escaper = /\\|'|\r|\n|\u2028|\u2029/g;
+ var escapeRegExp = /\\|'|\r|\n|\u2028|\u2029/g;
var escapeChar = function(match) {
return '\\' + escapes[match];
@@ -3434,7 +3572,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
var index = 0;
var source = "__p+='";
text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
- source += text.slice(index, offset).replace(escaper, escapeChar);
+ source += text.slice(index, offset).replace(escapeRegExp, escapeChar);
index = offset + match.length;
if (escape) {
@@ -3445,7 +3583,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
source += "';\n" + evaluate + "\n__p+='";
}
- // Adobe VMs need the match returned to produce the correct offest.
+ // Adobe VMs need the match returned to produce the correct offset.
return match;
});
source += "';\n";
@@ -3457,8 +3595,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
"print=function(){__p+=__j.call(arguments,'');};\n" +
source + 'return __p;\n';
+ var render;
try {
- var render = new Function(settings.variable || 'obj', '_', source);
+ render = new Function(settings.variable || 'obj', '_', source);
} catch (e) {
e.source = source;
throw e;
@@ -3489,7 +3628,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
// underscore functions. Wrapped objects may be chained.
// Helper function to continue chaining intermediate results.
- var result = function(instance, obj) {
+ var chainResult = function(instance, obj) {
return instance._chain ? _(obj).chain() : obj;
};
@@ -3500,9 +3639,10 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
_.prototype[name] = function() {
var args = [this._wrapped];
push.apply(args, arguments);
- return result(this, func.apply(_, args));
+ return chainResult(this, func.apply(_, args));
};
});
+ return _;
};
// Add all of the Underscore functions to the wrapper object.
@@ -3515,7 +3655,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
var obj = this._wrapped;
method.apply(obj, arguments);
if ((name === 'shift' || name === 'splice') && obj.length === 0) delete obj[0];
- return result(this, obj);
+ return chainResult(this, obj);
};
});
@@ -3523,7 +3663,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
_.each(['concat', 'join', 'slice'], function(name) {
var method = ArrayProto[name];
_.prototype[name] = function() {
- return result(this, method.apply(this._wrapped, arguments));
+ return chainResult(this, method.apply(this._wrapped, arguments));
};
});
@@ -3537,7 +3677,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
_.prototype.valueOf = _.prototype.toJSON = _.prototype.value;
_.prototype.toString = function() {
- return '' + this._wrapped;
+ return String(this._wrapped);
};
// AMD registration happens at the end for compatibility with AMD loaders
@@ -3553,8 +3693,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
}).apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
}
-}.call(this));
+}());
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(7), __webpack_require__(65)(module)))
/***/ }),
/* 2 */
@@ -3566,7 +3707,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.getUnitFromValue = exports.normalizeFloat = exports.shallowDiff = exports.camelCase = exports.matches = exports.upFirst = exports.hasDnd = exports.off = exports.on = undefined;
+exports.getUnitFromValue = exports.normalizeFloat = exports.shallowDiff = exports.getElement = exports.camelCase = exports.matches = exports.upFirst = exports.hasDnd = exports.off = exports.on = undefined;
var _underscore = __webpack_require__(1);
@@ -3677,12 +3818,26 @@ var hasDnd = function hasDnd(em) {
return 'draggable' in document.createElement('i') && (em ? em.get('Config').nativeDnD : 1);
};
+/**
+ * Ensure to fetch the element from the input argument
+ * @param {HTMLElement|Component} el Component or HTML element
+ * @return {HTMLElement}
+ */
+var getElement = function getElement(el) {
+ if ((0, _underscore.isElement)(el)) {
+ return el;
+ } else if (el.getEl) {
+ return el.getEl();
+ }
+};
+
exports.on = on;
exports.off = off;
exports.hasDnd = hasDnd;
exports.upFirst = upFirst;
exports.matches = matches;
exports.camelCase = camelCase;
+exports.getElement = getElement;
exports.shallowDiff = shallowDiff;
exports.normalizeFloat = normalizeFloat;
exports.getUnitFromValue = getUnitFromValue;
@@ -3692,13 +3847,19 @@ exports.getUnitFromValue = getUnitFromValue;
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
+
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
var _underscore = __webpack_require__(1);
-var ComponentsView = __webpack_require__(50);
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-module.exports = Backbone.View.extend({
+var ComponentsView = __webpack_require__(52);
+
+module.exports = _backbone2.default.View.extend({
className: function className() {
return this.getClasses();
},
@@ -3735,7 +3896,7 @@ module.exports = Backbone.View.extend({
this.init();
},
remove: function remove() {
- Backbone.View.prototype.remove.apply(this);
+ _backbone2.default.View.prototype.remove.apply(this);
var children = this.childrenView;
children && children.stopListening();
},
@@ -3798,7 +3959,10 @@ module.exports = Backbone.View.extend({
* @param {Event} e
* @private
* */
- updateStatus: function updateStatus(e) {
+ updateStatus: function updateStatus() {
+ var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+ var em = this.em;
var el = this.el;
var status = this.model.get('status');
var pfx = this.pfx;
@@ -3806,7 +3970,9 @@ module.exports = Backbone.View.extend({
var selectedCls = pfx + 'selected';
var selectedParentCls = selectedCls + '-parent';
var freezedCls = ppfx + 'freezed';
- this.$el.removeClass(selectedCls + ' ' + selectedParentCls + ' ' + freezedCls);
+ var hoveredCls = ppfx + 'hovered';
+ var toRemove = [selectedCls, selectedParentCls, freezedCls, hoveredCls];
+ this.$el.removeClass(toRemove.join(' '));
var actualCls = el.getAttribute('class') || '';
var cls = '';
@@ -3823,13 +3989,13 @@ module.exports = Backbone.View.extend({
case 'freezed-selected':
cls = actualCls + ' ' + freezedCls + ' ' + selectedCls;
break;
+ case 'hovered':
+ cls = !opts.avoidHover ? actualCls + ' ' + hoveredCls : '';
+ break;
}
cls = cls.trim();
-
- if (cls) {
- el.setAttribute('class', cls);
- }
+ cls && el.setAttribute('class', cls);
},
@@ -3911,7 +4077,7 @@ module.exports = Backbone.View.extend({
* */
updateAttributes: function updateAttributes() {
var model = this.model;
- var attrs = {};
+ var attrs = { 'data-gjs-type': model.get('type') || 'default' };
var attr = model.get('attributes');
var src = model.get('src');
@@ -4050,7 +4216,6 @@ module.exports = Backbone.View.extend({
},
onRender: function onRender() {}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
/* 4 */
@@ -4065,17 +4230,17 @@ var _underscore = __webpack_require__(1);
var _mixins = __webpack_require__(2);
-var _Styleable = __webpack_require__(46);
+var _Styleable = __webpack_require__(48);
var _Styleable2 = _interopRequireDefault(_Styleable);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var Backbone = __webpack_require__(0);
-var Components = __webpack_require__(49);
-var Selector = __webpack_require__(7);
+var Components = __webpack_require__(51);
+var Selector = __webpack_require__(8);
var Selectors = __webpack_require__(11);
-var Traits = __webpack_require__(151);
+var Traits = __webpack_require__(154);
var componentList = {};
var componentIndex = 0;
@@ -4973,17 +5138,23 @@ module.exports = Component;
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
+
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
var _underscore = __webpack_require__(1);
var _mixins = __webpack_require__(2);
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
var clearProp = 'data-clear-style';
-module.exports = Backbone.View.extend({
+module.exports = _backbone2.default.View.extend({
template: function template(model) {
var pfx = this.pfx;
return '\n \n ' + this.templateLabel(model) + '\n
\n \n ' + this.templateInput(model) + '\n
\n ';
@@ -5464,7 +5635,6 @@ module.exports = Backbone.View.extend({
this.setValue(model.get('value'), { targetUpdate: 1 });
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
/* 6 */
@@ -6218,6 +6388,16 @@ function collapsedSpanAtSide(line, start) {
function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true) }
function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false) }
+function collapsedSpanAround(line, ch) {
+ var sps = sawCollapsedSpans && line.markedSpans, found;
+ if (sps) { for (var i = 0; i < sps.length; ++i) {
+ var sp = sps[i];
+ if (sp.marker.collapsed && (sp.from == null || sp.from < ch) && (sp.to == null || sp.to > ch) &&
+ (!found || compareCollapsedMarkers(found, sp.marker) < 0)) { found = sp.marker; }
+ } }
+ return found
+}
+
// Test whether there exists a collapsed span that partially
// overlaps (covers the start or end, but not both) of a new span.
// Such overlap is not allowed.
@@ -8252,12 +8432,11 @@ function coordsChar(cm, x, y) {
var lineObj = getLine(doc, lineN);
for (;;) {
var found = coordsCharInner(cm, lineObj, lineN, x, y);
- var merged = collapsedSpanAtEnd(lineObj);
- var mergedPos = merged && merged.find(0, true);
- if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
- { lineN = lineNo(lineObj = mergedPos.to.line); }
- else
- { return found }
+ var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 ? 1 : 0));
+ if (!collapsed) { return found }
+ var rangeEnd = collapsed.find(1);
+ if (rangeEnd.line == lineN) { return rangeEnd }
+ lineObj = getLine(doc, lineN = rangeEnd.line);
}
}
@@ -9017,6 +9196,7 @@ var NativeScrollbars = function(place, scroll, cm) {
this.cm = cm;
var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
+ vert.tabIndex = horiz.tabIndex = -1;
place(vert); place(horiz);
on(vert, "scroll", function () {
@@ -10268,7 +10448,7 @@ function addChangeToHistory(doc, change, selAfter, opId) {
if ((hist.lastOp == opId ||
hist.lastOrigin == change.origin && change.origin &&
- ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
+ ((change.origin.charAt(0) == "+" && hist.lastModTime > time - (doc.cm ? doc.cm.options.historyEventDelay : 500)) ||
change.origin.charAt(0) == "*")) &&
(cur = lastChangeEvent(hist, hist.lastOp == opId))) {
// Merge this change into the last event
@@ -10697,7 +10877,8 @@ function makeChangeInner(doc, change) {
// Revert a change stored in a document's history.
function makeChangeFromHistory(doc, type, allowSelectionOnly) {
- if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) { return }
+ var suppress = doc.cm && doc.cm.state.suppressEdits;
+ if (suppress && !allowSelectionOnly) { return }
var hist = doc.history, event, selAfter = doc.sel;
var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
@@ -10722,8 +10903,10 @@ function makeChangeFromHistory(doc, type, allowSelectionOnly) {
return
}
selAfter = event;
- }
- else { break }
+ } else if (suppress) {
+ source.push(event);
+ return
+ } else { break }
}
// Build up a reverse change object to add to the opposite history
@@ -10879,7 +11062,7 @@ function makeChangeSingleDocInEditor(cm, change, spans) {
function replaceRange(doc, code, from, to, origin) {
if (!to) { to = from; }
if (cmp(to, from) < 0) { var assign;
- (assign = [to, from], from = assign[0], to = assign[1], assign); }
+ (assign = [to, from], from = assign[0], to = assign[1]); }
if (typeof code == "string") { code = doc.splitLines(code); }
makeChange(doc, {from: from, to: to, text: code, origin: origin});
}
@@ -10975,10 +11158,10 @@ function LeafChunk(lines) {
}
LeafChunk.prototype = {
- chunkSize: function chunkSize() { return this.lines.length },
+ chunkSize: function() { return this.lines.length },
// Remove the n lines at offset 'at'.
- removeInner: function removeInner(at, n) {
+ removeInner: function(at, n) {
var this$1 = this;
for (var i = at, e = at + n; i < e; ++i) {
@@ -10991,13 +11174,13 @@ LeafChunk.prototype = {
},
// Helper used to collapse a small branch into a single leaf.
- collapse: function collapse(lines) {
+ collapse: function(lines) {
lines.push.apply(lines, this.lines);
},
// Insert the given array of lines at offset 'at', count them as
// having the given height.
- insertInner: function insertInner(at, lines, height) {
+ insertInner: function(at, lines, height) {
var this$1 = this;
this.height += height;
@@ -11006,7 +11189,7 @@ LeafChunk.prototype = {
},
// Used to iterate over a part of the tree.
- iterN: function iterN(at, n, op) {
+ iterN: function(at, n, op) {
var this$1 = this;
for (var e = at + n; at < e; ++at)
@@ -11030,9 +11213,9 @@ function BranchChunk(children) {
}
BranchChunk.prototype = {
- chunkSize: function chunkSize() { return this.size },
+ chunkSize: function() { return this.size },
- removeInner: function removeInner(at, n) {
+ removeInner: function(at, n) {
var this$1 = this;
this.size -= n;
@@ -11058,13 +11241,13 @@ BranchChunk.prototype = {
}
},
- collapse: function collapse(lines) {
+ collapse: function(lines) {
var this$1 = this;
for (var i = 0; i < this.children.length; ++i) { this$1.children[i].collapse(lines); }
},
- insertInner: function insertInner(at, lines, height) {
+ insertInner: function(at, lines, height) {
var this$1 = this;
this.size += lines.length;
@@ -11093,7 +11276,7 @@ BranchChunk.prototype = {
},
// When a node has grown, check whether it should be split.
- maybeSpill: function maybeSpill() {
+ maybeSpill: function() {
if (this.children.length <= 10) { return }
var me = this;
do {
@@ -11115,7 +11298,7 @@ BranchChunk.prototype = {
me.parent.maybeSpill();
},
- iterN: function iterN(at, n, op) {
+ iterN: function(at, n, op) {
var this$1 = this;
for (var i = 0; i < this.children.length; ++i) {
@@ -11199,7 +11382,7 @@ function addLineWidget(doc, handle, node, options) {
}
return true
});
- signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle));
+ if (cm) { signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle)); }
return widget
}
@@ -12793,8 +12976,8 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
var dragEnd = operation(cm, function (e) {
if (webkit) { display.scroller.draggable = false; }
cm.state.draggingText = false;
- off(document, "mouseup", dragEnd);
- off(document, "mousemove", mouseMove);
+ off(display.wrapper.ownerDocument, "mouseup", dragEnd);
+ off(display.wrapper.ownerDocument, "mousemove", mouseMove);
off(display.scroller, "dragstart", dragStart);
off(display.scroller, "drop", dragEnd);
if (!moved) {
@@ -12803,7 +12986,7 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
{ extendSelection(cm.doc, pos, null, null, behavior.extend); }
// Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
if (webkit || ie && ie_version == 9)
- { setTimeout(function () {document.body.focus(); display.input.focus();}, 20); }
+ { setTimeout(function () {display.wrapper.ownerDocument.body.focus(); display.input.focus();}, 20); }
else
{ display.input.focus(); }
}
@@ -12818,8 +13001,8 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
dragEnd.copy = !behavior.moveOnDrag;
// IE's approach to draggable
if (display.scroller.dragDrop) { display.scroller.dragDrop(); }
- on(document, "mouseup", dragEnd);
- on(document, "mousemove", mouseMove);
+ on(display.wrapper.ownerDocument, "mouseup", dragEnd);
+ on(display.wrapper.ownerDocument, "mousemove", mouseMove);
on(display.scroller, "dragstart", dragStart);
on(display.scroller, "drop", dragEnd);
@@ -12951,19 +13134,19 @@ function leftButtonSelect(cm, event, start, behavior) {
counter = Infinity;
e_preventDefault(e);
display.input.focus();
- off(document, "mousemove", move);
- off(document, "mouseup", up);
+ off(display.wrapper.ownerDocument, "mousemove", move);
+ off(display.wrapper.ownerDocument, "mouseup", up);
doc.history.lastSelOrigin = null;
}
var move = operation(cm, function (e) {
- if (!e_button(e)) { done(e); }
+ if (e.buttons === 0 || !e_button(e)) { done(e); }
else { extend(e); }
});
var up = operation(cm, done);
cm.state.selectingText = up;
- on(document, "mousemove", move);
- on(document, "mouseup", up);
+ on(display.wrapper.ownerDocument, "mousemove", move);
+ on(display.wrapper.ownerDocument, "mouseup", up);
}
// Used when mouse-selecting to adjust the anchor to the proper side
@@ -14236,8 +14419,12 @@ ContentEditableInput.prototype.showSelection = function (info, takeFocus) {
this.showMultipleSelections(info);
};
+ContentEditableInput.prototype.getSelection = function () {
+ return this.cm.display.wrapper.ownerDocument.getSelection()
+};
+
ContentEditableInput.prototype.showPrimarySelection = function () {
- var sel = window.getSelection(), cm = this.cm, prim = cm.doc.sel.primary();
+ var sel = this.getSelection(), cm = this.cm, prim = cm.doc.sel.primary();
var from = prim.from(), to = prim.to();
if (cm.display.viewTo == cm.display.viewFrom || from.line >= cm.display.viewTo || to.line < cm.display.viewFrom) {
@@ -14304,13 +14491,13 @@ ContentEditableInput.prototype.showMultipleSelections = function (info) {
};
ContentEditableInput.prototype.rememberSelection = function () {
- var sel = window.getSelection();
+ var sel = this.getSelection();
this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
};
ContentEditableInput.prototype.selectionInEditor = function () {
- var sel = window.getSelection();
+ var sel = this.getSelection();
if (!sel.rangeCount) { return false }
var node = sel.getRangeAt(0).commonAncestorContainer;
return contains(this.div, node)
@@ -14345,14 +14532,14 @@ ContentEditableInput.prototype.receivedFocus = function () {
};
ContentEditableInput.prototype.selectionChanged = function () {
- var sel = window.getSelection();
+ var sel = this.getSelection();
return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset
};
ContentEditableInput.prototype.pollSelection = function () {
if (this.readDOMTimeout != null || this.gracePeriod || !this.selectionChanged()) { return }
- var sel = window.getSelection(), cm = this.cm;
+ var sel = this.getSelection(), cm = this.cm;
// On Android Chrome (version 56, at least), backspacing into an
// uneditable block element will put the cursor in that element,
// and then, because it's not editable, hide the virtual keyboard.
@@ -14486,7 +14673,7 @@ ContentEditableInput.prototype.setUneditable = function (node) {
};
ContentEditableInput.prototype.onKeyPress = function (e) {
- if (e.charCode == 0) { return }
+ if (e.charCode == 0 || this.composing) { return }
e.preventDefault();
if (!this.cm.isReadOnly())
{ operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0); }
@@ -14526,12 +14713,13 @@ function isInGutter(node) {
function badPos(pos, bad) { if (bad) { pos.bad = true; } return pos }
function domTextBetween(cm, from, to, fromLine, toLine) {
- var text = "", closing = false, lineSep = cm.doc.lineSeparator();
+ var text = "", closing = false, lineSep = cm.doc.lineSeparator(), extraLinebreak = false;
function recognizeMarker(id) { return function (marker) { return marker.id == id; } }
function close() {
if (closing) {
text += lineSep;
- closing = false;
+ if (extraLinebreak) { text += lineSep; }
+ closing = extraLinebreak = false;
}
}
function addText(str) {
@@ -14543,8 +14731,8 @@ function domTextBetween(cm, from, to, fromLine, toLine) {
function walk(node) {
if (node.nodeType == 1) {
var cmText = node.getAttribute("cm-text");
- if (cmText != null) {
- addText(cmText || node.textContent.replace(/\u200b/g, ""));
+ if (cmText) {
+ addText(cmText);
return
}
var markerID = node.getAttribute("cm-marker"), range$$1;
@@ -14555,19 +14743,24 @@ function domTextBetween(cm, from, to, fromLine, toLine) {
return
}
if (node.getAttribute("contenteditable") == "false") { return }
- var isBlock = /^(pre|div|p)$/i.test(node.nodeName);
+ var isBlock = /^(pre|div|p|li|table|br)$/i.test(node.nodeName);
+ if (!/^br$/i.test(node.nodeName) && node.textContent.length == 0) { return }
+
if (isBlock) { close(); }
for (var i = 0; i < node.childNodes.length; i++)
{ walk(node.childNodes[i]); }
+
+ if (/^(pre|p)$/i.test(node.nodeName)) { extraLinebreak = true; }
if (isBlock) { closing = true; }
} else if (node.nodeType == 3) {
- addText(node.nodeValue);
+ addText(node.nodeValue.replace(/\u200b/g, "").replace(/\u00a0/g, " "));
}
}
for (;;) {
walk(from);
if (from == to) { break }
from = from.nextSibling;
+ extraLinebreak = false;
}
return text
}
@@ -14668,13 +14861,10 @@ TextareaInput.prototype.init = function (display) {
var this$1 = this;
var input = this, cm = this.cm;
+ this.createField(display);
+ var te = this.textarea;
- // Wraps and hides input textarea
- var div = this.wrapper = hiddenTextarea();
- // The semihidden textarea that is focused when the editor is
- // focused, and receives input.
- var te = this.textarea = div.firstChild;
- display.wrapper.insertBefore(div, display.wrapper.firstChild);
+ display.wrapper.insertBefore(this.wrapper, display.wrapper.firstChild);
// Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
if (ios) { te.style.width = "0px"; }
@@ -14741,6 +14931,14 @@ TextareaInput.prototype.init = function (display) {
});
};
+TextareaInput.prototype.createField = function (_display) {
+ // Wraps and hides input textarea
+ this.wrapper = hiddenTextarea();
+ // The semihidden textarea that is focused when the editor is
+ // focused, and receives input.
+ this.textarea = this.wrapper.firstChild;
+};
+
TextareaInput.prototype.prepareSelection = function () {
// Redraw the selection and/or cursor
var cm = this.cm, display = cm.display, doc = cm.doc;
@@ -15134,7 +15332,7 @@ CodeMirror$1.fromTextArea = fromTextArea;
addLegacyProps(CodeMirror$1);
-CodeMirror$1.version = "5.34.0";
+CodeMirror$1.version = "5.38.0";
return CodeMirror$1;
@@ -15143,6 +15341,33 @@ return CodeMirror$1;
/***/ }),
/* 7 */
+/***/ (function(module, exports) {
+
+var g;
+
+// This works in non-strict mode
+g = (function() {
+ return this;
+})();
+
+try {
+ // This works if eval is allowed (see CSP)
+ g = g || Function("return this")() || (1,eval)("this");
+} catch(e) {
+ // This works if the window reference is available
+ if(typeof window === "object")
+ g = window;
+}
+
+// g can still be undefined, but nothing to do about it...
+// We return undefined, instead of nothing here, so it's
+// easier to handle this case. if(!global) { ...}
+
+module.exports = g;
+
+
+/***/ }),
+/* 8 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -15228,7 +15453,7 @@ var Selector = Backbone.Model.extend({
module.exports = Selector;
/***/ }),
-/* 8 */
+/* 9 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -15261,6 +15486,7 @@ module.exports = Backbone.View.extend({
this.inputhClass = this.ppfx + 'input-holder';
model.off('change:value', this.onValueChange);
this.listenTo(model, 'change:value', this.onValueChange);
+ model.view = this;
this.tmpl = '';
},
@@ -15295,7 +15521,7 @@ module.exports = Backbone.View.extend({
this.setInputValue(mod.get('value'));
} else {
var _value = this.getValueForTarget();
- mod.setTargetValue(_value);
+ mod.setTargetValue(_value, opts);
}
},
@@ -15305,7 +15531,8 @@ module.exports = Backbone.View.extend({
* @private
*/
renderLabel: function renderLabel() {
- this.$el.html('' + this.getLabel() + '
');
+ var label = this.getLabel();
+ this.$el.html('' + label + '
');
},
@@ -15329,14 +15556,11 @@ module.exports = Backbone.View.extend({
getInputEl: function getInputEl() {
if (!this.$input) {
var md = this.model;
- var trg = this.target;
- var name = md.get('name');
var plh = md.get('placeholder') || md.get('default') || '';
var type = md.get('type') || 'text';
- var attrs = trg.get('attributes');
var min = md.get('min');
var max = md.get('max');
- var value = md.get('changeProp') ? trg.get(name) : md.get('value') || attrs[name];
+ var value = this.getModelValue();
var input = $('');
if (value) {
@@ -15356,7 +15580,7 @@ module.exports = Backbone.View.extend({
return this.$input.get(0);
},
getModelValue: function getModelValue() {
- var value;
+ var value = void 0;
var model = this.model;
var target = this.target;
var name = model.get('name');
@@ -15368,7 +15592,7 @@ module.exports = Backbone.View.extend({
value = model.get('value') || attrs[name];
}
- return value;
+ return !(0, _underscore.isUndefined)(value) ? value : '';
},
@@ -15394,7 +15618,7 @@ module.exports = Backbone.View.extend({
});
/***/ }),
-/* 9 */
+/* 10 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -16361,33 +16585,6 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;
return cash;
});
-/***/ }),
-/* 10 */
-/***/ (function(module, exports) {
-
-var g;
-
-// This works in non-strict mode
-g = (function() {
- return this;
-})();
-
-try {
- // This works if eval is allowed (see CSP)
- g = g || Function("return this")() || (1,eval)("this");
-} catch(e) {
- // This works if the window reference is available
- if(typeof window === "object")
- g = window;
-}
-
-// g can still be undefined, but nothing to do about it...
-// We return undefined, instead of nothing here, so it's
-// easier to handle this case. if(!global) { ...}
-
-module.exports = g;
-
-
/***/ }),
/* 11 */
/***/ (function(module, exports, __webpack_require__) {
@@ -16397,7 +16594,7 @@ module.exports = g;
var _underscore = __webpack_require__(1);
-var Selector = __webpack_require__(7);
+var Selector = __webpack_require__(8);
module.exports = __webpack_require__(0).Collection.extend({
model: Selector,
@@ -16431,7 +16628,7 @@ module.exports = __webpack_require__(0).Collection.extend({
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-var _TypeableCollection = __webpack_require__(31);
+var _TypeableCollection = __webpack_require__(33);
var _TypeableCollection2 = _interopRequireDefault(_TypeableCollection);
@@ -16442,8 +16639,8 @@ var Property = __webpack_require__(13);
module.exports = __webpack_require__(0).Collection.extend(_TypeableCollection2.default).extend({
types: [{
id: 'stack',
- model: __webpack_require__(120),
- view: __webpack_require__(33),
+ model: __webpack_require__(123),
+ view: __webpack_require__(35),
isType: function isType(value) {
if (value && value.type == 'stack') {
return value;
@@ -16451,7 +16648,7 @@ module.exports = __webpack_require__(0).Collection.extend(_TypeableCollection2.d
}
}, {
id: 'composite',
- model: __webpack_require__(32),
+ model: __webpack_require__(34),
view: __webpack_require__(17),
isType: function isType(value) {
if (value && value.type == 'composite') {
@@ -16461,7 +16658,7 @@ module.exports = __webpack_require__(0).Collection.extend(_TypeableCollection2.d
}, {
id: 'file',
model: Property,
- view: __webpack_require__(39),
+ view: __webpack_require__(41),
isType: function isType(value) {
if (value && value.type == 'file') {
return value;
@@ -16470,7 +16667,7 @@ module.exports = __webpack_require__(0).Collection.extend(_TypeableCollection2.d
}, {
id: 'color',
model: Property,
- view: __webpack_require__(37),
+ view: __webpack_require__(39),
isType: function isType(value) {
if (value && value.type == 'color') {
return value;
@@ -16478,8 +16675,8 @@ module.exports = __webpack_require__(0).Collection.extend(_TypeableCollection2.d
}
}, {
id: 'select',
- model: __webpack_require__(40),
- view: __webpack_require__(36),
+ model: __webpack_require__(42),
+ view: __webpack_require__(38),
isType: function isType(value) {
if (value && value.type == 'select') {
return value;
@@ -16487,8 +16684,8 @@ module.exports = __webpack_require__(0).Collection.extend(_TypeableCollection2.d
}
}, {
id: 'radio',
- model: __webpack_require__(40),
- view: __webpack_require__(35),
+ model: __webpack_require__(42),
+ view: __webpack_require__(37),
isType: function isType(value) {
if (value && value.type == 'radio') {
return value;
@@ -16496,8 +16693,8 @@ module.exports = __webpack_require__(0).Collection.extend(_TypeableCollection2.d
}
}, {
id: 'slider',
- model: __webpack_require__(126),
- view: __webpack_require__(127),
+ model: __webpack_require__(129),
+ view: __webpack_require__(130),
isType: function isType(value) {
if (value && value.type == 'slider') {
return value;
@@ -16505,7 +16702,7 @@ module.exports = __webpack_require__(0).Collection.extend(_TypeableCollection2.d
}
}, {
id: 'integer',
- model: __webpack_require__(41),
+ model: __webpack_require__(43),
view: __webpack_require__(15),
isType: function isType(value) {
if (value && value.type == 'integer') {
@@ -16723,18 +16920,24 @@ module.exports = __webpack_require__(0).Model.extend({
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
+
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var PropertyView = __webpack_require__(5);
var PropertyIntegerView = __webpack_require__(15);
-var PropertyRadioView = __webpack_require__(35);
-var PropertySelectView = __webpack_require__(36);
-var PropertyColorView = __webpack_require__(37);
-var PropertyFileView = __webpack_require__(39);
+var PropertyRadioView = __webpack_require__(37);
+var PropertySelectView = __webpack_require__(38);
+var PropertyColorView = __webpack_require__(39);
+var PropertyFileView = __webpack_require__(41);
var PropertyCompositeView = __webpack_require__(17);
-var PropertyStackView = __webpack_require__(33);
+var PropertyStackView = __webpack_require__(35);
-module.exports = Backbone.View.extend({
+module.exports = _backbone2.default.View.extend({
initialize: function initialize(o) {
this.config = o.config || {};
this.pfx = this.config.stylePrefix || '';
@@ -16790,18 +16993,23 @@ module.exports = Backbone.View.extend({
return this;
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
/* 15 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
+
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var InputNumber = __webpack_require__(18);
var PropertyView = __webpack_require__(5);
-var $ = Backbone.$;
+var $ = _backbone2.default.$;
var timeout = void 0;
module.exports = PropertyView.extend({
@@ -16835,7 +17043,6 @@ module.exports = PropertyView.extend({
}
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
/* 16 */
@@ -16940,10 +17147,16 @@ module.exports = ComponentView.extend({
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
+
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var PropertyView = __webpack_require__(5);
-var $ = Backbone.$;
+var $ = _backbone2.default.$;
module.exports = PropertyView.extend({
templateInput: function templateInput() {
@@ -17071,7 +17284,6 @@ module.exports = PropertyView.extend({
return value;
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
/* 18 */
@@ -17084,7 +17296,7 @@ var _underscore = __webpack_require__(1);
var _mixins = __webpack_require__(2);
-var Input = __webpack_require__(34);
+var Input = __webpack_require__(36);
var Backbone = __webpack_require__(0);
var $ = Backbone.$;
@@ -17473,12 +17685,23 @@ module.exports = Component.extend({
// Add Image Editor button only if the default command exists
if (cmd.has(cmdName)) {
+ var hasButtonBool = false;
var tb = this.get('toolbar');
- tb.push({
- attributes: { class: 'fa fa-pencil' },
- command: cmdName
- });
- this.set('toolbar', tb);
+
+ for (var i = 0; i < tb.length; i++) {
+ if (tb[i].command === 'image-editor') {
+ hasButtonBool = true;
+ break;
+ }
+ }
+
+ if (!hasButtonBool) {
+ tb.push({
+ attributes: { class: 'fa fa-pencil' },
+ command: cmdName
+ });
+ this.set('toolbar', tb);
+ }
}
}
},
@@ -17553,6 +17776,25 @@ module.exports = Component.extend({
"use strict";
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+var Component = __webpack_require__(4);
+
+module.exports = Component.extend({
+ defaults: _extends({}, Component.prototype.defaults, {
+ type: 'text',
+ droppable: false,
+ editable: true
+ })
+});
+
+/***/ }),
+/* 22 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@@ -17561,9 +17803,9 @@ var _underscore = __webpack_require__(1);
var _mixins = __webpack_require__(2);
-var ToolbarView = __webpack_require__(189);
-var Toolbar = __webpack_require__(191);
-var key = __webpack_require__(23);
+var ToolbarView = __webpack_require__(193);
+var Toolbar = __webpack_require__(195);
+var key = __webpack_require__(24);
var $ = __webpack_require__(0).$;
var showOffsets = void 0;
@@ -17617,6 +17859,7 @@ module.exports = {
methods[method](win, 'scroll resize', this.onFrameScroll);
methods[method](win, 'keydown', this.onKeyPress);
em[method]('change:selectedComponent', this.onSelect, this);
+ em[method]('change:componentHovered', this.onHovered, this);
},
@@ -17657,16 +17900,22 @@ module.exports = {
}
if (model && !model.get('hoverable')) {
- var comp = model && model.parent();
- while (comp && !comp.get('hoverable')) {
- comp = comp.parent();
- }comp && (trg = comp.view.el);
+ var parent = model && model.parent();
+ while (parent && !parent.get('hoverable')) {
+ parent = comp.parent();
+ }model = parent;
}
- var pos = this.getElementPos(trg);
- this.updateBadge(trg, pos);
- this.updateHighlighter(trg, pos);
- this.showElementOffset(trg, pos);
+ this.em.setHovered(model, { forceChange: 1 });
+ },
+ onHovered: function onHovered(em, component) {
+ var trg = component && component.getEl();
+ if (trg) {
+ var pos = this.getElementPos(trg);
+ this.updateBadge(trg, pos);
+ this.updateHighlighter(trg, pos);
+ this.showElementOffset(trg, pos);
+ }
},
@@ -18156,18 +18405,28 @@ module.exports = {
};
/***/ }),
-/* 22 */
+/* 23 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone, _) {
-var SelectPosition = __webpack_require__(56);
-var $ = Backbone.$;
-module.exports = _.extend({}, SelectPosition, {
+var _underscore = __webpack_require__(1);
+
+var _underscore2 = _interopRequireDefault(_underscore);
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var SelectPosition = __webpack_require__(58);
+var $ = _backbone2.default.$;
+
+module.exports = _underscore2.default.extend({}, SelectPosition, {
init: function init(opt) {
- _.bindAll(this, 'startDraw', 'draw', 'endDraw', 'rollback');
+ _underscore2.default.bindAll(this, 'startDraw', 'draw', 'endDraw', 'rollback');
this.config = opt || {};
this.hType = this.config.newFixedH ? 'height' : 'min-height';
this.allowDraw = 1;
@@ -18394,10 +18653,9 @@ module.exports = _.extend({}, SelectPosition, {
this.$wrapper.unbind();
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0), __webpack_require__(1)))
/***/ }),
-/* 23 */
+/* 24 */
/***/ (function(module, exports, __webpack_require__) {
// keymaster.js
@@ -18445,261 +18703,1816 @@ module.exports = _.extend({}, SelectPosition, {
return -1;
}
- // for comparing mods before unassignment
- function compareArray(a1, a2) {
- if (a1.length != a2.length) return false;
- for (var i = 0; i < a1.length; i++) {
- if (a1[i] !== a2[i]) return false;
- }
- return true;
+ // for comparing mods before unassignment
+ function compareArray(a1, a2) {
+ if (a1.length != a2.length) return false;
+ for (var i = 0; i < a1.length; i++) {
+ if (a1[i] !== a2[i]) return false;
+ }
+ return true;
+ }
+
+ var modifierMap = {
+ 16:'shiftKey',
+ 18:'altKey',
+ 17:'ctrlKey',
+ 91:'metaKey'
+ };
+ function updateModifierKey(event) {
+ for(k in _mods) _mods[k] = event[modifierMap[k]];
+ };
+
+ // handle keydown event
+ function dispatch(event) {
+ var key, handler, k, i, modifiersMatch, scope;
+ key = event.keyCode;
+
+ if (index(_downKeys, key) == -1) {
+ _downKeys.push(key);
+ }
+
+ // if a modifier key, set the key. property to true and return
+ if(key == 93 || key == 224) key = 91; // right command on webkit, command on Gecko
+ if(key in _mods) {
+ _mods[key] = true;
+ // 'assignKey' from inside this closure is exported to window.key
+ for(k in _MODIFIERS) if(_MODIFIERS[k] == key) assignKey[k] = true;
+ return;
+ }
+ updateModifierKey(event);
+
+ // see if we need to ignore the keypress (filter() can can be overridden)
+ // by default ignore key presses if a select, textarea, or input is focused
+ if(!assignKey.filter.call(this, event)) return;
+
+ // abort if no potentially matching shortcuts found
+ if (!(key in _handlers)) return;
+
+ scope = getScope();
+
+ // for each potential shortcut
+ for (i = 0; i < _handlers[key].length; i++) {
+ handler = _handlers[key][i];
+
+ // see if it's in the current scope
+ if(handler.scope == scope || handler.scope == 'all'){
+ // check if modifiers match if any
+ modifiersMatch = handler.mods.length > 0;
+ for(k in _mods)
+ if((!_mods[k] && index(handler.mods, +k) > -1) ||
+ (_mods[k] && index(handler.mods, +k) == -1)) modifiersMatch = false;
+ // call the handler and stop the event if neccessary
+ if((handler.mods.length == 0 && !_mods[16] && !_mods[18] && !_mods[17] && !_mods[91]) || modifiersMatch){
+ if(handler.method(event, handler)===false){
+ if(event.preventDefault) event.preventDefault();
+ else event.returnValue = false;
+ if(event.stopPropagation) event.stopPropagation();
+ if(event.cancelBubble) event.cancelBubble = true;
+ }
+ }
+ }
+ }
+ };
+
+ // unset modifier keys on keyup
+ function clearModifier(event){
+ var key = event.keyCode, k,
+ i = index(_downKeys, key);
+
+ // remove key from _downKeys
+ if (i >= 0) {
+ _downKeys.splice(i, 1);
+ }
+
+ if(key == 93 || key == 224) key = 91;
+ if(key in _mods) {
+ _mods[key] = false;
+ for(k in _MODIFIERS) if(_MODIFIERS[k] == key) assignKey[k] = false;
+ }
+ };
+
+ function resetModifiers() {
+ for(k in _mods) _mods[k] = false;
+ for(k in _MODIFIERS) assignKey[k] = false;
+ };
+
+ // parse and assign shortcut
+ function assignKey(key, scope, method){
+ var keys, mods;
+ keys = getKeys(key);
+ if (method === undefined) {
+ method = scope;
+ scope = 'all';
+ }
+
+ // for each shortcut
+ for (var i = 0; i < keys.length; i++) {
+ // set modifier keys if any
+ mods = [];
+ key = keys[i].split('+');
+ if (key.length > 1){
+ mods = getMods(key);
+ key = [key[key.length-1]];
+ }
+ // convert to keycode and...
+ key = key[0]
+ key = code(key);
+ // ...store handler
+ if (!(key in _handlers)) _handlers[key] = [];
+ _handlers[key].push({ shortcut: keys[i], scope: scope, method: method, key: keys[i], mods: mods });
+ }
+ };
+
+ // unbind all handlers for given key in current scope
+ function unbindKey(key, scope) {
+ var multipleKeys, keys,
+ mods = [],
+ i, j, obj;
+
+ multipleKeys = getKeys(key);
+
+ for (j = 0; j < multipleKeys.length; j++) {
+ keys = multipleKeys[j].split('+');
+
+ if (keys.length > 1) {
+ mods = getMods(keys);
+ key = keys[keys.length - 1];
+ }
+
+ key = code(key);
+
+ if (scope === undefined) {
+ scope = getScope();
+ }
+ if (!_handlers[key]) {
+ return;
+ }
+ for (i = 0; i < _handlers[key].length; i++) {
+ obj = _handlers[key][i];
+ // only clear handlers if correct scope and mods match
+ if (obj.scope === scope && compareArray(obj.mods, mods)) {
+ _handlers[key][i] = {};
+ }
+ }
+ }
+ };
+
+ // Returns true if the key with code 'keyCode' is currently down
+ // Converts strings into key codes.
+ function isPressed(keyCode) {
+ if (typeof(keyCode)=='string') {
+ keyCode = code(keyCode);
+ }
+ return index(_downKeys, keyCode) != -1;
+ }
+
+ function getPressedKeyCodes() {
+ return _downKeys.slice(0);
+ }
+
+ function filter(event){
+ var tagName = (event.target || event.srcElement).tagName;
+ // ignore keypressed in any elements that support keyboard data input
+ return !(tagName == 'INPUT' || tagName == 'SELECT' || tagName == 'TEXTAREA');
+ }
+
+ // initialize key. to false
+ for(k in _MODIFIERS) assignKey[k] = false;
+
+ // set current scope (default 'all')
+ function setScope(scope){ _scope = scope || 'all' };
+ function getScope(){ return _scope || 'all' };
+
+ // delete all handlers for a given scope
+ function deleteScope(scope){
+ var key, handlers, i;
+
+ for (key in _handlers) {
+ handlers = _handlers[key];
+ for (i = 0; i < handlers.length; ) {
+ if (handlers[i].scope === scope) handlers.splice(i, 1);
+ else i++;
+ }
+ }
+ };
+
+ // abstract key logic for assign and unassign
+ function getKeys(key) {
+ var keys;
+ key = key.replace(/\s/g, '');
+ keys = key.split(',');
+ if ((keys[keys.length - 1]) == '') {
+ keys[keys.length - 2] += ',';
+ }
+ return keys;
+ }
+
+ // abstract mods logic for assign and unassign
+ function getMods(key) {
+ var mods = key.slice(0, key.length - 1);
+ for (var mi = 0; mi < mods.length; mi++)
+ mods[mi] = _MODIFIERS[mods[mi]];
+ return mods;
+ }
+
+ // cross-browser events
+ function addEvent(object, event, method) {
+ if (object.addEventListener)
+ object.addEventListener(event, method, false);
+ else if(object.attachEvent)
+ object.attachEvent('on'+event, function(){ method(window.event) });
+ };
+
+ // set the handlers globally on document
+ addEvent(document, 'keydown', function(event) { dispatch(event) }); // Passing _scope to a callback to ensure it remains the same by execution. Fixes #48
+ addEvent(document, 'keyup', clearModifier);
+
+ // reset modifiers to false whenever the window is (re)focused.
+ addEvent(window, 'focus', resetModifiers);
+
+ // store previously defined key
+ var previousKey = global.key;
+
+ // restore previously defined key and return reference to our key object
+ function noConflict() {
+ var k = global.key;
+ global.key = previousKey;
+ return k;
+ }
+
+ // set window.key and window.key.set/get/deleteScope, and the default filter
+ global.key = assignKey;
+ global.key.setScope = setScope;
+ global.key.getScope = getScope;
+ global.key.deleteScope = deleteScope;
+ global.key.filter = filter;
+ global.key.isPressed = isPressed;
+ global.key.getPressedKeyCodes = getPressedKeyCodes;
+ global.key.noConflict = noConflict;
+ global.key.unbind = unbindKey;
+
+ if(true) module.exports = assignKey;
+
+})(this);
+
+
+/***/ }),
+/* 25 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscore.js 1.8.3
+// http://underscorejs.org
+// (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+// Underscore may be freely distributed under the MIT license.
+
+(function() {
+
+ // Baseline setup
+ // --------------
+
+ // Establish the root object, `window` in the browser, or `exports` on the server.
+ var root = this;
+
+ // Save the previous value of the `_` variable.
+ var previousUnderscore = root._;
+
+ // Save bytes in the minified (but not gzipped) version:
+ var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
+
+ // Create quick reference variables for speed access to core prototypes.
+ var
+ push = ArrayProto.push,
+ slice = ArrayProto.slice,
+ toString = ObjProto.toString,
+ hasOwnProperty = ObjProto.hasOwnProperty;
+
+ // All **ECMAScript 5** native function implementations that we hope to use
+ // are declared here.
+ var
+ nativeIsArray = Array.isArray,
+ nativeKeys = Object.keys,
+ nativeBind = FuncProto.bind,
+ nativeCreate = Object.create;
+
+ // Naked function reference for surrogate-prototype-swapping.
+ var Ctor = function(){};
+
+ // Create a safe reference to the Underscore object for use below.
+ var _ = function(obj) {
+ if (obj instanceof _) return obj;
+ if (!(this instanceof _)) return new _(obj);
+ this._wrapped = obj;
+ };
+
+ // Export the Underscore object for **Node.js**, with
+ // backwards-compatibility for the old `require()` API. If we're in
+ // the browser, add `_` as a global object.
+ if (true) {
+ if (typeof module !== 'undefined' && module.exports) {
+ exports = module.exports = _;
+ }
+ exports._ = _;
+ } else {
+ root._ = _;
+ }
+
+ // Current version.
+ _.VERSION = '1.8.3';
+
+ // Internal function that returns an efficient (for current engines) version
+ // of the passed-in callback, to be repeatedly applied in other Underscore
+ // functions.
+ var optimizeCb = function(func, context, argCount) {
+ if (context === void 0) return func;
+ switch (argCount == null ? 3 : argCount) {
+ case 1: return function(value) {
+ return func.call(context, value);
+ };
+ case 2: return function(value, other) {
+ return func.call(context, value, other);
+ };
+ case 3: return function(value, index, collection) {
+ return func.call(context, value, index, collection);
+ };
+ case 4: return function(accumulator, value, index, collection) {
+ return func.call(context, accumulator, value, index, collection);
+ };
+ }
+ return function() {
+ return func.apply(context, arguments);
+ };
+ };
+
+ // A mostly-internal function to generate callbacks that can be applied
+ // to each element in a collection, returning the desired result — either
+ // identity, an arbitrary callback, a property matcher, or a property accessor.
+ var cb = function(value, context, argCount) {
+ if (value == null) return _.identity;
+ if (_.isFunction(value)) return optimizeCb(value, context, argCount);
+ if (_.isObject(value)) return _.matcher(value);
+ return _.property(value);
+ };
+ _.iteratee = function(value, context) {
+ return cb(value, context, Infinity);
+ };
+
+ // An internal function for creating assigner functions.
+ var createAssigner = function(keysFunc, undefinedOnly) {
+ return function(obj) {
+ var length = arguments.length;
+ if (length < 2 || obj == null) return obj;
+ for (var index = 1; index < length; index++) {
+ var source = arguments[index],
+ keys = keysFunc(source),
+ l = keys.length;
+ for (var i = 0; i < l; i++) {
+ var key = keys[i];
+ if (!undefinedOnly || obj[key] === void 0) obj[key] = source[key];
+ }
+ }
+ return obj;
+ };
+ };
+
+ // An internal function for creating a new object that inherits from another.
+ var baseCreate = function(prototype) {
+ if (!_.isObject(prototype)) return {};
+ if (nativeCreate) return nativeCreate(prototype);
+ Ctor.prototype = prototype;
+ var result = new Ctor;
+ Ctor.prototype = null;
+ return result;
+ };
+
+ var property = function(key) {
+ return function(obj) {
+ return obj == null ? void 0 : obj[key];
+ };
+ };
+
+ // Helper for collection methods to determine whether a collection
+ // should be iterated as an array or as an object
+ // Related: http://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength
+ // Avoids a very nasty iOS 8 JIT bug on ARM-64. #2094
+ var MAX_ARRAY_INDEX = Math.pow(2, 53) - 1;
+ var getLength = property('length');
+ var isArrayLike = function(collection) {
+ var length = getLength(collection);
+ return typeof length == 'number' && length >= 0 && length <= MAX_ARRAY_INDEX;
+ };
+
+ // Collection Functions
+ // --------------------
+
+ // The cornerstone, an `each` implementation, aka `forEach`.
+ // Handles raw objects in addition to array-likes. Treats all
+ // sparse array-likes as if they were dense.
+ _.each = _.forEach = function(obj, iteratee, context) {
+ iteratee = optimizeCb(iteratee, context);
+ var i, length;
+ if (isArrayLike(obj)) {
+ for (i = 0, length = obj.length; i < length; i++) {
+ iteratee(obj[i], i, obj);
+ }
+ } else {
+ var keys = _.keys(obj);
+ for (i = 0, length = keys.length; i < length; i++) {
+ iteratee(obj[keys[i]], keys[i], obj);
+ }
+ }
+ return obj;
+ };
+
+ // Return the results of applying the iteratee to each element.
+ _.map = _.collect = function(obj, iteratee, context) {
+ iteratee = cb(iteratee, context);
+ var keys = !isArrayLike(obj) && _.keys(obj),
+ length = (keys || obj).length,
+ results = Array(length);
+ for (var index = 0; index < length; index++) {
+ var currentKey = keys ? keys[index] : index;
+ results[index] = iteratee(obj[currentKey], currentKey, obj);
+ }
+ return results;
+ };
+
+ // Create a reducing function iterating left or right.
+ function createReduce(dir) {
+ // Optimized iterator function as using arguments.length
+ // in the main function will deoptimize the, see #1991.
+ function iterator(obj, iteratee, memo, keys, index, length) {
+ for (; index >= 0 && index < length; index += dir) {
+ var currentKey = keys ? keys[index] : index;
+ memo = iteratee(memo, obj[currentKey], currentKey, obj);
+ }
+ return memo;
+ }
+
+ return function(obj, iteratee, memo, context) {
+ iteratee = optimizeCb(iteratee, context, 4);
+ var keys = !isArrayLike(obj) && _.keys(obj),
+ length = (keys || obj).length,
+ index = dir > 0 ? 0 : length - 1;
+ // Determine the initial value if none is provided.
+ if (arguments.length < 3) {
+ memo = obj[keys ? keys[index] : index];
+ index += dir;
+ }
+ return iterator(obj, iteratee, memo, keys, index, length);
+ };
+ }
+
+ // **Reduce** builds up a single result from a list of values, aka `inject`,
+ // or `foldl`.
+ _.reduce = _.foldl = _.inject = createReduce(1);
+
+ // The right-associative version of reduce, also known as `foldr`.
+ _.reduceRight = _.foldr = createReduce(-1);
+
+ // Return the first value which passes a truth test. Aliased as `detect`.
+ _.find = _.detect = function(obj, predicate, context) {
+ var key;
+ if (isArrayLike(obj)) {
+ key = _.findIndex(obj, predicate, context);
+ } else {
+ key = _.findKey(obj, predicate, context);
+ }
+ if (key !== void 0 && key !== -1) return obj[key];
+ };
+
+ // Return all the elements that pass a truth test.
+ // Aliased as `select`.
+ _.filter = _.select = function(obj, predicate, context) {
+ var results = [];
+ predicate = cb(predicate, context);
+ _.each(obj, function(value, index, list) {
+ if (predicate(value, index, list)) results.push(value);
+ });
+ return results;
+ };
+
+ // Return all the elements for which a truth test fails.
+ _.reject = function(obj, predicate, context) {
+ return _.filter(obj, _.negate(cb(predicate)), context);
+ };
+
+ // Determine whether all of the elements match a truth test.
+ // Aliased as `all`.
+ _.every = _.all = function(obj, predicate, context) {
+ predicate = cb(predicate, context);
+ var keys = !isArrayLike(obj) && _.keys(obj),
+ length = (keys || obj).length;
+ for (var index = 0; index < length; index++) {
+ var currentKey = keys ? keys[index] : index;
+ if (!predicate(obj[currentKey], currentKey, obj)) return false;
+ }
+ return true;
+ };
+
+ // Determine if at least one element in the object matches a truth test.
+ // Aliased as `any`.
+ _.some = _.any = function(obj, predicate, context) {
+ predicate = cb(predicate, context);
+ var keys = !isArrayLike(obj) && _.keys(obj),
+ length = (keys || obj).length;
+ for (var index = 0; index < length; index++) {
+ var currentKey = keys ? keys[index] : index;
+ if (predicate(obj[currentKey], currentKey, obj)) return true;
+ }
+ return false;
+ };
+
+ // Determine if the array or object contains a given item (using `===`).
+ // Aliased as `includes` and `include`.
+ _.contains = _.includes = _.include = function(obj, item, fromIndex, guard) {
+ if (!isArrayLike(obj)) obj = _.values(obj);
+ if (typeof fromIndex != 'number' || guard) fromIndex = 0;
+ return _.indexOf(obj, item, fromIndex) >= 0;
+ };
+
+ // Invoke a method (with arguments) on every item in a collection.
+ _.invoke = function(obj, method) {
+ var args = slice.call(arguments, 2);
+ var isFunc = _.isFunction(method);
+ return _.map(obj, function(value) {
+ var func = isFunc ? method : value[method];
+ return func == null ? func : func.apply(value, args);
+ });
+ };
+
+ // Convenience version of a common use case of `map`: fetching a property.
+ _.pluck = function(obj, key) {
+ return _.map(obj, _.property(key));
+ };
+
+ // Convenience version of a common use case of `filter`: selecting only objects
+ // containing specific `key:value` pairs.
+ _.where = function(obj, attrs) {
+ return _.filter(obj, _.matcher(attrs));
+ };
+
+ // Convenience version of a common use case of `find`: getting the first object
+ // containing specific `key:value` pairs.
+ _.findWhere = function(obj, attrs) {
+ return _.find(obj, _.matcher(attrs));
+ };
+
+ // Return the maximum element (or element-based computation).
+ _.max = function(obj, iteratee, context) {
+ var result = -Infinity, lastComputed = -Infinity,
+ value, computed;
+ if (iteratee == null && obj != null) {
+ obj = isArrayLike(obj) ? obj : _.values(obj);
+ for (var i = 0, length = obj.length; i < length; i++) {
+ value = obj[i];
+ if (value > result) {
+ result = value;
+ }
+ }
+ } else {
+ iteratee = cb(iteratee, context);
+ _.each(obj, function(value, index, list) {
+ computed = iteratee(value, index, list);
+ if (computed > lastComputed || computed === -Infinity && result === -Infinity) {
+ result = value;
+ lastComputed = computed;
+ }
+ });
+ }
+ return result;
+ };
+
+ // Return the minimum element (or element-based computation).
+ _.min = function(obj, iteratee, context) {
+ var result = Infinity, lastComputed = Infinity,
+ value, computed;
+ if (iteratee == null && obj != null) {
+ obj = isArrayLike(obj) ? obj : _.values(obj);
+ for (var i = 0, length = obj.length; i < length; i++) {
+ value = obj[i];
+ if (value < result) {
+ result = value;
+ }
+ }
+ } else {
+ iteratee = cb(iteratee, context);
+ _.each(obj, function(value, index, list) {
+ computed = iteratee(value, index, list);
+ if (computed < lastComputed || computed === Infinity && result === Infinity) {
+ result = value;
+ lastComputed = computed;
+ }
+ });
+ }
+ return result;
+ };
+
+ // Shuffle a collection, using the modern version of the
+ // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle).
+ _.shuffle = function(obj) {
+ var set = isArrayLike(obj) ? obj : _.values(obj);
+ var length = set.length;
+ var shuffled = Array(length);
+ for (var index = 0, rand; index < length; index++) {
+ rand = _.random(0, index);
+ if (rand !== index) shuffled[index] = shuffled[rand];
+ shuffled[rand] = set[index];
+ }
+ return shuffled;
+ };
+
+ // Sample **n** random values from a collection.
+ // If **n** is not specified, returns a single random element.
+ // The internal `guard` argument allows it to work with `map`.
+ _.sample = function(obj, n, guard) {
+ if (n == null || guard) {
+ if (!isArrayLike(obj)) obj = _.values(obj);
+ return obj[_.random(obj.length - 1)];
+ }
+ return _.shuffle(obj).slice(0, Math.max(0, n));
+ };
+
+ // Sort the object's values by a criterion produced by an iteratee.
+ _.sortBy = function(obj, iteratee, context) {
+ iteratee = cb(iteratee, context);
+ return _.pluck(_.map(obj, function(value, index, list) {
+ return {
+ value: value,
+ index: index,
+ criteria: iteratee(value, index, list)
+ };
+ }).sort(function(left, right) {
+ var a = left.criteria;
+ var b = right.criteria;
+ if (a !== b) {
+ if (a > b || a === void 0) return 1;
+ if (a < b || b === void 0) return -1;
+ }
+ return left.index - right.index;
+ }), 'value');
+ };
+
+ // An internal function used for aggregate "group by" operations.
+ var group = function(behavior) {
+ return function(obj, iteratee, context) {
+ var result = {};
+ iteratee = cb(iteratee, context);
+ _.each(obj, function(value, index) {
+ var key = iteratee(value, index, obj);
+ behavior(result, value, key);
+ });
+ return result;
+ };
+ };
+
+ // Groups the object's values by a criterion. Pass either a string attribute
+ // to group by, or a function that returns the criterion.
+ _.groupBy = group(function(result, value, key) {
+ if (_.has(result, key)) result[key].push(value); else result[key] = [value];
+ });
+
+ // Indexes the object's values by a criterion, similar to `groupBy`, but for
+ // when you know that your index values will be unique.
+ _.indexBy = group(function(result, value, key) {
+ result[key] = value;
+ });
+
+ // Counts instances of an object that group by a certain criterion. Pass
+ // either a string attribute to count by, or a function that returns the
+ // criterion.
+ _.countBy = group(function(result, value, key) {
+ if (_.has(result, key)) result[key]++; else result[key] = 1;
+ });
+
+ // Safely create a real, live array from anything iterable.
+ _.toArray = function(obj) {
+ if (!obj) return [];
+ if (_.isArray(obj)) return slice.call(obj);
+ if (isArrayLike(obj)) return _.map(obj, _.identity);
+ return _.values(obj);
+ };
+
+ // Return the number of elements in an object.
+ _.size = function(obj) {
+ if (obj == null) return 0;
+ return isArrayLike(obj) ? obj.length : _.keys(obj).length;
+ };
+
+ // Split a collection into two arrays: one whose elements all satisfy the given
+ // predicate, and one whose elements all do not satisfy the predicate.
+ _.partition = function(obj, predicate, context) {
+ predicate = cb(predicate, context);
+ var pass = [], fail = [];
+ _.each(obj, function(value, key, obj) {
+ (predicate(value, key, obj) ? pass : fail).push(value);
+ });
+ return [pass, fail];
+ };
+
+ // Array Functions
+ // ---------------
+
+ // Get the first element of an array. Passing **n** will return the first N
+ // values in the array. Aliased as `head` and `take`. The **guard** check
+ // allows it to work with `_.map`.
+ _.first = _.head = _.take = function(array, n, guard) {
+ if (array == null) return void 0;
+ if (n == null || guard) return array[0];
+ return _.initial(array, array.length - n);
+ };
+
+ // Returns everything but the last entry of the array. Especially useful on
+ // the arguments object. Passing **n** will return all the values in
+ // the array, excluding the last N.
+ _.initial = function(array, n, guard) {
+ return slice.call(array, 0, Math.max(0, array.length - (n == null || guard ? 1 : n)));
+ };
+
+ // Get the last element of an array. Passing **n** will return the last N
+ // values in the array.
+ _.last = function(array, n, guard) {
+ if (array == null) return void 0;
+ if (n == null || guard) return array[array.length - 1];
+ return _.rest(array, Math.max(0, array.length - n));
+ };
+
+ // Returns everything but the first entry of the array. Aliased as `tail` and `drop`.
+ // Especially useful on the arguments object. Passing an **n** will return
+ // the rest N values in the array.
+ _.rest = _.tail = _.drop = function(array, n, guard) {
+ return slice.call(array, n == null || guard ? 1 : n);
+ };
+
+ // Trim out all falsy values from an array.
+ _.compact = function(array) {
+ return _.filter(array, _.identity);
+ };
+
+ // Internal implementation of a recursive `flatten` function.
+ var flatten = function(input, shallow, strict, startIndex) {
+ var output = [], idx = 0;
+ for (var i = startIndex || 0, length = getLength(input); i < length; i++) {
+ var value = input[i];
+ if (isArrayLike(value) && (_.isArray(value) || _.isArguments(value))) {
+ //flatten current level of array or arguments object
+ if (!shallow) value = flatten(value, shallow, strict);
+ var j = 0, len = value.length;
+ output.length += len;
+ while (j < len) {
+ output[idx++] = value[j++];
+ }
+ } else if (!strict) {
+ output[idx++] = value;
+ }
+ }
+ return output;
+ };
+
+ // Flatten out an array, either recursively (by default), or just one level.
+ _.flatten = function(array, shallow) {
+ return flatten(array, shallow, false);
+ };
+
+ // Return a version of the array that does not contain the specified value(s).
+ _.without = function(array) {
+ return _.difference(array, slice.call(arguments, 1));
+ };
+
+ // Produce a duplicate-free version of the array. If the array has already
+ // been sorted, you have the option of using a faster algorithm.
+ // Aliased as `unique`.
+ _.uniq = _.unique = function(array, isSorted, iteratee, context) {
+ if (!_.isBoolean(isSorted)) {
+ context = iteratee;
+ iteratee = isSorted;
+ isSorted = false;
+ }
+ if (iteratee != null) iteratee = cb(iteratee, context);
+ var result = [];
+ var seen = [];
+ for (var i = 0, length = getLength(array); i < length; i++) {
+ var value = array[i],
+ computed = iteratee ? iteratee(value, i, array) : value;
+ if (isSorted) {
+ if (!i || seen !== computed) result.push(value);
+ seen = computed;
+ } else if (iteratee) {
+ if (!_.contains(seen, computed)) {
+ seen.push(computed);
+ result.push(value);
+ }
+ } else if (!_.contains(result, value)) {
+ result.push(value);
+ }
+ }
+ return result;
+ };
+
+ // Produce an array that contains the union: each distinct element from all of
+ // the passed-in arrays.
+ _.union = function() {
+ return _.uniq(flatten(arguments, true, true));
+ };
+
+ // Produce an array that contains every item shared between all the
+ // passed-in arrays.
+ _.intersection = function(array) {
+ var result = [];
+ var argsLength = arguments.length;
+ for (var i = 0, length = getLength(array); i < length; i++) {
+ var item = array[i];
+ if (_.contains(result, item)) continue;
+ for (var j = 1; j < argsLength; j++) {
+ if (!_.contains(arguments[j], item)) break;
+ }
+ if (j === argsLength) result.push(item);
+ }
+ return result;
+ };
+
+ // Take the difference between one array and a number of other arrays.
+ // Only the elements present in just the first array will remain.
+ _.difference = function(array) {
+ var rest = flatten(arguments, true, true, 1);
+ return _.filter(array, function(value){
+ return !_.contains(rest, value);
+ });
+ };
+
+ // Zip together multiple lists into a single array -- elements that share
+ // an index go together.
+ _.zip = function() {
+ return _.unzip(arguments);
+ };
+
+ // Complement of _.zip. Unzip accepts an array of arrays and groups
+ // each array's elements on shared indices
+ _.unzip = function(array) {
+ var length = array && _.max(array, getLength).length || 0;
+ var result = Array(length);
+
+ for (var index = 0; index < length; index++) {
+ result[index] = _.pluck(array, index);
+ }
+ return result;
+ };
+
+ // Converts lists into objects. Pass either a single array of `[key, value]`
+ // pairs, or two parallel arrays of the same length -- one of keys, and one of
+ // the corresponding values.
+ _.object = function(list, values) {
+ var result = {};
+ for (var i = 0, length = getLength(list); i < length; i++) {
+ if (values) {
+ result[list[i]] = values[i];
+ } else {
+ result[list[i][0]] = list[i][1];
+ }
+ }
+ return result;
+ };
+
+ // Generator function to create the findIndex and findLastIndex functions
+ function createPredicateIndexFinder(dir) {
+ return function(array, predicate, context) {
+ predicate = cb(predicate, context);
+ var length = getLength(array);
+ var index = dir > 0 ? 0 : length - 1;
+ for (; index >= 0 && index < length; index += dir) {
+ if (predicate(array[index], index, array)) return index;
+ }
+ return -1;
+ };
+ }
+
+ // Returns the first index on an array-like that passes a predicate test
+ _.findIndex = createPredicateIndexFinder(1);
+ _.findLastIndex = createPredicateIndexFinder(-1);
+
+ // Use a comparator function to figure out the smallest index at which
+ // an object should be inserted so as to maintain order. Uses binary search.
+ _.sortedIndex = function(array, obj, iteratee, context) {
+ iteratee = cb(iteratee, context, 1);
+ var value = iteratee(obj);
+ var low = 0, high = getLength(array);
+ while (low < high) {
+ var mid = Math.floor((low + high) / 2);
+ if (iteratee(array[mid]) < value) low = mid + 1; else high = mid;
+ }
+ return low;
+ };
+
+ // Generator function to create the indexOf and lastIndexOf functions
+ function createIndexFinder(dir, predicateFind, sortedIndex) {
+ return function(array, item, idx) {
+ var i = 0, length = getLength(array);
+ if (typeof idx == 'number') {
+ if (dir > 0) {
+ i = idx >= 0 ? idx : Math.max(idx + length, i);
+ } else {
+ length = idx >= 0 ? Math.min(idx + 1, length) : idx + length + 1;
+ }
+ } else if (sortedIndex && idx && length) {
+ idx = sortedIndex(array, item);
+ return array[idx] === item ? idx : -1;
+ }
+ if (item !== item) {
+ idx = predicateFind(slice.call(array, i, length), _.isNaN);
+ return idx >= 0 ? idx + i : -1;
+ }
+ for (idx = dir > 0 ? i : length - 1; idx >= 0 && idx < length; idx += dir) {
+ if (array[idx] === item) return idx;
+ }
+ return -1;
+ };
+ }
+
+ // Return the position of the first occurrence of an item in an array,
+ // or -1 if the item is not included in the array.
+ // If the array is large and already in sort order, pass `true`
+ // for **isSorted** to use binary search.
+ _.indexOf = createIndexFinder(1, _.findIndex, _.sortedIndex);
+ _.lastIndexOf = createIndexFinder(-1, _.findLastIndex);
+
+ // Generate an integer Array containing an arithmetic progression. A port of
+ // the native Python `range()` function. See
+ // [the Python documentation](http://docs.python.org/library/functions.html#range).
+ _.range = function(start, stop, step) {
+ if (stop == null) {
+ stop = start || 0;
+ start = 0;
+ }
+ step = step || 1;
+
+ var length = Math.max(Math.ceil((stop - start) / step), 0);
+ var range = Array(length);
+
+ for (var idx = 0; idx < length; idx++, start += step) {
+ range[idx] = start;
+ }
+
+ return range;
+ };
+
+ // Function (ahem) Functions
+ // ------------------
+
+ // Determines whether to execute a function as a constructor
+ // or a normal function with the provided arguments
+ var executeBound = function(sourceFunc, boundFunc, context, callingContext, args) {
+ if (!(callingContext instanceof boundFunc)) return sourceFunc.apply(context, args);
+ var self = baseCreate(sourceFunc.prototype);
+ var result = sourceFunc.apply(self, args);
+ if (_.isObject(result)) return result;
+ return self;
+ };
+
+ // Create a function bound to a given object (assigning `this`, and arguments,
+ // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if
+ // available.
+ _.bind = function(func, context) {
+ if (nativeBind && func.bind === nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
+ if (!_.isFunction(func)) throw new TypeError('Bind must be called on a function');
+ var args = slice.call(arguments, 2);
+ var bound = function() {
+ return executeBound(func, bound, context, this, args.concat(slice.call(arguments)));
+ };
+ return bound;
+ };
+
+ // Partially apply a function by creating a version that has had some of its
+ // arguments pre-filled, without changing its dynamic `this` context. _ acts
+ // as a placeholder, allowing any combination of arguments to be pre-filled.
+ _.partial = function(func) {
+ var boundArgs = slice.call(arguments, 1);
+ var bound = function() {
+ var position = 0, length = boundArgs.length;
+ var args = Array(length);
+ for (var i = 0; i < length; i++) {
+ args[i] = boundArgs[i] === _ ? arguments[position++] : boundArgs[i];
+ }
+ while (position < arguments.length) args.push(arguments[position++]);
+ return executeBound(func, bound, this, this, args);
+ };
+ return bound;
+ };
+
+ // Bind a number of an object's methods to that object. Remaining arguments
+ // are the method names to be bound. Useful for ensuring that all callbacks
+ // defined on an object belong to it.
+ _.bindAll = function(obj) {
+ var i, length = arguments.length, key;
+ if (length <= 1) throw new Error('bindAll must be passed function names');
+ for (i = 1; i < length; i++) {
+ key = arguments[i];
+ obj[key] = _.bind(obj[key], obj);
+ }
+ return obj;
+ };
+
+ // Memoize an expensive function by storing its results.
+ _.memoize = function(func, hasher) {
+ var memoize = function(key) {
+ var cache = memoize.cache;
+ var address = '' + (hasher ? hasher.apply(this, arguments) : key);
+ if (!_.has(cache, address)) cache[address] = func.apply(this, arguments);
+ return cache[address];
+ };
+ memoize.cache = {};
+ return memoize;
+ };
+
+ // Delays a function for the given number of milliseconds, and then calls
+ // it with the arguments supplied.
+ _.delay = function(func, wait) {
+ var args = slice.call(arguments, 2);
+ return setTimeout(function(){
+ return func.apply(null, args);
+ }, wait);
+ };
+
+ // Defers a function, scheduling it to run after the current call stack has
+ // cleared.
+ _.defer = _.partial(_.delay, _, 1);
+
+ // Returns a function, that, when invoked, will only be triggered at most once
+ // during a given window of time. Normally, the throttled function will run
+ // as much as it can, without ever going more than once per `wait` duration;
+ // but if you'd like to disable the execution on the leading edge, pass
+ // `{leading: false}`. To disable execution on the trailing edge, ditto.
+ _.throttle = function(func, wait, options) {
+ var context, args, result;
+ var timeout = null;
+ var previous = 0;
+ if (!options) options = {};
+ var later = function() {
+ previous = options.leading === false ? 0 : _.now();
+ timeout = null;
+ result = func.apply(context, args);
+ if (!timeout) context = args = null;
+ };
+ return function() {
+ var now = _.now();
+ if (!previous && options.leading === false) previous = now;
+ var remaining = wait - (now - previous);
+ context = this;
+ args = arguments;
+ if (remaining <= 0 || remaining > wait) {
+ if (timeout) {
+ clearTimeout(timeout);
+ timeout = null;
+ }
+ previous = now;
+ result = func.apply(context, args);
+ if (!timeout) context = args = null;
+ } else if (!timeout && options.trailing !== false) {
+ timeout = setTimeout(later, remaining);
+ }
+ return result;
+ };
+ };
+
+ // Returns a function, that, as long as it continues to be invoked, will not
+ // be triggered. The function will be called after it stops being called for
+ // N milliseconds. If `immediate` is passed, trigger the function on the
+ // leading edge, instead of the trailing.
+ _.debounce = function(func, wait, immediate) {
+ var timeout, args, context, timestamp, result;
+
+ var later = function() {
+ var last = _.now() - timestamp;
+
+ if (last < wait && last >= 0) {
+ timeout = setTimeout(later, wait - last);
+ } else {
+ timeout = null;
+ if (!immediate) {
+ result = func.apply(context, args);
+ if (!timeout) context = args = null;
+ }
+ }
+ };
+
+ return function() {
+ context = this;
+ args = arguments;
+ timestamp = _.now();
+ var callNow = immediate && !timeout;
+ if (!timeout) timeout = setTimeout(later, wait);
+ if (callNow) {
+ result = func.apply(context, args);
+ context = args = null;
+ }
+
+ return result;
+ };
+ };
+
+ // Returns the first function passed as an argument to the second,
+ // allowing you to adjust arguments, run code before and after, and
+ // conditionally execute the original function.
+ _.wrap = function(func, wrapper) {
+ return _.partial(wrapper, func);
+ };
+
+ // Returns a negated version of the passed-in predicate.
+ _.negate = function(predicate) {
+ return function() {
+ return !predicate.apply(this, arguments);
+ };
+ };
+
+ // Returns a function that is the composition of a list of functions, each
+ // consuming the return value of the function that follows.
+ _.compose = function() {
+ var args = arguments;
+ var start = args.length - 1;
+ return function() {
+ var i = start;
+ var result = args[start].apply(this, arguments);
+ while (i--) result = args[i].call(this, result);
+ return result;
+ };
+ };
+
+ // Returns a function that will only be executed on and after the Nth call.
+ _.after = function(times, func) {
+ return function() {
+ if (--times < 1) {
+ return func.apply(this, arguments);
+ }
+ };
+ };
+
+ // Returns a function that will only be executed up to (but not including) the Nth call.
+ _.before = function(times, func) {
+ var memo;
+ return function() {
+ if (--times > 0) {
+ memo = func.apply(this, arguments);
+ }
+ if (times <= 1) func = null;
+ return memo;
+ };
+ };
+
+ // Returns a function that will be executed at most one time, no matter how
+ // often you call it. Useful for lazy initialization.
+ _.once = _.partial(_.before, 2);
+
+ // Object Functions
+ // ----------------
+
+ // Keys in IE < 9 that won't be iterated by `for key in ...` and thus missed.
+ var hasEnumBug = !{toString: null}.propertyIsEnumerable('toString');
+ var nonEnumerableProps = ['valueOf', 'isPrototypeOf', 'toString',
+ 'propertyIsEnumerable', 'hasOwnProperty', 'toLocaleString'];
+
+ function collectNonEnumProps(obj, keys) {
+ var nonEnumIdx = nonEnumerableProps.length;
+ var constructor = obj.constructor;
+ var proto = (_.isFunction(constructor) && constructor.prototype) || ObjProto;
+
+ // Constructor is a special case.
+ var prop = 'constructor';
+ if (_.has(obj, prop) && !_.contains(keys, prop)) keys.push(prop);
+
+ while (nonEnumIdx--) {
+ prop = nonEnumerableProps[nonEnumIdx];
+ if (prop in obj && obj[prop] !== proto[prop] && !_.contains(keys, prop)) {
+ keys.push(prop);
+ }
+ }
+ }
+
+ // Retrieve the names of an object's own properties.
+ // Delegates to **ECMAScript 5**'s native `Object.keys`
+ _.keys = function(obj) {
+ if (!_.isObject(obj)) return [];
+ if (nativeKeys) return nativeKeys(obj);
+ var keys = [];
+ for (var key in obj) if (_.has(obj, key)) keys.push(key);
+ // Ahem, IE < 9.
+ if (hasEnumBug) collectNonEnumProps(obj, keys);
+ return keys;
+ };
+
+ // Retrieve all the property names of an object.
+ _.allKeys = function(obj) {
+ if (!_.isObject(obj)) return [];
+ var keys = [];
+ for (var key in obj) keys.push(key);
+ // Ahem, IE < 9.
+ if (hasEnumBug) collectNonEnumProps(obj, keys);
+ return keys;
+ };
+
+ // Retrieve the values of an object's properties.
+ _.values = function(obj) {
+ var keys = _.keys(obj);
+ var length = keys.length;
+ var values = Array(length);
+ for (var i = 0; i < length; i++) {
+ values[i] = obj[keys[i]];
+ }
+ return values;
+ };
+
+ // Returns the results of applying the iteratee to each element of the object
+ // In contrast to _.map it returns an object
+ _.mapObject = function(obj, iteratee, context) {
+ iteratee = cb(iteratee, context);
+ var keys = _.keys(obj),
+ length = keys.length,
+ results = {},
+ currentKey;
+ for (var index = 0; index < length; index++) {
+ currentKey = keys[index];
+ results[currentKey] = iteratee(obj[currentKey], currentKey, obj);
+ }
+ return results;
+ };
+
+ // Convert an object into a list of `[key, value]` pairs.
+ _.pairs = function(obj) {
+ var keys = _.keys(obj);
+ var length = keys.length;
+ var pairs = Array(length);
+ for (var i = 0; i < length; i++) {
+ pairs[i] = [keys[i], obj[keys[i]]];
+ }
+ return pairs;
+ };
+
+ // Invert the keys and values of an object. The values must be serializable.
+ _.invert = function(obj) {
+ var result = {};
+ var keys = _.keys(obj);
+ for (var i = 0, length = keys.length; i < length; i++) {
+ result[obj[keys[i]]] = keys[i];
+ }
+ return result;
+ };
+
+ // Return a sorted list of the function names available on the object.
+ // Aliased as `methods`
+ _.functions = _.methods = function(obj) {
+ var names = [];
+ for (var key in obj) {
+ if (_.isFunction(obj[key])) names.push(key);
+ }
+ return names.sort();
+ };
+
+ // Extend a given object with all the properties in passed-in object(s).
+ _.extend = createAssigner(_.allKeys);
+
+ // Assigns a given object with all the own properties in the passed-in object(s)
+ // (https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/assign)
+ _.extendOwn = _.assign = createAssigner(_.keys);
+
+ // Returns the first key on an object that passes a predicate test
+ _.findKey = function(obj, predicate, context) {
+ predicate = cb(predicate, context);
+ var keys = _.keys(obj), key;
+ for (var i = 0, length = keys.length; i < length; i++) {
+ key = keys[i];
+ if (predicate(obj[key], key, obj)) return key;
+ }
+ };
+
+ // Return a copy of the object only containing the whitelisted properties.
+ _.pick = function(object, oiteratee, context) {
+ var result = {}, obj = object, iteratee, keys;
+ if (obj == null) return result;
+ if (_.isFunction(oiteratee)) {
+ keys = _.allKeys(obj);
+ iteratee = optimizeCb(oiteratee, context);
+ } else {
+ keys = flatten(arguments, false, false, 1);
+ iteratee = function(value, key, obj) { return key in obj; };
+ obj = Object(obj);
+ }
+ for (var i = 0, length = keys.length; i < length; i++) {
+ var key = keys[i];
+ var value = obj[key];
+ if (iteratee(value, key, obj)) result[key] = value;
+ }
+ return result;
+ };
+
+ // Return a copy of the object without the blacklisted properties.
+ _.omit = function(obj, iteratee, context) {
+ if (_.isFunction(iteratee)) {
+ iteratee = _.negate(iteratee);
+ } else {
+ var keys = _.map(flatten(arguments, false, false, 1), String);
+ iteratee = function(value, key) {
+ return !_.contains(keys, key);
+ };
+ }
+ return _.pick(obj, iteratee, context);
+ };
+
+ // Fill in a given object with default properties.
+ _.defaults = createAssigner(_.allKeys, true);
+
+ // Creates an object that inherits from the given prototype object.
+ // If additional properties are provided then they will be added to the
+ // created object.
+ _.create = function(prototype, props) {
+ var result = baseCreate(prototype);
+ if (props) _.extendOwn(result, props);
+ return result;
+ };
+
+ // Create a (shallow-cloned) duplicate of an object.
+ _.clone = function(obj) {
+ if (!_.isObject(obj)) return obj;
+ return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
+ };
+
+ // Invokes interceptor with the obj, and then returns obj.
+ // The primary purpose of this method is to "tap into" a method chain, in
+ // order to perform operations on intermediate results within the chain.
+ _.tap = function(obj, interceptor) {
+ interceptor(obj);
+ return obj;
+ };
+
+ // Returns whether an object has a given set of `key:value` pairs.
+ _.isMatch = function(object, attrs) {
+ var keys = _.keys(attrs), length = keys.length;
+ if (object == null) return !length;
+ var obj = Object(object);
+ for (var i = 0; i < length; i++) {
+ var key = keys[i];
+ if (attrs[key] !== obj[key] || !(key in obj)) return false;
+ }
+ return true;
+ };
+
+
+ // Internal recursive comparison function for `isEqual`.
+ var eq = function(a, b, aStack, bStack) {
+ // Identical objects are equal. `0 === -0`, but they aren't identical.
+ // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
+ if (a === b) return a !== 0 || 1 / a === 1 / b;
+ // A strict comparison is necessary because `null == undefined`.
+ if (a == null || b == null) return a === b;
+ // Unwrap any wrapped objects.
+ if (a instanceof _) a = a._wrapped;
+ if (b instanceof _) b = b._wrapped;
+ // Compare `[[Class]]` names.
+ var className = toString.call(a);
+ if (className !== toString.call(b)) return false;
+ switch (className) {
+ // Strings, numbers, regular expressions, dates, and booleans are compared by value.
+ case '[object RegExp]':
+ // RegExps are coerced to strings for comparison (Note: '' + /a/i === '/a/i')
+ case '[object String]':
+ // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
+ // equivalent to `new String("5")`.
+ return '' + a === '' + b;
+ case '[object Number]':
+ // `NaN`s are equivalent, but non-reflexive.
+ // Object(NaN) is equivalent to NaN
+ if (+a !== +a) return +b !== +b;
+ // An `egal` comparison is performed for other numeric values.
+ return +a === 0 ? 1 / +a === 1 / b : +a === +b;
+ case '[object Date]':
+ case '[object Boolean]':
+ // Coerce dates and booleans to numeric primitive values. Dates are compared by their
+ // millisecond representations. Note that invalid dates with millisecond representations
+ // of `NaN` are not equivalent.
+ return +a === +b;
+ }
+
+ var areArrays = className === '[object Array]';
+ if (!areArrays) {
+ if (typeof a != 'object' || typeof b != 'object') return false;
+
+ // Objects with different constructors are not equivalent, but `Object`s or `Array`s
+ // from different frames are.
+ var aCtor = a.constructor, bCtor = b.constructor;
+ if (aCtor !== bCtor && !(_.isFunction(aCtor) && aCtor instanceof aCtor &&
+ _.isFunction(bCtor) && bCtor instanceof bCtor)
+ && ('constructor' in a && 'constructor' in b)) {
+ return false;
+ }
+ }
+ // Assume equality for cyclic structures. The algorithm for detecting cyclic
+ // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
+
+ // Initializing stack of traversed objects.
+ // It's done here since we only need them for objects and arrays comparison.
+ aStack = aStack || [];
+ bStack = bStack || [];
+ var length = aStack.length;
+ while (length--) {
+ // Linear search. Performance is inversely proportional to the number of
+ // unique nested structures.
+ if (aStack[length] === a) return bStack[length] === b;
+ }
+
+ // Add the first object to the stack of traversed objects.
+ aStack.push(a);
+ bStack.push(b);
+
+ // Recursively compare objects and arrays.
+ if (areArrays) {
+ // Compare array lengths to determine if a deep comparison is necessary.
+ length = a.length;
+ if (length !== b.length) return false;
+ // Deep compare the contents, ignoring non-numeric properties.
+ while (length--) {
+ if (!eq(a[length], b[length], aStack, bStack)) return false;
+ }
+ } else {
+ // Deep compare objects.
+ var keys = _.keys(a), key;
+ length = keys.length;
+ // Ensure that both objects contain the same number of properties before comparing deep equality.
+ if (_.keys(b).length !== length) return false;
+ while (length--) {
+ // Deep compare each member
+ key = keys[length];
+ if (!(_.has(b, key) && eq(a[key], b[key], aStack, bStack))) return false;
+ }
+ }
+ // Remove the first object from the stack of traversed objects.
+ aStack.pop();
+ bStack.pop();
+ return true;
+ };
+
+ // Perform a deep comparison to check if two objects are equal.
+ _.isEqual = function(a, b) {
+ return eq(a, b);
+ };
+
+ // Is a given array, string, or object empty?
+ // An "empty" object has no enumerable own-properties.
+ _.isEmpty = function(obj) {
+ if (obj == null) return true;
+ if (isArrayLike(obj) && (_.isArray(obj) || _.isString(obj) || _.isArguments(obj))) return obj.length === 0;
+ return _.keys(obj).length === 0;
+ };
+
+ // Is a given value a DOM element?
+ _.isElement = function(obj) {
+ return !!(obj && obj.nodeType === 1);
+ };
+
+ // Is a given value an array?
+ // Delegates to ECMA5's native Array.isArray
+ _.isArray = nativeIsArray || function(obj) {
+ return toString.call(obj) === '[object Array]';
+ };
+
+ // Is a given variable an object?
+ _.isObject = function(obj) {
+ var type = typeof obj;
+ return type === 'function' || type === 'object' && !!obj;
+ };
+
+ // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp, isError.
+ _.each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp', 'Error'], function(name) {
+ _['is' + name] = function(obj) {
+ return toString.call(obj) === '[object ' + name + ']';
+ };
+ });
+
+ // Define a fallback version of the method in browsers (ahem, IE < 9), where
+ // there isn't any inspectable "Arguments" type.
+ if (!_.isArguments(arguments)) {
+ _.isArguments = function(obj) {
+ return _.has(obj, 'callee');
+ };
+ }
+
+ // Optimize `isFunction` if appropriate. Work around some typeof bugs in old v8,
+ // IE 11 (#1621), and in Safari 8 (#1929).
+ if (typeof /./ != 'function' && typeof Int8Array != 'object') {
+ _.isFunction = function(obj) {
+ return typeof obj == 'function' || false;
+ };
}
- var modifierMap = {
- 16:'shiftKey',
- 18:'altKey',
- 17:'ctrlKey',
- 91:'metaKey'
+ // Is a given object a finite number?
+ _.isFinite = function(obj) {
+ return isFinite(obj) && !isNaN(parseFloat(obj));
};
- function updateModifierKey(event) {
- for(k in _mods) _mods[k] = event[modifierMap[k]];
+
+ // Is the given value `NaN`? (NaN is the only number which does not equal itself).
+ _.isNaN = function(obj) {
+ return _.isNumber(obj) && obj !== +obj;
};
- // handle keydown event
- function dispatch(event) {
- var key, handler, k, i, modifiersMatch, scope;
- key = event.keyCode;
+ // Is a given value a boolean?
+ _.isBoolean = function(obj) {
+ return obj === true || obj === false || toString.call(obj) === '[object Boolean]';
+ };
- if (index(_downKeys, key) == -1) {
- _downKeys.push(key);
- }
+ // Is a given value equal to null?
+ _.isNull = function(obj) {
+ return obj === null;
+ };
- // if a modifier key, set the key. property to true and return
- if(key == 93 || key == 224) key = 91; // right command on webkit, command on Gecko
- if(key in _mods) {
- _mods[key] = true;
- // 'assignKey' from inside this closure is exported to window.key
- for(k in _MODIFIERS) if(_MODIFIERS[k] == key) assignKey[k] = true;
- return;
- }
- updateModifierKey(event);
+ // Is a given variable undefined?
+ _.isUndefined = function(obj) {
+ return obj === void 0;
+ };
- // see if we need to ignore the keypress (filter() can can be overridden)
- // by default ignore key presses if a select, textarea, or input is focused
- if(!assignKey.filter.call(this, event)) return;
+ // Shortcut function for checking if an object has a given property directly
+ // on itself (in other words, not on a prototype).
+ _.has = function(obj, key) {
+ return obj != null && hasOwnProperty.call(obj, key);
+ };
- // abort if no potentially matching shortcuts found
- if (!(key in _handlers)) return;
+ // Utility Functions
+ // -----------------
- scope = getScope();
+ // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
+ // previous owner. Returns a reference to the Underscore object.
+ _.noConflict = function() {
+ root._ = previousUnderscore;
+ return this;
+ };
- // for each potential shortcut
- for (i = 0; i < _handlers[key].length; i++) {
- handler = _handlers[key][i];
+ // Keep the identity function around for default iteratees.
+ _.identity = function(value) {
+ return value;
+ };
- // see if it's in the current scope
- if(handler.scope == scope || handler.scope == 'all'){
- // check if modifiers match if any
- modifiersMatch = handler.mods.length > 0;
- for(k in _mods)
- if((!_mods[k] && index(handler.mods, +k) > -1) ||
- (_mods[k] && index(handler.mods, +k) == -1)) modifiersMatch = false;
- // call the handler and stop the event if neccessary
- if((handler.mods.length == 0 && !_mods[16] && !_mods[18] && !_mods[17] && !_mods[91]) || modifiersMatch){
- if(handler.method(event, handler)===false){
- if(event.preventDefault) event.preventDefault();
- else event.returnValue = false;
- if(event.stopPropagation) event.stopPropagation();
- if(event.cancelBubble) event.cancelBubble = true;
- }
- }
- }
- }
+ // Predicate-generating functions. Often useful outside of Underscore.
+ _.constant = function(value) {
+ return function() {
+ return value;
+ };
};
- // unset modifier keys on keyup
- function clearModifier(event){
- var key = event.keyCode, k,
- i = index(_downKeys, key);
+ _.noop = function(){};
- // remove key from _downKeys
- if (i >= 0) {
- _downKeys.splice(i, 1);
- }
+ _.property = property;
- if(key == 93 || key == 224) key = 91;
- if(key in _mods) {
- _mods[key] = false;
- for(k in _MODIFIERS) if(_MODIFIERS[k] == key) assignKey[k] = false;
- }
+ // Generates a function for a given object that returns a given property.
+ _.propertyOf = function(obj) {
+ return obj == null ? function(){} : function(key) {
+ return obj[key];
+ };
};
- function resetModifiers() {
- for(k in _mods) _mods[k] = false;
- for(k in _MODIFIERS) assignKey[k] = false;
+ // Returns a predicate for checking whether an object has a given set of
+ // `key:value` pairs.
+ _.matcher = _.matches = function(attrs) {
+ attrs = _.extendOwn({}, attrs);
+ return function(obj) {
+ return _.isMatch(obj, attrs);
+ };
};
- // parse and assign shortcut
- function assignKey(key, scope, method){
- var keys, mods;
- keys = getKeys(key);
- if (method === undefined) {
- method = scope;
- scope = 'all';
- }
+ // Run a function **n** times.
+ _.times = function(n, iteratee, context) {
+ var accum = Array(Math.max(0, n));
+ iteratee = optimizeCb(iteratee, context, 1);
+ for (var i = 0; i < n; i++) accum[i] = iteratee(i);
+ return accum;
+ };
- // for each shortcut
- for (var i = 0; i < keys.length; i++) {
- // set modifier keys if any
- mods = [];
- key = keys[i].split('+');
- if (key.length > 1){
- mods = getMods(key);
- key = [key[key.length-1]];
- }
- // convert to keycode and...
- key = key[0]
- key = code(key);
- // ...store handler
- if (!(key in _handlers)) _handlers[key] = [];
- _handlers[key].push({ shortcut: keys[i], scope: scope, method: method, key: keys[i], mods: mods });
+ // Return a random integer between min and max (inclusive).
+ _.random = function(min, max) {
+ if (max == null) {
+ max = min;
+ min = 0;
}
+ return min + Math.floor(Math.random() * (max - min + 1));
};
- // unbind all handlers for given key in current scope
- function unbindKey(key, scope) {
- var multipleKeys, keys,
- mods = [],
- i, j, obj;
+ // A (possibly faster) way to get the current timestamp as an integer.
+ _.now = Date.now || function() {
+ return new Date().getTime();
+ };
- multipleKeys = getKeys(key);
+ // List of HTML entities for escaping.
+ var escapeMap = {
+ '&': '&',
+ '<': '<',
+ '>': '>',
+ '"': '"',
+ "'": ''',
+ '`': '`'
+ };
+ var unescapeMap = _.invert(escapeMap);
- for (j = 0; j < multipleKeys.length; j++) {
- keys = multipleKeys[j].split('+');
+ // Functions for escaping and unescaping strings to/from HTML interpolation.
+ var createEscaper = function(map) {
+ var escaper = function(match) {
+ return map[match];
+ };
+ // Regexes for identifying a key that needs to be escaped
+ var source = '(?:' + _.keys(map).join('|') + ')';
+ var testRegexp = RegExp(source);
+ var replaceRegexp = RegExp(source, 'g');
+ return function(string) {
+ string = string == null ? '' : '' + string;
+ return testRegexp.test(string) ? string.replace(replaceRegexp, escaper) : string;
+ };
+ };
+ _.escape = createEscaper(escapeMap);
+ _.unescape = createEscaper(unescapeMap);
- if (keys.length > 1) {
- mods = getMods(keys);
- key = keys[keys.length - 1];
- }
+ // If the value of the named `property` is a function then invoke it with the
+ // `object` as context; otherwise, return it.
+ _.result = function(object, property, fallback) {
+ var value = object == null ? void 0 : object[property];
+ if (value === void 0) {
+ value = fallback;
+ }
+ return _.isFunction(value) ? value.call(object) : value;
+ };
- key = code(key);
+ // Generate a unique integer id (unique within the entire client session).
+ // Useful for temporary DOM ids.
+ var idCounter = 0;
+ _.uniqueId = function(prefix) {
+ var id = ++idCounter + '';
+ return prefix ? prefix + id : id;
+ };
- if (scope === undefined) {
- scope = getScope();
- }
- if (!_handlers[key]) {
- return;
- }
- for (i = 0; i < _handlers[key].length; i++) {
- obj = _handlers[key][i];
- // only clear handlers if correct scope and mods match
- if (obj.scope === scope && compareArray(obj.mods, mods)) {
- _handlers[key][i] = {};
- }
- }
- }
+ // By default, Underscore uses ERB-style template delimiters, change the
+ // following template settings to use alternative delimiters.
+ _.templateSettings = {
+ evaluate : /<%([\s\S]+?)%>/g,
+ interpolate : /<%=([\s\S]+?)%>/g,
+ escape : /<%-([\s\S]+?)%>/g
};
- // Returns true if the key with code 'keyCode' is currently down
- // Converts strings into key codes.
- function isPressed(keyCode) {
- if (typeof(keyCode)=='string') {
- keyCode = code(keyCode);
- }
- return index(_downKeys, keyCode) != -1;
- }
+ // When customizing `templateSettings`, if you don't want to define an
+ // interpolation, evaluation or escaping regex, we need one that is
+ // guaranteed not to match.
+ var noMatch = /(.)^/;
- function getPressedKeyCodes() {
- return _downKeys.slice(0);
- }
+ // Certain characters need to be escaped so that they can be put into a
+ // string literal.
+ var escapes = {
+ "'": "'",
+ '\\': '\\',
+ '\r': 'r',
+ '\n': 'n',
+ '\u2028': 'u2028',
+ '\u2029': 'u2029'
+ };
- function filter(event){
- var tagName = (event.target || event.srcElement).tagName;
- // ignore keypressed in any elements that support keyboard data input
- return !(tagName == 'INPUT' || tagName == 'SELECT' || tagName == 'TEXTAREA');
- }
+ var escaper = /\\|'|\r|\n|\u2028|\u2029/g;
- // initialize key. to false
- for(k in _MODIFIERS) assignKey[k] = false;
+ var escapeChar = function(match) {
+ return '\\' + escapes[match];
+ };
- // set current scope (default 'all')
- function setScope(scope){ _scope = scope || 'all' };
- function getScope(){ return _scope || 'all' };
+ // JavaScript micro-templating, similar to John Resig's implementation.
+ // Underscore templating handles arbitrary delimiters, preserves whitespace,
+ // and correctly escapes quotes within interpolated code.
+ // NB: `oldSettings` only exists for backwards compatibility.
+ _.template = function(text, settings, oldSettings) {
+ if (!settings && oldSettings) settings = oldSettings;
+ settings = _.defaults({}, settings, _.templateSettings);
- // delete all handlers for a given scope
- function deleteScope(scope){
- var key, handlers, i;
+ // Combine delimiters into one regular expression via alternation.
+ var matcher = RegExp([
+ (settings.escape || noMatch).source,
+ (settings.interpolate || noMatch).source,
+ (settings.evaluate || noMatch).source
+ ].join('|') + '|$', 'g');
- for (key in _handlers) {
- handlers = _handlers[key];
- for (i = 0; i < handlers.length; ) {
- if (handlers[i].scope === scope) handlers.splice(i, 1);
- else i++;
+ // Compile the template source, escaping string literals appropriately.
+ var index = 0;
+ var source = "__p+='";
+ text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
+ source += text.slice(index, offset).replace(escaper, escapeChar);
+ index = offset + match.length;
+
+ if (escape) {
+ source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
+ } else if (interpolate) {
+ source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
+ } else if (evaluate) {
+ source += "';\n" + evaluate + "\n__p+='";
}
+
+ // Adobe VMs need the match returned to produce the correct offest.
+ return match;
+ });
+ source += "';\n";
+
+ // If a variable is not specified, place data values in local scope.
+ if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
+
+ source = "var __t,__p='',__j=Array.prototype.join," +
+ "print=function(){__p+=__j.call(arguments,'');};\n" +
+ source + 'return __p;\n';
+
+ try {
+ var render = new Function(settings.variable || 'obj', '_', source);
+ } catch (e) {
+ e.source = source;
+ throw e;
}
+
+ var template = function(data) {
+ return render.call(this, data, _);
+ };
+
+ // Provide the compiled source as a convenience for precompilation.
+ var argument = settings.variable || 'obj';
+ template.source = 'function(' + argument + '){\n' + source + '}';
+
+ return template;
};
- // abstract key logic for assign and unassign
- function getKeys(key) {
- var keys;
- key = key.replace(/\s/g, '');
- keys = key.split(',');
- if ((keys[keys.length - 1]) == '') {
- keys[keys.length - 2] += ',';
- }
- return keys;
- }
+ // Add a "chain" function. Start chaining a wrapped Underscore object.
+ _.chain = function(obj) {
+ var instance = _(obj);
+ instance._chain = true;
+ return instance;
+ };
- // abstract mods logic for assign and unassign
- function getMods(key) {
- var mods = key.slice(0, key.length - 1);
- for (var mi = 0; mi < mods.length; mi++)
- mods[mi] = _MODIFIERS[mods[mi]];
- return mods;
- }
+ // OOP
+ // ---------------
+ // If Underscore is called as a function, it returns a wrapped object that
+ // can be used OO-style. This wrapper holds altered versions of all the
+ // underscore functions. Wrapped objects may be chained.
- // cross-browser events
- function addEvent(object, event, method) {
- if (object.addEventListener)
- object.addEventListener(event, method, false);
- else if(object.attachEvent)
- object.attachEvent('on'+event, function(){ method(window.event) });
+ // Helper function to continue chaining intermediate results.
+ var result = function(instance, obj) {
+ return instance._chain ? _(obj).chain() : obj;
};
- // set the handlers globally on document
- addEvent(document, 'keydown', function(event) { dispatch(event) }); // Passing _scope to a callback to ensure it remains the same by execution. Fixes #48
- addEvent(document, 'keyup', clearModifier);
+ // Add your own custom functions to the Underscore object.
+ _.mixin = function(obj) {
+ _.each(_.functions(obj), function(name) {
+ var func = _[name] = obj[name];
+ _.prototype[name] = function() {
+ var args = [this._wrapped];
+ push.apply(args, arguments);
+ return result(this, func.apply(_, args));
+ };
+ });
+ };
- // reset modifiers to false whenever the window is (re)focused.
- addEvent(window, 'focus', resetModifiers);
+ // Add all of the Underscore functions to the wrapper object.
+ _.mixin(_);
- // store previously defined key
- var previousKey = global.key;
+ // Add all mutator Array functions to the wrapper.
+ _.each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
+ var method = ArrayProto[name];
+ _.prototype[name] = function() {
+ var obj = this._wrapped;
+ method.apply(obj, arguments);
+ if ((name === 'shift' || name === 'splice') && obj.length === 0) delete obj[0];
+ return result(this, obj);
+ };
+ });
- // restore previously defined key and return reference to our key object
- function noConflict() {
- var k = global.key;
- global.key = previousKey;
- return k;
- }
+ // Add all accessor Array functions to the wrapper.
+ _.each(['concat', 'join', 'slice'], function(name) {
+ var method = ArrayProto[name];
+ _.prototype[name] = function() {
+ return result(this, method.apply(this._wrapped, arguments));
+ };
+ });
- // set window.key and window.key.set/get/deleteScope, and the default filter
- global.key = assignKey;
- global.key.setScope = setScope;
- global.key.getScope = getScope;
- global.key.deleteScope = deleteScope;
- global.key.filter = filter;
- global.key.isPressed = isPressed;
- global.key.getPressedKeyCodes = getPressedKeyCodes;
- global.key.noConflict = noConflict;
- global.key.unbind = unbindKey;
+ // Extracts the result from a wrapped and chained object.
+ _.prototype.value = function() {
+ return this._wrapped;
+ };
- if(true) module.exports = assignKey;
+ // Provide unwrapping proxy for some methods used in engine operations
+ // such as arithmetic and JSON stringification.
+ _.prototype.valueOf = _.prototype.toJSON = _.prototype.value;
-})(this);
+ _.prototype.toString = function() {
+ return '' + this._wrapped;
+ };
+
+ // AMD registration happens at the end for compatibility with AMD loaders
+ // that may not enforce next-turn semantics on modules. Even though general
+ // practice for AMD registration is to be anonymous, underscore registers
+ // as a named module because, like jQuery, it is a base library that is
+ // popular enough to be bundled in a third party lib, but not be part of
+ // an AMD load request. Those cases could generate an error when an
+ // anonymous define() is called outside of a loader request.
+ if (true) {
+ !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_RESULT__ = (function() {
+ return _;
+ }).apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
+ __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+ }
+}.call(this));
/***/ }),
-/* 24 */
+/* 26 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -18709,7 +20522,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
-var _promisePolyfill = __webpack_require__(75);
+var _promisePolyfill = __webpack_require__(78);
var _promisePolyfill2 = _interopRequireDefault(_promisePolyfill);
@@ -18749,7 +20562,7 @@ exports.default = typeof fetch == 'function' ? fetch.bind() : function (url, opt
};
/***/ }),
-/* 25 */
+/* 27 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -18997,7 +20810,7 @@ module.exports = function (config) {
};
/***/ }),
-/* 26 */
+/* 28 */
/***/ (function(module, exports, __webpack_require__) {
// CodeMirror, copyright (c) by Marijn Haverbeke and others
@@ -19835,14 +21648,14 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
/***/ }),
-/* 27 */
+/* 29 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var Backbone = __webpack_require__(0);
-var Buttons = __webpack_require__(28);
+var Buttons = __webpack_require__(30);
module.exports = Backbone.Model.extend({
defaults: {
@@ -19861,14 +21674,14 @@ module.exports = Backbone.Model.extend({
});
/***/ }),
-/* 28 */
+/* 30 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var Backbone = __webpack_require__(0);
-var Button = __webpack_require__(109);
+var Button = __webpack_require__(112);
module.exports = Backbone.Collection.extend({
model: Button,
@@ -19942,7 +21755,7 @@ module.exports = Backbone.Collection.extend({
});
/***/ }),
-/* 29 */
+/* 31 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -19951,19 +21764,21 @@ module.exports = Backbone.Collection.extend({
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
var Backbone = __webpack_require__(0);
-var ButtonsView = __webpack_require__(111);
+var ButtonsView = __webpack_require__(114);
module.exports = Backbone.View.extend({
initialize: function initialize(o) {
var config = o.config || {};
+ var model = this.model;
this.config = config;
this.pfx = config.stylePrefix || '';
this.ppfx = config.pStylePrefix || '';
- this.buttons = this.model.get('buttons');
+ this.buttons = model.get('buttons');
this.className = this.pfx + 'panel';
- this.id = this.pfx + this.model.get('id');
- this.listenTo(this.model, 'change:appendContent', this.appendContent);
- this.listenTo(this.model, 'change:content', this.updateContent);
+ this.id = this.pfx + model.get('id');
+ this.listenTo(model, 'change:appendContent', this.appendContent);
+ this.listenTo(model, 'change:content', this.updateContent);
+ model.view = this;
},
@@ -20072,7 +21887,7 @@ module.exports = Backbone.View.extend({
});
/***/ }),
-/* 30 */
+/* 32 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -20124,10 +21939,10 @@ var _underscore = __webpack_require__(1);
module.exports = function () {
var c = {},
- defaults = __webpack_require__(117),
- Sectors = __webpack_require__(118),
+ defaults = __webpack_require__(120),
+ Sectors = __webpack_require__(121),
Properties = __webpack_require__(12),
- SectorsView = __webpack_require__(129);
+ SectorsView = __webpack_require__(132);
var properties = void 0;
var sectors, SectView;
@@ -20361,20 +22176,20 @@ module.exports = function () {
var opts = { state: state };
var rule = void 0;
+ // I stop undo manager here as after adding the CSSRule (generally after
+ // selecting the component) and calling undo() it will remove the rule from
+ // the collection, therefore updating it in style manager will not affect it
+ // #268
+ um.stop();
+
if (hasClasses) {
var deviceW = em.getCurrentMedia();
rule = cssC.get(valid, state, deviceW);
if (!rule) {
- // I stop undo manager here as after adding the CSSRule (generally after
- // selecting the component) and calling undo() it will remove the rule from
- // the collection, therefore updating it in style manager will not affect it
- // #268
- um.stop();
rule = cssC.add(valid, state, deviceW);
rule.setStyle(model.getStyle());
model.setStyle({});
- um.start();
}
} else if (config.avoidInlineStyle) {
rule = cssC.getIdRule(id, opts);
@@ -20382,6 +22197,7 @@ module.exports = function () {
}
rule && (model = rule);
+ um.start();
}
return model;
@@ -20473,7 +22289,7 @@ module.exports = function () {
};
/***/ }),
-/* 31 */
+/* 33 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -20631,7 +22447,7 @@ exports.default = {
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
-/* 32 */
+/* 34 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -20729,14 +22545,14 @@ module.exports = Property.extend({
});
/***/ }),
-/* 33 */
+/* 35 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var PropertyCompositeView = __webpack_require__(17);
-var LayersView = __webpack_require__(124);
+var LayersView = __webpack_require__(127);
module.exports = PropertyCompositeView.extend({
templateInput: function templateInput() {
@@ -20922,12 +22738,13 @@ module.exports = PropertyCompositeView.extend({
});
/***/ }),
-/* 34 */
+/* 36 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
+
+var Backbone = __webpack_require__(0);
var $ = Backbone.$;
module.exports = Backbone.View.extend({
@@ -20988,7 +22805,8 @@ module.exports = Backbone.View.extend({
*/
handleChange: function handleChange(e) {
e.stopPropagation();
- this.model.set('value', this.getInputEl().value);
+ var value = this.getInputEl().value;
+ this.model.set({ value: value }, { fromInput: 1 });
this.elementUpdated();
},
@@ -20999,7 +22817,7 @@ module.exports = Backbone.View.extend({
*/
getInputEl: function getInputEl() {
if (!this.inputEl) {
- var plh = this.model.get('defaults');
+ var plh = this.model.get('defaults') || '';
this.inputEl = $('');
}
@@ -21013,10 +22831,9 @@ module.exports = Backbone.View.extend({
return this;
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
-/* 35 */
+/* 37 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -21078,13 +22895,19 @@ module.exports = __webpack_require__(5).extend({
});
/***/ }),
-/* 36 */
+/* 38 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
-var $ = Backbone.$;
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var $ = _backbone2.default.$;
module.exports = __webpack_require__(5).extend({
templateInput: function templateInput() {
@@ -21114,10 +22937,9 @@ module.exports = __webpack_require__(5).extend({
}
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
-/* 37 */
+/* 39 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -21125,7 +22947,7 @@ module.exports = __webpack_require__(5).extend({
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-var InputColor = __webpack_require__(38);
+var InputColor = __webpack_require__(40);
module.exports = __webpack_require__(15).extend({
setValue: function setValue(value) {
@@ -21153,17 +22975,29 @@ module.exports = __webpack_require__(15).extend({
});
/***/ }),
-/* 38 */
+/* 40 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
+
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-__webpack_require__(123);
-var Input = __webpack_require__(34);
-var $ = Backbone.$;
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+var _underscore = __webpack_require__(1);
+
+var _ColorPicker = __webpack_require__(126);
+
+var _ColorPicker2 = _interopRequireDefault(_ColorPicker);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var Input = __webpack_require__(36);
+var $ = _backbone2.default.$;
+(0, _ColorPicker2.default)($);
module.exports = Input.extend({
template: function template() {
@@ -21188,7 +23022,8 @@ module.exports = Input.extend({
var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
var model = this.model;
- var value = val || model.get('defaults');
+ var def = model.get('defaults');
+ var value = !(0, _underscore.isUndefined)(val) ? val : !(0, _underscore.isUndefined)(def) ? def : '';
var inputEl = this.getInputEl();
var colorEl = this.getColorEl();
var valueClr = value != 'none' ? value : '';
@@ -21275,17 +23110,22 @@ module.exports = Input.extend({
return this;
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
-/* 39 */
+/* 41 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
+
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var PropertyView = __webpack_require__(5);
-var $ = Backbone.$;
+var $ = _backbone2.default.$;
module.exports = PropertyView.extend({
templateInput: function templateInput() {
@@ -21409,10 +23249,9 @@ module.exports = PropertyView.extend({
}
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
-/* 40 */
+/* 42 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -21430,7 +23269,7 @@ module.exports = Property.extend({
});
/***/ }),
-/* 41 */
+/* 43 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -21500,13 +23339,13 @@ module.exports = Property.extend({
});
/***/ }),
-/* 42 */
+/* 44 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-module.exports = __webpack_require__(43).extend({
+module.exports = __webpack_require__(45).extend({
events: {
'click [data-toggle=asset-remove]': 'onRemove',
click: 'onClick',
@@ -21587,13 +23426,19 @@ module.exports = __webpack_require__(43).extend({
});
/***/ }),
-/* 43 */
+/* 45 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone, _) {
+/* WEBPACK VAR INJECTION */(function(_) {
-module.exports = Backbone.View.extend({
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+module.exports = _backbone2.default.View.extend({
initialize: function initialize() {
var o = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -21640,23 +23485,31 @@ module.exports = Backbone.View.extend({
return this;
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0), __webpack_require__(1)))
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
/***/ }),
-/* 44 */
+/* 46 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone, _) {
-var _fetch = __webpack_require__(24);
+
+var _underscore = __webpack_require__(1);
+
+var _underscore2 = _interopRequireDefault(_underscore);
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+var _fetch = __webpack_require__(26);
var _fetch2 = _interopRequireDefault(_fetch);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-module.exports = Backbone.View.extend({
- template: _.template('\n \n '),
+module.exports = _backbone2.default.View.extend({
+ template: _underscore2.default.template('\n \n '),
events: {},
@@ -22017,25 +23870,31 @@ module.exports = Backbone.View.extend({
});
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0), __webpack_require__(1)))
/***/ }),
-/* 45 */
+/* 47 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(_) {
-var _Styleable = __webpack_require__(46);
+
+var _underscore = __webpack_require__(1);
+
+var _underscore2 = _interopRequireDefault(_underscore);
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+var _Styleable = __webpack_require__(48);
var _Styleable2 = _interopRequireDefault(_Styleable);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var Backbone = __webpack_require__(0);
var Selectors = __webpack_require__(11);
-module.exports = Backbone.Model.extend(_Styleable2.default).extend({
+module.exports = _backbone2.default.Model.extend(_Styleable2.default).extend({
defaults: {
// Css selectors
selectors: {},
@@ -22161,6 +24020,28 @@ module.exports = Backbone.Model.extend(_Styleable2.default).extend({
return result;
},
+ toJSON: function toJSON() {
+ for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+ args[_key] = arguments[_key];
+ }
+
+ var obj = _backbone2.default.Model.prototype.toJSON.apply(this, args);
+
+ if (this.em.getConfig('avoidDefaults')) {
+ var defaults = this.defaults;
+
+ (0, _underscore.forEach)(defaults, function (value, key) {
+ if (obj[key] === value) {
+ delete obj[key];
+ }
+ });
+
+ if ((0, _underscore.isEmpty)(obj.selectors)) delete obj.selectors;
+ if ((0, _underscore.isEmpty)(obj.style)) delete obj.style;
+ }
+
+ return obj;
+ },
/**
@@ -22183,10 +24064,10 @@ module.exports = Backbone.Model.extend(_Styleable2.default).extend({
//var a1 = _.pluck(selectors.models || selectors, cId);
//var a2 = _.pluck(this.get('selectors').models, cId);
if (!(selectors instanceof Array) && !selectors.models) selectors = [selectors];
- var a1 = _.map(selectors.models || selectors, function (model) {
+ var a1 = _underscore2.default.map(selectors.models || selectors, function (model) {
return model.get('name');
});
- var a2 = _.map(this.get('selectors').models, function (model) {
+ var a2 = _underscore2.default.map(this.get('selectors').models, function (model) {
return model.get('name');
});
var f = false;
@@ -22208,10 +24089,9 @@ module.exports = Backbone.Model.extend(_Styleable2.default).extend({
return true;
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
/***/ }),
-/* 46 */
+/* 48 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -22227,7 +24107,7 @@ var _underscore = __webpack_require__(1);
var _mixins = __webpack_require__(2);
-var _ParserHtml = __webpack_require__(25);
+var _ParserHtml = __webpack_require__(27);
var _ParserHtml2 = _interopRequireDefault(_ParserHtml);
@@ -22349,7 +24229,7 @@ exports.default = {
};
/***/ }),
-/* 47 */
+/* 49 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -22377,7 +24257,7 @@ module.exports = __webpack_require__(0).View.extend({
});
/***/ }),
-/* 48 */
+/* 50 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -22444,7 +24324,7 @@ module.exports = Backbone.View.extend({
});
/***/ }),
-/* 49 */
+/* 51 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -22520,15 +24400,21 @@ module.exports = Backbone.Collection.extend({
});
/***/ }),
-/* 50 */
+/* 52 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
+
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
var _underscore = __webpack_require__(1);
-module.exports = Backbone.View.extend({
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+module.exports = _backbone2.default.View.extend({
initialize: function initialize(o) {
this.opts = o || {};
this.config = o.config || {};
@@ -22644,29 +24530,35 @@ module.exports = Backbone.View.extend({
return this;
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
-/* 51 */
+/* 53 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+var Backbone = __webpack_require__(0);
+var ComponentView = __webpack_require__(54);
-var Component = __webpack_require__(4);
+module.exports = ComponentView.extend({
+ render: function render() {
+ for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+ args[_key] = arguments[_key];
+ }
-module.exports = Component.extend({
- defaults: _extends({}, Component.prototype.defaults, {
- type: 'text',
- droppable: false,
- editable: true
- })
+ ComponentView.prototype.render.apply(this, args);
+
+ // I need capturing instead of bubbling as bubbled clicks from other
+ // children will execute the link event
+ this.el.addEventListener('click', this.prevDef, true);
+
+ return this;
+ }
});
/***/ }),
-/* 52 */
+/* 54 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -22678,7 +24570,8 @@ var ComponentView = __webpack_require__(3);
module.exports = ComponentView.extend({
events: {
- dblclick: 'enableEditing'
+ dblclick: 'enableEditing',
+ input: 'onInput'
},
initialize: function initialize(o) {
@@ -22773,6 +24666,19 @@ module.exports = ComponentView.extend({
},
+ /**
+ * Callback on input event
+ * @param {Event} e
+ */
+ onInput: function onInput(e) {
+ var em = this.em;
+
+ // Update toolbars
+
+ em && em.trigger('change:canvasOffset');
+ },
+
+
/**
* Isolate disable propagation method
* @param {Event}
@@ -22803,7 +24709,7 @@ module.exports = ComponentView.extend({
});
/***/ }),
-/* 53 */
+/* 55 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -22811,15 +24717,15 @@ module.exports = ComponentView.extend({
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-var _config = __webpack_require__(177);
+var _config = __webpack_require__(181);
var _config2 = _interopRequireDefault(_config);
-var _ItemView = __webpack_require__(54);
+var _ItemView = __webpack_require__(56);
var _ItemView2 = _interopRequireDefault(_ItemView);
-var _ItemsView = __webpack_require__(55);
+var _ItemsView = __webpack_require__(57);
var _ItemsView2 = _interopRequireDefault(_ItemsView);
@@ -22889,12 +24795,13 @@ module.exports = function () {
* Triggered when the selected component is changed
* @private
*/
- componentChanged: function componentChanged(e, md) {
- var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+ componentChanged: function componentChanged(selected) {
+ var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
if (opts.fromLayers) return;
var opened = em.get('opened');
var model = em.getSelected();
+ var scroll = config.scrollLayers;
var parent = model && model.collection ? model.collection.parent : null;
for (var cid in opened) {
opened[cid].set('open', 0);
@@ -22903,6 +24810,11 @@ module.exports = function () {
opened[parent.cid] = parent;
parent = parent.collection ? parent.collection.parent : null;
}
+
+ if (model && scroll) {
+ var el = model.viewLayer && model.viewLayer.el;
+ el && el.scrollIntoView(scroll);
+ }
},
render: function render() {
return layers.render().el;
@@ -22911,7 +24823,7 @@ module.exports = function () {
};
/***/ }),
-/* 54 */
+/* 56 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -22928,6 +24840,7 @@ module.exports = __webpack_require__(0).View.extend({
'mousedown [data-toggle-move]': 'startSort',
'click [data-toggle-visible]': 'toggleVisibility',
'click [data-toggle-select]': 'handleSelect',
+ 'mouseover [data-toggle-select]': 'handleHover',
'click [data-toggle-open]': 'toggleOpening',
'dblclick [data-name]': 'handleEdit',
'focusout [data-name]': 'handleEditEnd'
@@ -22979,6 +24892,7 @@ module.exports = __webpack_require__(0).View.extend({
this.clsNoChild = pfx + 'layer-no-chld';
this.$el.data('model', model);
this.$el.data('collection', components);
+ model.viewLayer = this;
},
getVisibilityEl: function getVisibilityEl() {
if (!this.eyeEl) {
@@ -23098,7 +25012,29 @@ module.exports = __webpack_require__(0).View.extend({
*/
handleSelect: function handleSelect(e) {
e.stopPropagation();
- this.em && this.em.setSelected(this.model, { fromLayers: 1 });
+ var em = this.em,
+ config = this.config;
+
+
+ if (em) {
+ var model = this.model;
+ em.setSelected(model, { fromLayers: 1 });
+ var scroll = config.scrollCanvas;
+ scroll && em.get('Canvas').scrollTo(model, scroll);
+ }
+ },
+
+
+ /**
+ * Handle component selection
+ */
+ handleHover: function handleHover(e) {
+ e.stopPropagation();
+ var em = this.em,
+ config = this.config,
+ model = this.model;
+
+ em && config.showHover && em.setHovered(model, { fromLayers: 1 });
},
@@ -23139,7 +25075,9 @@ module.exports = __webpack_require__(0).View.extend({
* @param Event
* */
updateStatus: function updateStatus(e) {
- ComponentView.prototype.updateStatus.apply(this, arguments);
+ ComponentView.prototype.updateStatus.apply(this, [{
+ avoidHover: !this.config.highlightHover
+ }]);
},
@@ -23216,7 +25154,7 @@ module.exports = __webpack_require__(0).View.extend({
el.html(this.template(model));
if ((0, _underscore.isUndefined)(ItemsView)) {
- ItemsView = __webpack_require__(55);
+ ItemsView = __webpack_require__(57);
}
var children = new ItemsView({
@@ -23243,13 +25181,13 @@ module.exports = __webpack_require__(0).View.extend({
});
/***/ }),
-/* 55 */
+/* 57 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var ItemView = __webpack_require__(54);
+var ItemView = __webpack_require__(56);
module.exports = __webpack_require__(0).View.extend({
initialize: function initialize() {
@@ -23390,13 +25328,19 @@ module.exports = __webpack_require__(0).View.extend({
});
/***/ }),
-/* 56 */
+/* 58 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
-var $ = Backbone.$;
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var $ = _backbone2.default.$;
module.exports = {
/**
@@ -23492,26 +25436,34 @@ module.exports = {
this.$wrapper.unbind();
}
};
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
-/* 57 */
+/* 59 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(_) {
-var Backbone = __webpack_require__(0);
-var CreateComponent = __webpack_require__(22);
-module.exports = _.extend({}, CreateComponent, {
+var _underscore = __webpack_require__(1);
+
+var _underscore2 = _interopRequireDefault(_underscore);
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var CreateComponent = __webpack_require__(23);
+
+module.exports = _underscore2.default.extend({}, CreateComponent, {
init: function init() {
for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
args[_key] = arguments[_key];
}
CreateComponent.init.apply(this, args);
- _.bindAll(this, 'insertComponent');
+ _underscore2.default.bindAll(this, 'insertComponent');
this.allowDraw = 0;
},
@@ -23586,18 +25538,21 @@ module.exports = _.extend({}, CreateComponent, {
return this.opt.content || {};
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
/***/ }),
-/* 58 */
+/* 60 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var Backbone = __webpack_require__(0);
+var _backbone = __webpack_require__(0);
-module.exports = Backbone.Model.extend({
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+module.exports = _backbone2.default.Model.extend({
defaults: {
id: '',
label: '',
@@ -23607,7 +25562,7 @@ module.exports = Backbone.Model.extend({
});
/***/ }),
-/* 59 */
+/* 61 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -23615,21 +25570,21 @@ module.exports = Backbone.Model.extend({
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-var _cashDom = __webpack_require__(9);
+var _cashDom = __webpack_require__(10);
var _cashDom2 = _interopRequireDefault(_cashDom);
-var _editor = __webpack_require__(60);
+var _editor = __webpack_require__(62);
var _editor2 = _interopRequireDefault(_editor);
var _underscore = __webpack_require__(1);
-var _polyfills = __webpack_require__(219);
+var _polyfills = __webpack_require__(223);
var _polyfills2 = _interopRequireDefault(_polyfills);
-var _plugin_manager = __webpack_require__(220);
+var _plugin_manager = __webpack_require__(224);
var _plugin_manager2 = _interopRequireDefault(_plugin_manager);
@@ -23659,7 +25614,7 @@ module.exports = function () {
plugins: plugins,
// Will be replaced on build
- version: '0.14.15',
+ version: '0.14.16',
/**
* Initializes an editor based on passed options
@@ -23709,13 +25664,13 @@ module.exports = function () {
}();
/***/ }),
-/* 60 */
+/* 62 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var _cashDom = __webpack_require__(9);
+var _cashDom = __webpack_require__(10);
var _cashDom2 = _interopRequireDefault(_cashDom);
@@ -23723,9 +25678,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
module.exports = function (config) {
var c = config || {},
- defaults = __webpack_require__(61),
- EditorModel = __webpack_require__(62),
- EditorView = __webpack_require__(218);
+ defaults = __webpack_require__(63),
+ EditorModel = __webpack_require__(64),
+ EditorView = __webpack_require__(222);
for (var name in defaults) {
if (!(name in c)) c[name] = defaults[name];
@@ -24366,7 +26321,7 @@ module.exports = function (config) {
*/
/***/ }),
-/* 61 */
+/* 63 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -24583,7 +26538,7 @@ module.exports = {
};
/***/ }),
-/* 62 */
+/* 64 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -24593,12 +26548,12 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
var _underscore = __webpack_require__(1);
-var deps = [__webpack_require__(63), __webpack_require__(67), __webpack_require__(68), __webpack_require__(71), __webpack_require__(79), __webpack_require__(84), __webpack_require__(87), __webpack_require__(91), __webpack_require__(95), __webpack_require__(107), __webpack_require__(114), __webpack_require__(30), __webpack_require__(131), __webpack_require__(137), __webpack_require__(142), __webpack_require__(149), __webpack_require__(53), __webpack_require__(178), __webpack_require__(185), __webpack_require__(209)];
+var deps = [__webpack_require__(66), __webpack_require__(70), __webpack_require__(71), __webpack_require__(74), __webpack_require__(82), __webpack_require__(87), __webpack_require__(90), __webpack_require__(94), __webpack_require__(98), __webpack_require__(110), __webpack_require__(117), __webpack_require__(32), __webpack_require__(134), __webpack_require__(140), __webpack_require__(145), __webpack_require__(152), __webpack_require__(55), __webpack_require__(182), __webpack_require__(189), __webpack_require__(213)];
var Backbone = __webpack_require__(0);
var timedInterval = void 0;
-__webpack_require__(217)({
+__webpack_require__(221)({
Backbone: Backbone,
$: Backbone.$
});
@@ -24610,6 +26565,7 @@ module.exports = Backbone.Model.extend({
clipboard: null,
designerMode: false,
selectedComponent: null,
+ componentHovered: null,
previousModel: null,
changesCount: 0,
storables: [],
@@ -24637,6 +26593,7 @@ module.exports = Backbone.Model.extend({
return _this.loadModule(name);
});
this.on('change:selectedComponent', this.componentSelected, this);
+ this.on('change:componentHovered', this.componentHovered, this);
this.on('change:changesCount', this.updateChanges, this);
},
@@ -24800,6 +26757,20 @@ module.exports = Backbone.Model.extend({
},
+ /**
+ * Callback on component hover
+ * @param {Object} Model
+ * @param {Mixed} New value
+ * @param {Object} Options
+ * @private
+ * */
+ componentHovered: function componentHovered(editor, component, options) {
+ var prev = this.previous('componentHovered');
+ prev && this.trigger('component:unhovered', prev, options);
+ component && this.trigger('component:hovered', component, options);
+ },
+
+
/**
* Returns model of the selected component
* @return {Component|null}
@@ -24827,6 +26798,23 @@ module.exports = Backbone.Model.extend({
},
+ /**
+ * Hover a component
+ * @param {Component|HTMLElement} el Component to select
+ * @param {Object} [opts={}] Options, optional
+ * @private
+ */
+ setHovered: function setHovered(el) {
+ var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+ var model = el;
+ (0, _underscore.isElement)(el) && (model = $(el).data('model'));
+ if (model && !model.get('hoverable')) return;
+ opts.forceChange && this.set('componentHovered', '');
+ this.set('componentHovered', model, opts);
+ },
+
+
/**
* Set components inside editor's canvas. This method overrides actual components
* @param {Object|string} components HTML string or components model
@@ -25132,16 +27120,44 @@ module.exports = Backbone.Model.extend({
});
/***/ }),
-/* 63 */
+/* 65 */
+/***/ (function(module, exports) {
+
+module.exports = function(module) {
+ if(!module.webpackPolyfill) {
+ module.deprecate = function() {};
+ module.paths = [];
+ // module.parent = undefined by default
+ if(!module.children) module.children = [];
+ Object.defineProperty(module, "loaded", {
+ enumerable: true,
+ get: function() {
+ return module.l;
+ }
+ });
+ Object.defineProperty(module, "id", {
+ enumerable: true,
+ get: function() {
+ return module.i;
+ }
+ });
+ module.webpackPolyfill = 1;
+ }
+ return module;
+};
+
+
+/***/ }),
+/* 66 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
module.exports = function () {
- var Sorter = __webpack_require__(64);
- var Resizer = __webpack_require__(65);
- var Dragger = __webpack_require__(66);
+ var Sorter = __webpack_require__(67);
+ var Resizer = __webpack_require__(68);
+ var Dragger = __webpack_require__(69);
return {
/**
@@ -25166,21 +27182,27 @@ module.exports = function () {
};
/***/ }),
-/* 64 */
+/* 67 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone, _) {
+/* WEBPACK VAR INJECTION */(function(_) {
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
var _underscore = __webpack_require__(1);
var _mixins = __webpack_require__(2);
-var $ = Backbone.$;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-module.exports = Backbone.View.extend({
+var $ = _backbone2.default.$;
+
+module.exports = _backbone2.default.View.extend({
initialize: function initialize(opt) {
this.opt = opt || {};
_.bindAll(this, 'startSort', 'onMove', 'endMove', 'rollback', 'udpateOffset', 'moveDragHelper');
@@ -25511,7 +27533,7 @@ module.exports = Backbone.View.extend({
* @param {Model|null} model
*/
selectTargetModel: function selectTargetModel(model) {
- if (model instanceof Backbone.Collection) {
+ if (model instanceof _backbone2.default.Collection) {
return;
}
@@ -25677,7 +27699,7 @@ module.exports = Backbone.View.extend({
// Check if the target could accept the source
var droppable = trgModel.get('droppable');
- droppable = droppable instanceof Backbone.Collection ? 1 : droppable;
+ droppable = droppable instanceof _backbone2.default.Collection ? 1 : droppable;
droppable = droppable instanceof Array ? droppable.join(', ') : droppable;
result.dropInfo = droppable;
droppable = (0, _underscore.isString)(droppable) ? this.matches(src, droppable) : droppable;
@@ -26134,7 +28156,7 @@ module.exports = Backbone.View.extend({
var dropInfo = validResult.dropInfo;
var dragInfo = validResult.dragInfo;
var dropContent = this.dropContent;
- droppable = validResult.trgModel instanceof Backbone.Collection ? 1 : droppable;
+ droppable = validResult.trgModel instanceof _backbone2.default.Collection ? 1 : droppable;
if (targetCollection && droppable && draggable) {
index = pos.method === 'after' ? index + 1 : index;
@@ -26202,10 +28224,10 @@ module.exports = Backbone.View.extend({
}
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0), __webpack_require__(1)))
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
/***/ }),
-/* 65 */
+/* 68 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -26779,13 +28801,19 @@ module.exports = {
};
/***/ }),
-/* 66 */
+/* 69 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
-var $ = Backbone.$;
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var $ = _backbone2.default.$;
var getBoundingRect = function getBoundingRect(el, win) {
var w = win || window;
@@ -27122,10 +29150,9 @@ module.exports = {
}
}
};
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
-/* 67 */
+/* 70 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -27146,7 +29173,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
var _underscore = __webpack_require__(1);
-var keymaster = __webpack_require__(23);
+var keymaster = __webpack_require__(24);
module.exports = function () {
var em = void 0;
@@ -27299,7 +29326,7 @@ module.exports = function () {
};
/***/ }),
-/* 68 */
+/* 71 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -27316,7 +29343,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
*/
-var _backboneUndo = __webpack_require__(69);
+var _backboneUndo = __webpack_require__(72);
var _backboneUndo2 = _interopRequireDefault(_backboneUndo);
@@ -27588,7 +29615,7 @@ module.exports = function () {
};
/***/ }),
-/* 69 */
+/* 72 */
/***/ (function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -27605,7 +29632,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
(function (factory) {
if (true) {
// AMD support
- !(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(1), __webpack_require__(70)], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
+ !(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(25), __webpack_require__(73)], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
@@ -28430,7 +30457,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
/***/ }),
-/* 70 */
+/* 73 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(global) {var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Backbone.js 1.2.1
@@ -28449,7 +30476,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
// Set up Backbone appropriately for the environment. Start with AMD.
if (true) {
- !(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(1), __webpack_require__(9), exports], __WEBPACK_AMD_DEFINE_RESULT__ = (function(_, $, exports) {
+ !(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(25), __webpack_require__(10), exports], __WEBPACK_AMD_DEFINE_RESULT__ = (function(_, $, exports) {
// Export global even in AMD case in case this script is loaded with
// others that may still expect a global Backbone.
root.Backbone = factory(root, exports, _, $);
@@ -30308,10 +32335,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
}));
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(10)))
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(7)))
/***/ }),
-/* 71 */
+/* 74 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -30326,9 +32353,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
*/
module.exports = function () {
var c = {},
- defaults = __webpack_require__(72),
- LocalStorage = __webpack_require__(73),
- RemoteStorage = __webpack_require__(74);
+ defaults = __webpack_require__(75),
+ LocalStorage = __webpack_require__(76),
+ RemoteStorage = __webpack_require__(77);
var em = void 0;
var storages = {};
@@ -30644,7 +32671,7 @@ module.exports = function () {
};
/***/ }),
-/* 72 */
+/* 75 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -30711,7 +32738,7 @@ module.exports = {
};
/***/ }),
-/* 73 */
+/* 76 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -30780,13 +32807,13 @@ module.exports = Backbone.Model.extend({
});
/***/ }),
-/* 74 */
+/* 77 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var _fetch = __webpack_require__(24);
+var _fetch = __webpack_require__(26);
var _fetch2 = _interopRequireDefault(_fetch);
@@ -30938,247 +32965,257 @@ module.exports = __webpack_require__(0).Model.extend({
});
/***/ }),
-/* 75 */
+/* 78 */
/***/ (function(module, exports, __webpack_require__) {
-/* WEBPACK VAR INJECTION */(function(setImmediate) {(function (root) {
+"use strict";
+/* WEBPACK VAR INJECTION */(function(setImmediate) {
- // Store setTimeout reference so promise-polyfill will be unaffected by
- // other code modifying setTimeout (like sinon.useFakeTimers())
- var setTimeoutFunc = setTimeout;
+// Store setTimeout reference so promise-polyfill will be unaffected by
+// other code modifying setTimeout (like sinon.useFakeTimers())
+var setTimeoutFunc = setTimeout;
- function noop() {}
-
- // Polyfill for Function.prototype.bind
- function bind(fn, thisArg) {
- return function () {
- fn.apply(thisArg, arguments);
- };
- }
+function noop() {}
- function Promise(fn) {
- if (!(this instanceof Promise)) throw new TypeError('Promises must be constructed via new');
- if (typeof fn !== 'function') throw new TypeError('not a function');
- this._state = 0;
- this._handled = false;
- this._value = undefined;
- this._deferreds = [];
+// Polyfill for Function.prototype.bind
+function bind(fn, thisArg) {
+ return function() {
+ fn.apply(thisArg, arguments);
+ };
+}
- doResolve(fn, this);
- }
+function Promise(fn) {
+ if (!(this instanceof Promise))
+ throw new TypeError('Promises must be constructed via new');
+ if (typeof fn !== 'function') throw new TypeError('not a function');
+ this._state = 0;
+ this._handled = false;
+ this._value = undefined;
+ this._deferreds = [];
- function handle(self, deferred) {
- while (self._state === 3) {
- self = self._value;
+ doResolve(fn, this);
+}
+
+function handle(self, deferred) {
+ while (self._state === 3) {
+ self = self._value;
+ }
+ if (self._state === 0) {
+ self._deferreds.push(deferred);
+ return;
+ }
+ self._handled = true;
+ Promise._immediateFn(function() {
+ var cb = self._state === 1 ? deferred.onFulfilled : deferred.onRejected;
+ if (cb === null) {
+ (self._state === 1 ? resolve : reject)(deferred.promise, self._value);
+ return;
}
- if (self._state === 0) {
- self._deferreds.push(deferred);
+ var ret;
+ try {
+ ret = cb(self._value);
+ } catch (e) {
+ reject(deferred.promise, e);
return;
}
- self._handled = true;
- Promise._immediateFn(function () {
- var cb = self._state === 1 ? deferred.onFulfilled : deferred.onRejected;
- if (cb === null) {
- (self._state === 1 ? resolve : reject)(deferred.promise, self._value);
+ resolve(deferred.promise, ret);
+ });
+}
+
+function resolve(self, newValue) {
+ try {
+ // Promise Resolution Procedure: https://github.com/promises-aplus/promises-spec#the-promise-resolution-procedure
+ if (newValue === self)
+ throw new TypeError('A promise cannot be resolved with itself.');
+ if (
+ newValue &&
+ (typeof newValue === 'object' || typeof newValue === 'function')
+ ) {
+ var then = newValue.then;
+ if (newValue instanceof Promise) {
+ self._state = 3;
+ self._value = newValue;
+ finale(self);
return;
- }
- var ret;
- try {
- ret = cb(self._value);
- } catch (e) {
- reject(deferred.promise, e);
+ } else if (typeof then === 'function') {
+ doResolve(bind(then, newValue), self);
return;
}
- resolve(deferred.promise, ret);
- });
- }
-
- function resolve(self, newValue) {
- try {
- // Promise Resolution Procedure: https://github.com/promises-aplus/promises-spec#the-promise-resolution-procedure
- if (newValue === self) throw new TypeError('A promise cannot be resolved with itself.');
- if (newValue && (typeof newValue === 'object' || typeof newValue === 'function')) {
- var then = newValue.then;
- if (newValue instanceof Promise) {
- self._state = 3;
- self._value = newValue;
- finale(self);
- return;
- } else if (typeof then === 'function') {
- doResolve(bind(then, newValue), self);
- return;
- }
- }
- self._state = 1;
- self._value = newValue;
- finale(self);
- } catch (e) {
- reject(self, e);
}
- }
-
- function reject(self, newValue) {
- self._state = 2;
+ self._state = 1;
self._value = newValue;
finale(self);
+ } catch (e) {
+ reject(self, e);
}
+}
- function finale(self) {
- if (self._state === 2 && self._deferreds.length === 0) {
- Promise._immediateFn(function() {
- if (!self._handled) {
- Promise._unhandledRejectionFn(self._value);
- }
- });
- }
+function reject(self, newValue) {
+ self._state = 2;
+ self._value = newValue;
+ finale(self);
+}
- for (var i = 0, len = self._deferreds.length; i < len; i++) {
- handle(self, self._deferreds[i]);
- }
- self._deferreds = null;
+function finale(self) {
+ if (self._state === 2 && self._deferreds.length === 0) {
+ Promise._immediateFn(function() {
+ if (!self._handled) {
+ Promise._unhandledRejectionFn(self._value);
+ }
+ });
}
- function Handler(onFulfilled, onRejected, promise) {
- this.onFulfilled = typeof onFulfilled === 'function' ? onFulfilled : null;
- this.onRejected = typeof onRejected === 'function' ? onRejected : null;
- this.promise = promise;
+ for (var i = 0, len = self._deferreds.length; i < len; i++) {
+ handle(self, self._deferreds[i]);
}
+ self._deferreds = null;
+}
- /**
- * Take a potentially misbehaving resolver function and make sure
- * onFulfilled and onRejected are only called once.
- *
- * Makes no guarantees about asynchrony.
- */
- function doResolve(fn, self) {
- var done = false;
- try {
- fn(function (value) {
+function Handler(onFulfilled, onRejected, promise) {
+ this.onFulfilled = typeof onFulfilled === 'function' ? onFulfilled : null;
+ this.onRejected = typeof onRejected === 'function' ? onRejected : null;
+ this.promise = promise;
+}
+
+/**
+ * Take a potentially misbehaving resolver function and make sure
+ * onFulfilled and onRejected are only called once.
+ *
+ * Makes no guarantees about asynchrony.
+ */
+function doResolve(fn, self) {
+ var done = false;
+ try {
+ fn(
+ function(value) {
if (done) return;
done = true;
resolve(self, value);
- }, function (reason) {
+ },
+ function(reason) {
if (done) return;
done = true;
reject(self, reason);
- });
- } catch (ex) {
- if (done) return;
- done = true;
- reject(self, ex);
- }
+ }
+ );
+ } catch (ex) {
+ if (done) return;
+ done = true;
+ reject(self, ex);
}
+}
- Promise.prototype['catch'] = function (onRejected) {
- return this.then(null, onRejected);
- };
+Promise.prototype['catch'] = function(onRejected) {
+ return this.then(null, onRejected);
+};
- Promise.prototype.then = function (onFulfilled, onRejected) {
- var prom = new (this.constructor)(noop);
+Promise.prototype.then = function(onFulfilled, onRejected) {
+ var prom = new this.constructor(noop);
- handle(this, new Handler(onFulfilled, onRejected, prom));
- return prom;
- };
+ handle(this, new Handler(onFulfilled, onRejected, prom));
+ return prom;
+};
+
+Promise.prototype['finally'] = function(callback) {
+ var constructor = this.constructor;
+ return this.then(
+ function(value) {
+ return constructor.resolve(callback()).then(function() {
+ return value;
+ });
+ },
+ function(reason) {
+ return constructor.resolve(callback()).then(function() {
+ return constructor.reject(reason);
+ });
+ }
+ );
+};
- Promise.all = function (arr) {
- return new Promise(function (resolve, reject) {
- if (!arr || typeof arr.length === 'undefined') throw new TypeError('Promise.all accepts an array');
- var args = Array.prototype.slice.call(arr);
- if (args.length === 0) return resolve([]);
- var remaining = args.length;
+Promise.all = function(arr) {
+ return new Promise(function(resolve, reject) {
+ if (!arr || typeof arr.length === 'undefined')
+ throw new TypeError('Promise.all accepts an array');
+ var args = Array.prototype.slice.call(arr);
+ if (args.length === 0) return resolve([]);
+ var remaining = args.length;
- function res(i, val) {
- try {
- if (val && (typeof val === 'object' || typeof val === 'function')) {
- var then = val.then;
- if (typeof then === 'function') {
- then.call(val, function (val) {
+ function res(i, val) {
+ try {
+ if (val && (typeof val === 'object' || typeof val === 'function')) {
+ var then = val.then;
+ if (typeof then === 'function') {
+ then.call(
+ val,
+ function(val) {
res(i, val);
- }, reject);
- return;
- }
- }
- args[i] = val;
- if (--remaining === 0) {
- resolve(args);
+ },
+ reject
+ );
+ return;
}
- } catch (ex) {
- reject(ex);
}
+ args[i] = val;
+ if (--remaining === 0) {
+ resolve(args);
+ }
+ } catch (ex) {
+ reject(ex);
}
-
- for (var i = 0; i < args.length; i++) {
- res(i, args[i]);
- }
- });
- };
-
- Promise.resolve = function (value) {
- if (value && typeof value === 'object' && value.constructor === Promise) {
- return value;
}
- return new Promise(function (resolve) {
- resolve(value);
- });
- };
+ for (var i = 0; i < args.length; i++) {
+ res(i, args[i]);
+ }
+ });
+};
- Promise.reject = function (value) {
- return new Promise(function (resolve, reject) {
- reject(value);
- });
- };
+Promise.resolve = function(value) {
+ if (value && typeof value === 'object' && value.constructor === Promise) {
+ return value;
+ }
- Promise.race = function (values) {
- return new Promise(function (resolve, reject) {
- for (var i = 0, len = values.length; i < len; i++) {
- values[i].then(resolve, reject);
- }
- });
- };
+ return new Promise(function(resolve) {
+ resolve(value);
+ });
+};
- // Use polyfill for setImmediate for performance gains
- Promise._immediateFn = (typeof setImmediate === 'function' && function (fn) { setImmediate(fn); }) ||
- function (fn) {
- setTimeoutFunc(fn, 0);
- };
+Promise.reject = function(value) {
+ return new Promise(function(resolve, reject) {
+ reject(value);
+ });
+};
- Promise._unhandledRejectionFn = function _unhandledRejectionFn(err) {
- if (typeof console !== 'undefined' && console) {
- console.warn('Possible Unhandled Promise Rejection:', err); // eslint-disable-line no-console
+Promise.race = function(values) {
+ return new Promise(function(resolve, reject) {
+ for (var i = 0, len = values.length; i < len; i++) {
+ values[i].then(resolve, reject);
}
- };
+ });
+};
- /**
- * Set the immediate function to execute callbacks
- * @param fn {function} Function to execute
- * @deprecated
- */
- Promise._setImmediateFn = function _setImmediateFn(fn) {
- Promise._immediateFn = fn;
+// Use polyfill for setImmediate for performance gains
+Promise._immediateFn =
+ (typeof setImmediate === 'function' &&
+ function(fn) {
+ setImmediate(fn);
+ }) ||
+ function(fn) {
+ setTimeoutFunc(fn, 0);
};
- /**
- * Change the function to execute on unhandled rejection
- * @param {function} fn Function to execute on unhandled rejection
- * @deprecated
- */
- Promise._setUnhandledRejectionFn = function _setUnhandledRejectionFn(fn) {
- Promise._unhandledRejectionFn = fn;
- };
-
- if (typeof module !== 'undefined' && module.exports) {
- module.exports = Promise;
- } else if (!root.Promise) {
- root.Promise = Promise;
+Promise._unhandledRejectionFn = function _unhandledRejectionFn(err) {
+ if (typeof console !== 'undefined' && console) {
+ console.warn('Possible Unhandled Promise Rejection:', err); // eslint-disable-line no-console
}
+};
-})(this);
+module.exports = Promise;
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(76).setImmediate))
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(79).setImmediate))
/***/ }),
-/* 76 */
+/* 79 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(global) {var apply = Function.prototype.apply;
@@ -31231,7 +33268,7 @@ exports._unrefActive = exports.active = function(item) {
};
// setimmediate attaches itself to the global object
-__webpack_require__(77);
+__webpack_require__(80);
// On some exotic environments, it's not clear which object `setimmeidate` was
// able to install onto. Search each possibility in the same order as the
// `setimmediate` library.
@@ -31242,10 +33279,10 @@ exports.clearImmediate = (typeof self !== "undefined" && self.clearImmediate) ||
(typeof global !== "undefined" && global.clearImmediate) ||
(this && this.clearImmediate);
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(10)))
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(7)))
/***/ }),
-/* 77 */
+/* 80 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(global, process) {(function (global, undefined) {
@@ -31435,10 +33472,10 @@ exports.clearImmediate = (typeof self !== "undefined" && self.clearImmediate) ||
attachTo.clearImmediate = clearImmediate;
}(typeof self === "undefined" ? typeof global === "undefined" ? this : global : self));
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(10), __webpack_require__(78)))
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(7), __webpack_require__(81)))
/***/ }),
-/* 78 */
+/* 81 */
/***/ (function(module, exports) {
// shim for using process in browser
@@ -31628,7 +33665,7 @@ process.umask = function() { return 0; };
/***/ }),
-/* 79 */
+/* 82 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -31645,9 +33682,9 @@ process.umask = function() { return 0; };
*/
module.exports = function () {
var c = {},
- defaults = __webpack_require__(80),
- Devices = __webpack_require__(81),
- DevicesView = __webpack_require__(83);
+ defaults = __webpack_require__(83),
+ Devices = __webpack_require__(84),
+ DevicesView = __webpack_require__(86);
var devices, view;
return {
@@ -31748,7 +33785,7 @@ module.exports = function () {
};
/***/ }),
-/* 80 */
+/* 83 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -31761,29 +33798,38 @@ module.exports = {
};
/***/ }),
-/* 81 */
+/* 84 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var Backbone = __webpack_require__(0);
-var Device = __webpack_require__(82);
+var _backbone = __webpack_require__(0);
-module.exports = Backbone.Collection.extend({
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var Device = __webpack_require__(85);
+
+module.exports = _backbone2.default.Collection.extend({
model: Device
});
/***/ }),
-/* 82 */
+/* 85 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var Backbone = __webpack_require__(0);
+var _backbone = __webpack_require__(0);
-module.exports = Backbone.Model.extend({
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+module.exports = _backbone2.default.Model.extend({
idAttribute: 'name',
defaults: {
@@ -31808,16 +33854,24 @@ module.exports = Backbone.Model.extend({
});
/***/ }),
-/* 83 */
+/* 86 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(_) {
-var Backbone = __webpack_require__(0);
-module.exports = Backbone.View.extend({
- template: _.template('\n <%= deviceLabel %>
\n \n '),
+var _underscore = __webpack_require__(1);
+
+var _underscore2 = _interopRequireDefault(_underscore);
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+module.exports = _backbone2.default.View.extend({
+ template: _underscore2.default.template('\n <%= deviceLabel %>
\n \n '),
events: {
change: 'updateDevice'
@@ -31895,10 +33949,9 @@ module.exports = Backbone.View.extend({
return this;
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
/***/ }),
-/* 84 */
+/* 87 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -31906,9 +33959,9 @@ module.exports = Backbone.View.extend({
module.exports = function () {
var c = {},
- defaults = __webpack_require__(85),
- parserCss = __webpack_require__(86),
- parserHtml = __webpack_require__(25);
+ defaults = __webpack_require__(88),
+ parserCss = __webpack_require__(89),
+ parserHtml = __webpack_require__(27);
var pHtml, pCss;
return {
@@ -31963,7 +34016,7 @@ module.exports = function () {
};
/***/ }),
-/* 85 */
+/* 88 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -31974,7 +34027,7 @@ module.exports = {
};
/***/ }),
-/* 86 */
+/* 89 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -32185,7 +34238,7 @@ module.exports = function (config) {
};
/***/ }),
-/* 87 */
+/* 90 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -32255,10 +34308,10 @@ module.exports = function (config) {
var _ref;
var c = config || {},
- defaults = __webpack_require__(88),
- Selector = __webpack_require__(7),
+ defaults = __webpack_require__(91),
+ Selector = __webpack_require__(8),
Selectors = __webpack_require__(11),
- ClassTagsView = __webpack_require__(89);
+ ClassTagsView = __webpack_require__(92);
var selectors, selectorTags;
return _ref = {
@@ -32375,7 +34428,7 @@ module.exports = function (config) {
};
/***/ }),
-/* 88 */
+/* 91 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -32405,17 +34458,26 @@ module.exports = {
};
/***/ }),
-/* 89 */
+/* 92 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(_) {
-var Backbone = __webpack_require__(0);
-var ClassTagView = __webpack_require__(90);
-module.exports = Backbone.View.extend({
- template: _.template('\n \n
<%= label %>
\n
\n
\n \n
\n \n \n
\n
\n
\n
\n
<%= selectedLabel %>
\n
\n
\n
\n
<%= label %>
\n
\n
\n \n
\n \n \n
\n
\n
\n
\n
<%= selectedLabel %>
\n
\n
\n
\n \n <%= label %>\n
'),
+module.exports = _backbone2.default.View.extend({
+ template: _underscore2.default.template('\n \n \n <%= label %>\n
'),
events: {
'click [data-sector-title]': 'toggle'
@@ -40453,10 +42608,9 @@ module.exports = Backbone.View.extend({
}
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
/***/ }),
-/* 131 */
+/* 134 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -40504,10 +42658,10 @@ module.exports = Backbone.View.extend({
module.exports = function () {
var c = {};
- var defaults = __webpack_require__(132);
- var Assets = __webpack_require__(133);
- var AssetsView = __webpack_require__(136);
- var FileUpload = __webpack_require__(44);
+ var defaults = __webpack_require__(135);
+ var Assets = __webpack_require__(136);
+ var AssetsView = __webpack_require__(139);
+ var FileUpload = __webpack_require__(46);
var assets = void 0,
am = void 0,
fu = void 0;
@@ -40846,7 +43000,7 @@ module.exports = function () {
};
/***/ }),
-/* 132 */
+/* 135 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -40938,13 +43092,13 @@ module.exports = {
};
/***/ }),
-/* 133 */
+/* 136 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var _TypeableCollection = __webpack_require__(31);
+var _TypeableCollection = __webpack_require__(33);
var _TypeableCollection2 = _interopRequireDefault(_TypeableCollection);
@@ -40953,8 +43107,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
module.exports = __webpack_require__(0).Collection.extend(_TypeableCollection2.default).extend({
types: [{
id: 'image',
- model: __webpack_require__(134),
- view: __webpack_require__(42),
+ model: __webpack_require__(137),
+ view: __webpack_require__(44),
isType: function isType(value) {
if (typeof value == 'string') {
return {
@@ -40968,7 +43122,7 @@ module.exports = __webpack_require__(0).Collection.extend(_TypeableCollection2.d
});
/***/ }),
-/* 134 */
+/* 137 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -40976,7 +43130,7 @@ module.exports = __webpack_require__(0).Collection.extend(_TypeableCollection2.d
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-var Asset = __webpack_require__(135);
+var Asset = __webpack_require__(138);
module.exports = Asset.extend({
defaults: _extends({}, Asset.prototype.defaults, {
@@ -40988,7 +43142,7 @@ module.exports = Asset.extend({
});
/***/ }),
-/* 135 */
+/* 138 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -41023,17 +43177,23 @@ module.exports = __webpack_require__(0).Model.extend({
});
/***/ }),
-/* 136 */
+/* 139 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
-var AssetView = __webpack_require__(43);
-var AssetImageView = __webpack_require__(42);
-var FileUploader = __webpack_require__(44);
-module.exports = Backbone.View.extend({
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var AssetView = __webpack_require__(45);
+var AssetImageView = __webpack_require__(44);
+var FileUploader = __webpack_require__(46);
+
+module.exports = _backbone2.default.View.extend({
events: {
submit: 'handleSubmit'
},
@@ -41208,10 +43368,9 @@ module.exports = Backbone.View.extend({
return this;
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
-/* 137 */
+/* 140 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -41241,12 +43400,12 @@ var _underscore = __webpack_require__(1);
module.exports = function () {
var em = void 0;
var c = {},
- defaults = __webpack_require__(138),
- CssRule = __webpack_require__(45),
- CssRules = __webpack_require__(139),
- CssRulesView = __webpack_require__(140);
+ defaults = __webpack_require__(141),
+ CssRule = __webpack_require__(47),
+ CssRules = __webpack_require__(142),
+ CssRulesView = __webpack_require__(143);
var Selectors = __webpack_require__(11);
- var Selector = __webpack_require__(7);
+ var Selector = __webpack_require__(8);
var rules, rulesView;
@@ -41635,7 +43794,7 @@ module.exports = function () {
};
/***/ }),
-/* 138 */
+/* 141 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -41653,16 +43812,21 @@ module.exports = {
};
/***/ }),
-/* 139 */
+/* 142 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var Backbone = __webpack_require__(0);
-var CssRule = __webpack_require__(45);
+var _backbone = __webpack_require__(0);
-module.exports = Backbone.Collection.extend({
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var CssRule = __webpack_require__(47);
+
+module.exports = _backbone2.default.Collection.extend({
initialize: function initialize(models, opt) {
// Inject editor
if (opt && opt.em) this.editor = opt.em;
@@ -41688,27 +43852,33 @@ module.exports = Backbone.Collection.extend({
models = this.editor.get('Parser').parseCss(models);
}
opt.em = this.editor;
- return Backbone.Collection.prototype.add.apply(this, [models, opt]);
+ return _backbone2.default.Collection.prototype.add.apply(this, [models, opt]);
}
});
/***/ }),
-/* 140 */
+/* 143 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone) {
-var CssRuleView = __webpack_require__(47);
-var CssGroupRuleView = __webpack_require__(141);
-var $ = Backbone.$;
+
+var _backbone = __webpack_require__(0);
+
+var _backbone2 = _interopRequireDefault(_backbone);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var CssRuleView = __webpack_require__(49);
+var CssGroupRuleView = __webpack_require__(144);
+var $ = _backbone2.default.$;
// % is not a valid character for classes
var getBlockId = function getBlockId(pfx, widthMedia) {
return '' + pfx + (widthMedia ? '-' + widthMedia.replace('%', 'pc') : '');
};
-module.exports = __webpack_require__(0).View.extend({
+module.exports = _backbone2.default.View.extend({
initialize: function initialize(o) {
var config = o.config || {};
this.atRules = {};
@@ -41836,16 +44006,15 @@ module.exports = __webpack_require__(0).View.extend({
return this;
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
-/* 141 */
+/* 144 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-module.exports = __webpack_require__(47).extend({
+module.exports = __webpack_require__(49).extend({
_createElement: function _createElement(tagName) {
return document.createTextNode('');
},
@@ -41859,7 +44028,7 @@ module.exports = __webpack_require__(47).extend({
});
/***/ }),
-/* 142 */
+/* 145 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -41867,8 +44036,8 @@ module.exports = __webpack_require__(47).extend({
var _underscore = __webpack_require__(1);
-var defaultOpts = __webpack_require__(143);
-var TraitsView = __webpack_require__(144);
+var defaultOpts = __webpack_require__(146);
+var TraitsView = __webpack_require__(147);
module.exports = function () {
var c = {};
@@ -41958,7 +44127,7 @@ module.exports = function () {
};
/***/ }),
-/* 143 */
+/* 146 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -41987,18 +44156,18 @@ module.exports = {
};
/***/ }),
-/* 144 */
+/* 147 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var DomainViews = __webpack_require__(48);
-var TraitView = __webpack_require__(8);
-var TraitSelectView = __webpack_require__(145);
-var TraitCheckboxView = __webpack_require__(146);
-var TraitNumberView = __webpack_require__(147);
-var TraitColorView = __webpack_require__(148);
+var DomainViews = __webpack_require__(50);
+var TraitView = __webpack_require__(9);
+var TraitSelectView = __webpack_require__(148);
+var TraitCheckboxView = __webpack_require__(149);
+var TraitNumberView = __webpack_require__(150);
+var TraitColorView = __webpack_require__(151);
module.exports = DomainViews.extend({
itemView: TraitView,
@@ -42020,7 +44189,7 @@ module.exports = DomainViews.extend({
this.pfx = config.stylePrefix || '';
this.ppfx = config.pStylePrefix || '';
this.className = this.pfx + 'traits';
- var toListen = 'component:selected component:update:traits';
+ var toListen = 'component:selected';
this.listenTo(this.em, toListen, this.updatedCollection);
this.updatedCollection();
},
@@ -42043,14 +44212,14 @@ module.exports = DomainViews.extend({
});
/***/ }),
-/* 145 */
+/* 148 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-/* WEBPACK VAR INJECTION */(function(Backbone, _) {
+/* WEBPACK VAR INJECTION */(function(_) {
-var TraitView = __webpack_require__(8);
-var $ = Backbone.$;
+var TraitView = __webpack_require__(9);
+var $ = __webpack_require__(0).$;
module.exports = TraitView.extend({
initialize: function initialize(o) {
@@ -42109,16 +44278,16 @@ module.exports = TraitView.extend({
return this.$input.get(0);
}
});
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0), __webpack_require__(1)))
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
/***/ }),
-/* 146 */
+/* 149 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var TraitView = __webpack_require__(8);
+var TraitView = __webpack_require__(9);
module.exports = TraitView.extend({
initialize: function initialize(o) {
@@ -42167,13 +44336,13 @@ module.exports = TraitView.extend({
});
/***/ }),
-/* 147 */
+/* 150 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var TraitView = __webpack_require__(8);
+var TraitView = __webpack_require__(9);
var InputNumber = __webpack_require__(18);
module.exports = TraitView.extend({
@@ -42222,14 +44391,14 @@ module.exports = TraitView.extend({
});
/***/ }),
-/* 148 */
+/* 151 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var TraitView = __webpack_require__(8);
-var InputColor = __webpack_require__(38);
+var TraitView = __webpack_require__(9);
+var InputColor = __webpack_require__(40);
module.exports = TraitView.extend({
/**
@@ -42239,19 +44408,20 @@ module.exports = TraitView.extend({
*/
getInputEl: function getInputEl() {
if (!this.$input) {
+ var model = this.model;
var value = this.getModelValue();
var inputColor = new InputColor({
+ model: model,
target: this.config.em,
contClass: this.ppfx + 'field-color',
- model: this.model,
ppfx: this.ppfx
});
- this.input = inputColor.render();
- this.$input = this.input.colorEl;
- value = value || '';
- this.model.set('value', value).trigger('change:value');
- this.input.setValue(value);
+ var input = inputColor.render();
+ this.$input = input.colorEl;
+ input.setValue(value, { fromTarget: 1 });
+ this.input = input;
}
+
return this.$input.get(0);
},
@@ -42269,114 +44439,120 @@ module.exports = TraitView.extend({
});
/***/ }),
-/* 149 */
+/* 152 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; /**
+ *
+ * * [getWrapper](#getwrapper)
+ * * [getComponents](#getcomponents)
+ * * [addComponent](#addcomponent)
+ * * [clear](#clear)
+ * * [load](#load)
+ * * [store](#store)
+ * * [render](#render)
+ *
+ * With this module is possible to manage components inside the canvas.
+ * Before using methods you should get first the module from the editor instance, in this way:
+ *
+ * ```js
+ * var domComponents = editor.DomComponents;
+ * ```
+ *
+ * @module DomComponents
+ * @param {Object} config Configurations
+ * @param {string|Array