Skip to content

Commit 58aa9b2

Browse files
committed
Tagging the 2.0.0-12 release.
1 parent f9192bb commit 58aa9b2

18 files changed

+162
-360
lines changed

dist/jquery.fancytree-all.js

Lines changed: 71 additions & 170 deletions
Large diffs are not rendered by default.

dist/jquery.fancytree-custom.min.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.fancytree.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* Released under the MIT license
88
* https://github.com/mar10/fancytree/wiki/LicenseInfo
99
*
10-
* @version 2.0.0-11
11-
* @date 2014-04-27T22:28
10+
* @version 2.0.0-12
11+
* @date 2014-04-29T19:55
1212
*/
1313

1414
/** Core Fancytree module.
@@ -3772,7 +3772,7 @@ $.extend($.ui.fancytree,
37723772
/** @lends Fancytree_Static# */
37733773
{
37743774
/** @type {string} */
3775-
version: "2.0.0-11", // Set to semver by 'grunt release'
3775+
version: "2.0.0-12", // Set to semver by 'grunt release'
37763776
/** @type {string} */
37773777
buildType: "production", // Set to 'production' by 'grunt build'
37783778
/** @type {int} */

dist/jquery.fancytree.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/src/jquery.fancytree.childcounter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
* Released under the MIT license
2020
* https://github.com/mar10/fancytree/wiki/LicenseInfo
2121
*
22-
* @version 2.0.0-11
23-
* @date 2014-04-27T22:28
22+
* @version 2.0.0-12
23+
* @date 2014-04-29T19:55
2424
*/
2525

2626
// To keep the global namespace clean, we wrap everything in a closure

dist/src/jquery.fancytree.clones.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* Released under the MIT license
1010
* https://github.com/mar10/fancytree/wiki/LicenseInfo
1111
*
12-
* @version 2.0.0-11
13-
* @date 2014-04-27T22:28
12+
* @version 2.0.0-12
13+
* @date 2014-04-29T19:55
1414
*/
1515

1616
;(function($, window, document, undefined) {

dist/src/jquery.fancytree.columnview.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* Released under the MIT license
1010
* https://github.com/mar10/fancytree/wiki/LicenseInfo
1111
*
12-
* @version 2.0.0-11
13-
* @date 2014-04-27T22:28
12+
* @version 2.0.0-12
13+
* @date 2014-04-29T19:55
1414
*/
1515

1616
;(function($, window, document, undefined) {

dist/src/jquery.fancytree.debug.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* Released under the MIT license
1010
* https://github.com/mar10/fancytree/wiki/LicenseInfo
1111
*
12-
* @version 2.0.0-11
13-
* @date 2014-04-27T22:28
12+
* @version 2.0.0-12
13+
* @date 2014-04-29T19:55
1414
*/
1515

1616
;(function($, window, document, undefined) {

dist/src/jquery.fancytree.dnd.js

Lines changed: 17 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* Released under the MIT license
1010
* https://github.com/mar10/fancytree/wiki/LicenseInfo
1111
*
12-
* @version 2.0.0-11
13-
* @date 2014-04-27T22:28
12+
* @version 2.0.0-12
13+
* @date 2014-04-29T19:55
1414
*/
1515

1616
;(function($, window, document, undefined) {
@@ -73,8 +73,7 @@ function _initDragAndDrop(tree) {
7373
addClasses: false,
7474
tolerance: "intersect",
7575
greedy: false
76-
/*
77-
,
76+
/*
7877
activate: function(event, ui) {
7978
logMsg("droppable - activate", event, ui, this);
8079
},
@@ -112,18 +111,11 @@ function _registerDnd() {
112111
// 'draggable' was renamed to 'ui-draggable' since jQueryUI 1.10
113112
var draggable = $(this).data("ui-draggable") || $(this).data("draggable"),
114113
sourceNode = ui.helper.data("ftSourceNode") || null;
115-
// logMsg("draggable-connectToFancytree.start, %s", sourceNode);
116-
// logMsg(" this: %o", this);
117-
// logMsg(" event: %o", event);
118-
// logMsg(" draggable: %o", draggable);
119-
// logMsg(" ui: %o", ui);
120114

121115
if(sourceNode) {
122116
// Adjust helper offset, so cursor is slightly outside top/left corner
123117
draggable.offset.click.top = -2;
124118
draggable.offset.click.left = + 16;
125-
// logMsg(" draggable2: %o", draggable);
126-
// logMsg(" draggable.offset.click FIXED: %s/%s", draggable.offset.click.left, draggable.offset.click.top);
127119
// Trigger dragStart event
128120
// TODO: when called as connectTo..., the return value is ignored(?)
129121
return sourceNode.tree.ext.dnd._onDragEvent("start", sourceNode, null, event, ui, draggable);
@@ -136,8 +128,7 @@ function _registerDnd() {
136128
sourceNode = ui.helper.data("ftSourceNode") || null,
137129
prevTargetNode = ui.helper.data("ftTargetNode") || null,
138130
targetNode = $.ui.fancytree.getNode(event.target);
139-
// logMsg("$.ui.fancytree.getNode(%o): %s", event.target, targetNode);
140-
// logMsg("connectToFancytree.drag: helper: %o", ui.helper[0]);
131+
141132
if(event.target && !targetNode){
142133
// We got a drag event, but the targetNode could not be found
143134
// at the event location. This may happen,
@@ -150,7 +141,6 @@ function _registerDnd() {
150141
return;
151142
}
152143
}
153-
// logMsg("draggable-connectToFancytree.drag: targetNode(from event): %s, ftTargetNode: %s", targetNode, ui.helper.data("ftTargetNode"));
154144
ui.helper.data("ftTargetNode", targetNode);
155145
// Leaving a tree node
156146
if(prevTargetNode && prevTargetNode !== targetNode ) {
@@ -177,10 +167,7 @@ function _registerDnd() {
177167
// mouseDownEvent = draggable._mouseDownEvent,
178168
eventType = event.type,
179169
dropped = (eventType === "mouseup" && event.which === 1);
180-
// logMsg("draggable-connectToFancytree.stop: targetNode(from event): %s, ftTargetNode: %s", targetNode, ui.helper.data("ftTargetNode"));
181-
// logMsg("draggable-connectToFancytree.stop, %s", sourceNode);
182-
// logMsg(" type: %o, downEvent: %o, upEvent: %o", eventType, mouseDownEvent, event);
183-
// logMsg(" targetNode: %o", targetNode);
170+
184171
if(!dropped){
185172
logMsg("Drag was cancelled");
186173
}
@@ -204,8 +191,7 @@ function _registerDnd() {
204191
*
205192
*/
206193

207-
$.ui.fancytree.registerExtension(
208-
{
194+
$.ui.fancytree.registerExtension({
209195
name: "dnd",
210196
version: "0.1.0",
211197
// Default options for this extension.
@@ -226,9 +212,7 @@ $.ui.fancytree.registerExtension(
226212
draggable: null, // Additional options passed to jQuery draggable
227213
droppable: null // Additional options passed to jQuery droppable
228214
},
229-
// Override virtual methods for this extension.
230-
// `this` : Fancytree instance
231-
// `this._super`: the virtual function that was overriden (member of prev. extension or Fancytree)
215+
232216
treeInit: function(ctx){
233217
var tree = ctx.tree;
234218
this._super(ctx);
@@ -257,15 +241,7 @@ $.ui.fancytree.registerExtension(
257241
.css({"z-index": 1000})
258242
.prependTo($(this.$div).parent());
259243
// .prependTo("body");
260-
// logMsg("Creating marker: %o", this.$dropMarker);
261244
}
262-
/*
263-
if(hitMode === "start"){
264-
}
265-
if(hitMode === "stop"){
266-
// sourceNode.removeClass("fancytree-drop-target");
267-
}
268-
*/
269245
// this.$dropMarker.attr("class", hitMode);
270246
if(hitMode === "after" || hitMode === "before" || hitMode === "over"){
271247
// $source && $source.addClass("fancytree-drag-source");
@@ -386,16 +362,16 @@ $.ui.fancytree.registerExtension(
386362
case "helper":
387363
// Only event and node argument is available
388364
$helper = $("<div class='fancytree-drag-helper'><span class='fancytree-drag-helper-img' /></div>")
389-
// .append($(event.target).closest("span.fancytree-node").find("span.fancytree-title").clone());
390365
.append(nodeTag.find("span.fancytree-title").clone());
391-
// issue 244: helper should be child of scrollParent
366+
// DT issue 244: helper should be child of scrollParent
392367
$("ul.fancytree-container", node.tree.$div).append($helper);
393368
// Attach node reference to helper object
394369
$helper.data("ftSourceNode", node);
395370
// logMsg("helper=%o", $helper);
396371
// logMsg("helper.sourceNode=%o", $helper.data("ftSourceNode"));
397372
res = $helper;
398373
break;
374+
399375
case "start":
400376
if( node.isStatusNode() ) {
401377
res = false;
@@ -413,6 +389,7 @@ $.ui.fancytree.registerExtension(
413389
nodeTag.addClass("fancytree-drag-source");
414390
}
415391
break;
392+
416393
case "enter":
417394
if(dnd.preventRecursiveMoves && node.isDescendantOf(otherNode)){
418395
r = false;
@@ -439,6 +416,7 @@ $.ui.fancytree.registerExtension(
439416
ui.helper.data("enterResponse", res);
440417
logMsg("helper.enterResponse: %o", res);
441418
break;
419+
442420
case "over":
443421
enterResponse = ui.helper.data("enterResponse");
444422
hitMode = null;
@@ -496,17 +474,19 @@ $.ui.fancytree.registerExtension(
496474
ctx.hitMode = hitMode;
497475
res = dnd.dragOver(node, ctx);
498476
}
499-
// issue 332
477+
// DT issue 332
500478
// this._setDndStatus(otherNode, node, ui.helper, hitMode, res!==false);
501479
this._local._setDndStatus(otherNode, node, ui.helper, hitMode, res!==false && hitMode !== null);
502480
break;
481+
503482
case "drop":
504483
hitMode = ui.helper.data("hitMode");
505484
if(hitMode && dnd.dragDrop){
506485
ctx.hitMode = hitMode;
507486
dnd.dragDrop(node, ctx);
508487
}
509488
break;
489+
510490
case "leave":
511491
// Cancel pending expand request
512492
node.scheduleAction("cancel");
@@ -517,14 +497,16 @@ $.ui.fancytree.registerExtension(
517497
dnd.dragLeave(node, ctx);
518498
}
519499
break;
500+
520501
case "stop":
521502
nodeTag.removeClass("fancytree-drag-source");
522503
if(dnd.dragStop){
523504
dnd.dragStop(node, ctx);
524505
}
525506
break;
507+
526508
default:
527-
throw "Unsupported drag event: " + eventName;
509+
$.error("Unsupported drag event: " + eventName);
528510
}
529511
return res;
530512
},

dist/src/jquery.fancytree.edit.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* Released under the MIT license
1010
* https://github.com/mar10/fancytree/wiki/LicenseInfo
1111
*
12-
* @version 2.0.0-11
13-
* @date 2014-04-27T22:28
12+
* @version 2.0.0-12
13+
* @date 2014-04-29T19:55
1414
*/
1515

1616
;(function($, window, document, undefined) {
@@ -273,10 +273,6 @@ $.ui.fancytree.registerExtension({
273273
// Local attributes
274274
currentNode: null,
275275

276-
// Override virtual methods for this extension.
277-
// `this` : the Fancytree instance
278-
// `this._local`: the namespace that contains extension attributes and private methods (same as this.ext.EXTNAME)
279-
// `this._super`: the virtual function that was overridden (member of previous extension or Fancytree)
280276
treeInit: function(ctx){
281277
this._super(ctx);
282278
this.$container.addClass("fancytree-ext-edit");
@@ -288,7 +284,7 @@ $.ui.fancytree.registerExtension({
288284
return false;
289285
}
290286
}
291-
this._super(ctx);
287+
return this._super(ctx);
292288
},
293289
nodeDblclick: function(ctx) {
294290
if( $.inArray("dblclick", ctx.options.edit.triggerStart) >= 0 ){

0 commit comments

Comments
 (0)