Merge pull request #11982 from owncloud/bower-underscore
bower underscore
This commit is contained in:
commit
afa14d571c
|
@ -13,7 +13,6 @@ filter:
|
||||||
- 'core/js/jquery-tipsy.js'
|
- 'core/js/jquery-tipsy.js'
|
||||||
- 'core/js/jquery-ui-1.10.0.custom.js'
|
- 'core/js/jquery-ui-1.10.0.custom.js'
|
||||||
- 'core/js/placeholders.js'
|
- 'core/js/placeholders.js'
|
||||||
- 'core/js/underscore.js'
|
|
||||||
- 'core/js/jquery.multiselect.js'
|
- 'core/js/jquery.multiselect.js'
|
||||||
- 'core/js/snap.js'
|
- 'core/js/snap.js'
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"handlebars": "1.3.0",
|
"handlebars": "1.3.0",
|
||||||
"jquery": "~1.10.0",
|
"jquery": "~1.10.0",
|
||||||
"moment": "~2.8.3"
|
"moment": "~2.8.3",
|
||||||
|
"underscore": "1.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
"vendor": [
|
"vendor": [
|
||||||
"jquery/jquery.min.js",
|
"jquery/jquery.min.js",
|
||||||
"jquery/jquery-migrate.min.js",
|
"jquery/jquery-migrate.min.js",
|
||||||
|
"underscore/underscore.js",
|
||||||
"moment/min/moment-with-locales.js"
|
"moment/min/moment-with-locales.js"
|
||||||
],
|
],
|
||||||
"libraries": [
|
"libraries": [
|
||||||
"jquery-ui-1.10.0.custom.js",
|
"jquery-ui-1.10.0.custom.js",
|
||||||
"jquery-showpassword.js",
|
"jquery-showpassword.js",
|
||||||
"jquery-tipsy.js",
|
"jquery-tipsy.js"
|
||||||
"underscore.js"
|
|
||||||
],
|
],
|
||||||
"modules": [
|
"modules": [
|
||||||
"compatibility.js",
|
"compatibility.js",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
test/
|
test/
|
||||||
src/
|
src/
|
||||||
|
|
||||||
|
# underscore
|
||||||
|
underscore/**
|
||||||
|
!underscore/underscore.js
|
||||||
|
!underscore/LICENSE
|
||||||
|
|
||||||
# momentjs - ignore all files except the two listed below
|
# momentjs - ignore all files except the two listed below
|
||||||
moment/benchmarks
|
moment/benchmarks
|
||||||
moment/locale
|
moment/locale
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
Copyright (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative
|
||||||
|
Reporters & Editors
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person
|
||||||
|
obtaining a copy of this software and associated documentation
|
||||||
|
files (the "Software"), to deal in the Software without
|
||||||
|
restriction, including without limitation the rights to use,
|
||||||
|
copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the
|
||||||
|
Software is furnished to do so, subject to the following
|
||||||
|
conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be
|
||||||
|
included in all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
|
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
OTHER DEALINGS IN THE SOFTWARE.
|
|
@ -462,11 +462,10 @@
|
||||||
|
|
||||||
// Split an array into two arrays: one whose elements all satisfy the given
|
// Split an array into two arrays: one whose elements all satisfy the given
|
||||||
// predicate, and one whose elements all do not satisfy the predicate.
|
// predicate, and one whose elements all do not satisfy the predicate.
|
||||||
_.partition = function(array, predicate, context) {
|
_.partition = function(array, predicate) {
|
||||||
predicate = lookupIterator(predicate);
|
|
||||||
var pass = [], fail = [];
|
var pass = [], fail = [];
|
||||||
each(array, function(elem) {
|
each(array, function(elem) {
|
||||||
(predicate.call(context, elem) ? pass : fail).push(elem);
|
(predicate(elem) ? pass : fail).push(elem);
|
||||||
});
|
});
|
||||||
return [pass, fail];
|
return [pass, fail];
|
||||||
};
|
};
|
|
@ -334,7 +334,7 @@ class OC {
|
||||||
OC_Util::addScript("placeholders");
|
OC_Util::addScript("placeholders");
|
||||||
OC_Util::addScript("jquery-tipsy");
|
OC_Util::addScript("jquery-tipsy");
|
||||||
OC_Util::addScript("compatibility");
|
OC_Util::addScript("compatibility");
|
||||||
OC_Util::addScript("underscore");
|
OC_Util::addVendorScript("underscore/underscore");
|
||||||
OC_Util::addScript("jquery.ocdialog");
|
OC_Util::addScript("jquery.ocdialog");
|
||||||
OC_Util::addScript("oc-dialogs");
|
OC_Util::addScript("oc-dialogs");
|
||||||
OC_Util::addScript("js");
|
OC_Util::addScript("js");
|
||||||
|
|
Loading…
Reference in New Issue