diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-11-05 22:05:24 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-11-05 23:23:03 +0100 |
| commit | 957dee5af187da7245b10cd8b0fc669efe05cfd6 (patch) | |
| tree | ea3022106fed53e9f58250c20637e29b8c1f8a72 /core | |
| parent | bf0ad7f219aab86b3c583036125cc89d5012abf9 (diff) | |
| download | nextcloud-server-957dee5af187da7245b10cd8b0fc669efe05cfd6.tar.gz nextcloud-server-957dee5af187da7245b10cd8b0fc669efe05cfd6.zip | |
bower underscore
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/core.json | 4 | ||||
| -rw-r--r-- | core/vendor/.gitignore | 5 | ||||
| -rw-r--r-- | core/vendor/underscore/LICENSE | 23 | ||||
| -rw-r--r-- | core/vendor/underscore/underscore.js (renamed from core/js/underscore.js) | 5 |
4 files changed, 32 insertions, 5 deletions
diff --git a/core/js/core.json b/core/js/core.json index 137e0217a6f..ea79724dcc6 100644 --- a/core/js/core.json +++ b/core/js/core.json @@ -2,13 +2,13 @@ "vendor": [ "jquery/jquery.min.js", "jquery/jquery-migrate.min.js", + "underscore/underscore.js", "moment/min/moment-with-locales.js" ], "libraries": [ "jquery-ui-1.10.0.custom.js", "jquery-showpassword.js", - "jquery-tipsy.js", - "underscore.js" + "jquery-tipsy.js" ], "modules": [ "compatibility.js", diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore index ca64a8539ee..0c14c5a59b7 100644 --- a/core/vendor/.gitignore +++ b/core/vendor/.gitignore @@ -1,6 +1,11 @@ test/ src/ +# underscore +underscore/** +!underscore/underscore.js +!underscore/LICENSE + # momentjs - ignore all files except the two listed below moment/benchmarks moment/locale diff --git a/core/vendor/underscore/LICENSE b/core/vendor/underscore/LICENSE new file mode 100644 index 00000000000..0d6b8739d95 --- /dev/null +++ b/core/vendor/underscore/LICENSE @@ -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. diff --git a/core/js/underscore.js b/core/vendor/underscore/underscore.js index ca61fdc3a4b..9a4cabecf7f 100644 --- a/core/js/underscore.js +++ b/core/vendor/underscore/underscore.js @@ -462,11 +462,10 @@ // Split an array into two arrays: one whose elements all satisfy the given // predicate, and one whose elements all do not satisfy the predicate. - _.partition = function(array, predicate, context) { - predicate = lookupIterator(predicate); + _.partition = function(array, predicate) { var pass = [], fail = []; each(array, function(elem) { - (predicate.call(context, elem) ? pass : fail).push(elem); + (predicate(elem) ? pass : fail).push(elem); }); return [pass, fail]; }; |