[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16338] update jqTree from upstream
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16338] update jqTree from upstream |
|
Date: |
Sat, 18 Feb 2017 12:08:37 -0500 (EST) |
Revision: 16338
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16338
Author: sigurdne
Date: 2017-02-18 12:08:37 -0500 (Sat, 18 Feb 2017)
Log Message:
-----------
update jqTree from upstream
Modified Paths:
--------------
trunk/phpgwapi/js/jquery/jqTree/_config.yml
trunk/phpgwapi/js/jquery/jqTree/bower.json
trunk/phpgwapi/js/jquery/jqTree/gulpfile.coffee
trunk/phpgwapi/js/jquery/jqTree/jqtree.jquery.json
trunk/phpgwapi/js/jquery/jqTree/karma.conf.js
trunk/phpgwapi/js/jquery/jqTree/lib/node_element.js
trunk/phpgwapi/js/jquery/jqTree/lib/scroll_handler.js
trunk/phpgwapi/js/jquery/jqTree/lib/tree.jquery.js
trunk/phpgwapi/js/jquery/jqTree/lib/util.js
trunk/phpgwapi/js/jquery/jqTree/lib/version.js
trunk/phpgwapi/js/jquery/jqTree/package.json
trunk/phpgwapi/js/jquery/jqTree/tree.jquery.js
Modified: trunk/phpgwapi/js/jquery/jqTree/_config.yml
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/_config.yml 2017-02-18 16:50:23 UTC (rev
16337)
+++ trunk/phpgwapi/js/jquery/jqTree/_config.yml 2017-02-18 17:08:37 UTC (rev
16338)
@@ -11,7 +11,7 @@
examples:
output: true
-jqtree_version: 1.3.3
+jqtree_version: 1.3.7
# Build settings
markdown: kramdown
Modified: trunk/phpgwapi/js/jquery/jqTree/bower.json
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/bower.json 2017-02-18 16:50:23 UTC (rev
16337)
+++ trunk/phpgwapi/js/jquery/jqTree/bower.json 2017-02-18 17:08:37 UTC (rev
16338)
@@ -1,6 +1,6 @@
{
"name": "jqTree",
- "version": "1.3.3",
+ "version": "1.3.7",
"main": [
"jqtree.css",
"jqtree-circle.png",
Modified: trunk/phpgwapi/js/jquery/jqTree/gulpfile.coffee
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/gulpfile.coffee 2017-02-18 16:50:23 UTC
(rev 16337)
+++ trunk/phpgwapi/js/jquery/jqTree/gulpfile.coffee 2017-02-18 17:08:37 UTC
(rev 16338)
@@ -5,6 +5,7 @@
exec = require('child_process').exec
fs = require 'fs'
header = require 'gulp-header'
+rename = require 'gulp-rename'
sass = require 'gulp-sass'
pkg = require './package.json'
@@ -24,8 +25,9 @@
.pipe gulp.dest('./lib')
gulp.task 'build_test', ->
- gulp.src './src/test.js'
+ gulp.src './src_test/test.js'
.pipe coffeeify()
+ .pipe rename('test_build.js')
.pipe gulp.dest('./test')
gulp.task 'jekyll', (cb) ->
Modified: trunk/phpgwapi/js/jquery/jqTree/jqtree.jquery.json
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/jqtree.jquery.json 2017-02-18 16:50:23 UTC
(rev 16337)
+++ trunk/phpgwapi/js/jquery/jqTree/jqtree.jquery.json 2017-02-18 17:08:37 UTC
(rev 16338)
@@ -1,6 +1,6 @@
{
"name": "jqtree",
- "version": "1.3.3",
+ "version": "1.3.7",
"title": "jqTree",
"description": "JqTree is a jQuery widget for displaying a tree structure
in html. It supports json data, loading via ajax and drag-and-drop",
"keywords": [
Modified: trunk/phpgwapi/js/jquery/jqTree/karma.conf.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/karma.conf.js 2017-02-18 16:50:23 UTC
(rev 16337)
+++ trunk/phpgwapi/js/jquery/jqTree/karma.conf.js 2017-02-18 17:08:37 UTC
(rev 16338)
@@ -13,7 +13,7 @@
// list of files / patterns to load in the browser
files: [
- 'src/karma-test.js',
+ 'src_test/karma-test.js',
'static/bower_components/json3/lib/json3.js'
],
@@ -22,7 +22,7 @@
],
preprocessors: {
- 'src/karma-test.js': ['browserify']
+ 'src_test/karma-test.js': ['browserify']
},
browserify: {
Modified: trunk/phpgwapi/js/jquery/jqTree/lib/node_element.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/lib/node_element.js 2017-02-18 16:50:23 UTC
(rev 16337)
+++ trunk/phpgwapi/js/jquery/jqTree/lib/node_element.js 2017-02-18 17:08:37 UTC
(rev 16338)
@@ -90,7 +90,7 @@
$span = _this.getSpan();
$span.attr('aria-expanded', 'true');
if (on_finished) {
- on_finished();
+ on_finished(_this.node);
}
return _this.tree_widget._triggerEvent('tree.open', {
node: _this.node
Modified: trunk/phpgwapi/js/jquery/jqTree/lib/scroll_handler.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/lib/scroll_handler.js 2017-02-18
16:50:23 UTC (rev 16337)
+++ trunk/phpgwapi/js/jquery/jqTree/lib/scroll_handler.js 2017-02-18
17:08:37 UTC (rev 16338)
@@ -7,7 +7,6 @@
this.tree_widget = tree_widget;
this.previous_top = -1;
this.is_initialized = false;
- this._initScrollParent();
}
ScrollHandler.prototype._initScrollParent = function() {
Modified: trunk/phpgwapi/js/jquery/jqTree/lib/tree.jquery.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/lib/tree.jquery.js 2017-02-18 16:50:23 UTC
(rev 16337)
+++ trunk/phpgwapi/js/jquery/jqTree/lib/tree.jquery.js 2017-02-18 17:08:37 UTC
(rev 16338)
@@ -1,4 +1,4 @@
-var $, BorderDropHint, DragAndDropHandler, DragElement, ElementsRenderer,
FolderElement, GhostDropHint, HitAreasGenerator, JqTreeWidget, KeyHandler,
MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler,
SelectNodeHandler, SimpleWidget, __version__, drag_and_drop_handler,
node_module, ref, util_module,
+var $, BorderDropHint, DragAndDropHandler, DragElement, ElementsRenderer,
FolderElement, GhostDropHint, HitAreasGenerator, JqTreeWidget, KeyHandler,
MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler,
SelectNodeHandler, SimpleWidget, __version__, drag_and_drop_handler,
isFunction, node_module, ref, util_module,
extend = function(child, parent) { for (var key in parent) { if
(hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() {
this.constructor = child; } ctor.prototype = parent.prototype; child.prototype
= new ctor(); child.__super__ = parent.prototype; return child; },
hasProp = {}.hasOwnProperty;
@@ -28,6 +28,8 @@
util_module = require('./util');
+isFunction = util_module.isFunction;
+
ref = require('./node_element'), BorderDropHint = ref.BorderDropHint,
FolderElement = ref.FolderElement, GhostDropHint = ref.GhostDropHint,
NodeElement = ref.NodeElement;
DragAndDropHandler = drag_and_drop_handler.DragAndDropHandler, DragElement =
drag_and_drop_handler.DragElement, HitAreasGenerator =
drag_and_drop_handler.HitAreasGenerator;
@@ -376,15 +378,33 @@
return this.tree.getNodeByCallback(callback);
};
- JqTreeWidget.prototype.openNode = function(node, slide) {
- if (slide == null) {
- slide = null;
+ JqTreeWidget.prototype.openNode = function(node, slide_param,
on_finished_param) {
+ var on_finished, parseParams, ref1, slide;
+ if (slide_param == null) {
+ slide_param = null;
}
+ if (on_finished_param == null) {
+ on_finished_param = null;
+ }
+ parseParams = (function(_this) {
+ return function() {
+ var on_finished, slide;
+ if (isFunction(slide_param)) {
+ on_finished = slide_param;
+ slide = null;
+ } else {
+ slide = slide_param;
+ on_finished = on_finished_param;
+ }
+ if (slide === null) {
+ slide = _this.options.slide;
+ }
+ return [slide, on_finished];
+ };
+ })(this);
+ ref1 = parseParams(), slide = ref1[0], on_finished = ref1[1];
if (node) {
- if (slide === null) {
- slide = this.options.slide;
- }
- this._openNode(node, slide);
+ this._openNode(node, slide, on_finished);
}
return this.element;
};
Modified: trunk/phpgwapi/js/jquery/jqTree/lib/util.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/lib/util.js 2017-02-18 16:50:23 UTC (rev
16337)
+++ trunk/phpgwapi/js/jquery/jqTree/lib/util.js 2017-02-18 17:08:37 UTC (rev
16338)
@@ -1,4 +1,4 @@
-var _indexOf, getBoolString, html_escape, indexOf, isInt;
+var _indexOf, getBoolString, html_escape, indexOf, isFunction, isInt;
_indexOf = function(array, item) {
var i, j, len, value;
@@ -23,6 +23,10 @@
return typeof n === 'number' && n % 1 === 0;
};
+isFunction = function(v) {
+ return typeof v === 'function';
+};
+
html_escape = function(string) {
return ('' + string).replace(/&/g, '&').replace(/</g,
'<').replace(/>/g, '>').replace(/"/g, '"').replace(/'/g,
''').replace(/\//g, '/');
};
@@ -40,5 +44,6 @@
getBoolString: getBoolString,
html_escape: html_escape,
indexOf: indexOf,
- isInt: isInt
+ isInt: isInt,
+ isFunction: isFunction
};
Modified: trunk/phpgwapi/js/jquery/jqTree/lib/version.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/lib/version.js 2017-02-18 16:50:23 UTC
(rev 16337)
+++ trunk/phpgwapi/js/jquery/jqTree/lib/version.js 2017-02-18 17:08:37 UTC
(rev 16338)
@@ -1 +1 @@
-module.exports = '1.3.6';
+module.exports = '1.3.7';
Modified: trunk/phpgwapi/js/jquery/jqTree/package.json
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/package.json 2017-02-18 16:50:23 UTC
(rev 16337)
+++ trunk/phpgwapi/js/jquery/jqTree/package.json 2017-02-18 17:08:37 UTC
(rev 16338)
@@ -1,6 +1,6 @@
{
"name": "jqtree",
- "version": "1.3.3",
+ "version": "1.3.7",
"description": "Tree widget for jQuery",
"keywords": [
"jquery-plugin",
@@ -13,35 +13,39 @@
"url": "https://github.com/mbraak/jqtree";
},
"scripts": {
- "test": "karma start --browsers Chrome --single-run && coffeelint src"
+ "test": "karma start --browsers Chrome --single-run && coffeelint src",
+ "build": "gulp",
+ "watch": "gulp watch",
+ "karma": "karma start --browsers Chrome"
},
"dependencies": {
"jquery": ">=1.9"
},
"devDependencies": {
- "browserify": "^13.0.1",
- "coffee-script": "1.10.0",
- "coffeeify": "^2.0.1",
- "connect": "^3.4.1",
- "coveralls": "^2.11.9",
+ "browserify": "^13.3.0",
+ "coffee-script": "^1.12.2",
+ "coffeeify": "^2.1.0",
+ "connect": "^3.5.0",
+ "coveralls": "^2.11.15",
"gulp": "^3.9.1",
- "gulp-coffee": "2.3.2",
+ "gulp-coffee": "^2.3.3",
"gulp-coffeeify": "0.1.8",
"gulp-coffeelint": "^0.6.0",
- "gulp-header": "^1.8.2",
- "gulp-sass": "^2.3.1",
+ "gulp-header": "^1.8.8",
+ "gulp-rename": "^1.2.2",
+ "gulp-sass": "^3.1.0",
"ie-version": "^0.1.0",
- "jquery-mockjax": "^2.1.1",
- "karma": "^0.13.22",
- "karma-browserify": "^5.0.5",
- "karma-chrome-launcher": "^1.0.1",
- "karma-cli": "^1.0.0",
+ "jquery-mockjax": "^2.2.1",
+ "karma": "^1.3.0",
+ "karma-browserify": "^5.1.0",
+ "karma-chrome-launcher": "^2.0.0",
+ "karma-cli": "^1.0.1",
"karma-firefox-launcher": "^1.0.0",
- "karma-phantomjs-launcher": "^1.0.0",
- "karma-qunit": "^1.0.0",
- "phantomjs-prebuilt": "^2.1.7",
- "qunitjs": "^1.23.0",
- "serve-static": "^1.10.2",
- "watchify": "^3.7.0"
+ "karma-phantomjs-launcher": "^1.0.2",
+ "karma-qunit": "^1.2.1",
+ "phantomjs-prebuilt": "^2.1.14",
+ "qunitjs": "^2.1.1",
+ "serve-static": "^1.11.1",
+ "watchify": "^3.8.0"
}
}
Modified: trunk/phpgwapi/js/jquery/jqTree/tree.jquery.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/tree.jquery.js 2017-02-18 16:50:23 UTC
(rev 16337)
+++ trunk/phpgwapi/js/jquery/jqTree/tree.jquery.js 2017-02-18 17:08:37 UTC
(rev 16338)
@@ -1,5 +1,5 @@
/*
-JqTree 1.3.6
+JqTree 1.3.7
Copyright 2015 Marco Braak
@@ -1726,7 +1726,7 @@
$span = _this.getSpan();
$span.attr('aria-expanded', 'true');
if (on_finished) {
- on_finished();
+ on_finished(_this.node);
}
return _this.tree_widget._triggerEvent('tree.open', {
node: _this.node
@@ -2111,7 +2111,6 @@
this.tree_widget = tree_widget;
this.previous_top = -1;
this.is_initialized = false;
- this._initScrollParent();
}
ScrollHandler.prototype._initScrollParent = function() {
@@ -2482,7 +2481,7 @@
module.exports = SimpleWidget;
},{}],11:[function(require,module,exports){
-var $, BorderDropHint, DragAndDropHandler, DragElement, ElementsRenderer,
FolderElement, GhostDropHint, HitAreasGenerator, JqTreeWidget, KeyHandler,
MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler,
SelectNodeHandler, SimpleWidget, __version__, drag_and_drop_handler,
node_module, ref, util_module,
+var $, BorderDropHint, DragAndDropHandler, DragElement, ElementsRenderer,
FolderElement, GhostDropHint, HitAreasGenerator, JqTreeWidget, KeyHandler,
MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler,
SelectNodeHandler, SimpleWidget, __version__, drag_and_drop_handler,
isFunction, node_module, ref, util_module,
extend = function(child, parent) { for (var key in parent) { if
(hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() {
this.constructor = child; } ctor.prototype = parent.prototype; child.prototype
= new ctor(); child.__super__ = parent.prototype; return child; },
hasProp = {}.hasOwnProperty;
@@ -2512,6 +2511,8 @@
util_module = require('./util');
+isFunction = util_module.isFunction;
+
ref = require('./node_element'), BorderDropHint = ref.BorderDropHint,
FolderElement = ref.FolderElement, GhostDropHint = ref.GhostDropHint,
NodeElement = ref.NodeElement;
DragAndDropHandler = drag_and_drop_handler.DragAndDropHandler, DragElement =
drag_and_drop_handler.DragElement, HitAreasGenerator =
drag_and_drop_handler.HitAreasGenerator;
@@ -2860,15 +2861,33 @@
return this.tree.getNodeByCallback(callback);
};
- JqTreeWidget.prototype.openNode = function(node, slide) {
- if (slide == null) {
- slide = null;
+ JqTreeWidget.prototype.openNode = function(node, slide_param,
on_finished_param) {
+ var on_finished, parseParams, ref1, slide;
+ if (slide_param == null) {
+ slide_param = null;
}
+ if (on_finished_param == null) {
+ on_finished_param = null;
+ }
+ parseParams = (function(_this) {
+ return function() {
+ var on_finished, slide;
+ if (isFunction(slide_param)) {
+ on_finished = slide_param;
+ slide = null;
+ } else {
+ slide = slide_param;
+ on_finished = on_finished_param;
+ }
+ if (slide === null) {
+ slide = _this.options.slide;
+ }
+ return [slide, on_finished];
+ };
+ })(this);
+ ref1 = parseParams(), slide = ref1[0], on_finished = ref1[1];
if (node) {
- if (slide === null) {
- slide = this.options.slide;
- }
- this._openNode(node, slide);
+ this._openNode(node, slide, on_finished);
}
return this.element;
};
@@ -3565,7 +3584,7 @@
SimpleWidget.register(JqTreeWidget, 'tree');
},{"./drag_and_drop_handler":1,"./elements_renderer":2,"./key_handler":3,"./mouse.widget":4,"./node":5,"./node_element":6,"./save_state_handler":7,"./scroll_handler":8,"./select_node_handler":9,"./simple.widget":10,"./util":12,"./version":13}],12:[function(require,module,exports){
-var _indexOf, getBoolString, html_escape, indexOf, isInt;
+var _indexOf, getBoolString, html_escape, indexOf, isFunction, isInt;
_indexOf = function(array, item) {
var i, j, len, value;
@@ -3590,6 +3609,10 @@
return typeof n === 'number' && n % 1 === 0;
};
+isFunction = function(v) {
+ return typeof v === 'function';
+};
+
html_escape = function(string) {
return ('' + string).replace(/&/g, '&').replace(/</g,
'<').replace(/>/g, '>').replace(/"/g, '"').replace(/'/g,
''').replace(/\//g, '/');
};
@@ -3607,10 +3630,11 @@
getBoolString: getBoolString,
html_escape: html_escape,
indexOf: indexOf,
- isInt: isInt
+ isInt: isInt,
+ isFunction: isFunction
};
},{}],13:[function(require,module,exports){
-module.exports = '1.3.6';
+module.exports = '1.3.7';
},{}]},{},[11]);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16338] update jqTree from upstream,
sigurdne <=