From 4f293f22a63b52fc34217a481028fc2dbb9eaa90 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 11 Mar 2016 12:38:40 -0800 Subject: [PATCH] [Tree] Add Zepto dependency ...to support implementation of a jQuery-less tree. --- LICENSES.md | 38 +++++++++++++++++++++++++++++ bower.json | 3 ++- main.js | 3 ++- platform/commonUI/general/bundle.js | 10 ++++++++ test-main.js | 3 ++- 5 files changed, 54 insertions(+), 3 deletions(-) diff --git a/LICENSES.md b/LICENSES.md index 6e270d3937..e7ab92507b 100644 --- a/LICENSES.md +++ b/LICENSES.md @@ -476,6 +476,44 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI --- +### Zepto + +#### Info + +* Link: http://zeptojs.com/ + +* Version: 1.1.6 + +* Authors: Thomas Fuchs + +* Description: DOM manipulation + +#### License + +Copyright (c) 2010-2016 Thomas Fuchs +http://zeptojs.com/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +--- + ### Json.NET #### Info diff --git a/bower.json b/bower.json index b4bf273af2..7285aad9e2 100644 --- a/bower.json +++ b/bower.json @@ -17,6 +17,7 @@ "screenfull": "^3.0.0", "node-uuid": "^1.4.7", "comma-separated-values": "^3.6.4", - "FileSaver.js": "^0.0.2" + "FileSaver.js": "^0.0.2", + "zepto": "^1.1.6" } } diff --git a/main.js b/main.js index 452fe3e823..ec8a2dcb80 100644 --- a/main.js +++ b/main.js @@ -33,7 +33,8 @@ requirejs.config({ "saveAs": "bower_components/FileSaver.js/FileSaver.min", "screenfull": "bower_components/screenfull/dist/screenfull.min", "text": "bower_components/text/text", - "uuid": "bower_components/node-uuid/uuid" + "uuid": "bower_components/node-uuid/uuid", + "zepto": "bower_components/zepto/zepto.min" }, "shim": { "angular": { diff --git a/platform/commonUI/general/bundle.js b/platform/commonUI/general/bundle.js index f3d6d98f61..ecc9f9f8a1 100644 --- a/platform/commonUI/general/bundle.js +++ b/platform/commonUI/general/bundle.js @@ -535,6 +535,16 @@ define([ "copyright": "Copyright (c) Nicolas Gallagher and Jonathan Neal", "license": "license-mit", "link": "https://github.com/necolas/normalize.css/blob/v1.1.2/LICENSE.md" + }, + { + "name": "Zepto", + "version": "1.1.6", + "description": "DOM manipulation", + "author": "Thomas Fuchs", + "website": "http://zeptojs.com/", + "copyright": "Copyright (c) 2010-2016 Thomas Fuchs", + "license": "license-mit", + "link": "https://github.com/madrobby/zepto/blob/master/MIT-LICENSE" } ] } diff --git a/test-main.js b/test-main.js index 13f1bf367d..a12970dd58 100644 --- a/test-main.js +++ b/test-main.js @@ -53,7 +53,8 @@ requirejs.config({ "saveAs": "bower_components/FileSaver.js/FileSaver.min", "screenfull": "bower_components/screenfull/dist/screenfull.min", "text": "bower_components/text/text", - "uuid": "bower_components/node-uuid/uuid" + "uuid": "bower_components/node-uuid/uuid", + "zepto": "bower_components/zepto/zepto.min" }, "shim": {