Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit d1bb73f

Browse files
wouterjwouterj
committed
Fixed CS and added defaults
1 parent b2dfdf9 commit d1bb73f

File tree

1 file changed

+96
-59
lines changed

1 file changed

+96
-59
lines changed

‎Resources/public/js/admin_tree.js‎

Lines changed: 96 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,83 +3,104 @@
33
*/
44
var AdminTree = (function () {
55

6-
var my = {},
7-
generateDialog;
6+
'use strict';
87

9-
generateDialog = function (url, closeCallback) {
10-
var treeDialog = jQuery("<iframe id='tree_dialog'></iframe>");// iframe is needed because the delivered form might need some additional JS
8+
var my = {};
119

12-
jQuery(document.body).append(treeDialog);
10+
var generateDialog = function (url, closeCallback) {
11+
// iframe is needed because the delivered form might need some additional JS
12+
var treeDialog = jQuery("<iframe id='tree_dialog'></iframe>");
1313
treeDialog.attr('src', url);
14+
treeDialog.css('height', '500px');
1415

1516
treeDialog.dialog({
16-
width: 800,
17-
modal: true,
18-
autoOpen: true,
17+
width: 800,
18+
modal: true,
19+
autoOpen: true,
1920
resizable: true,
20-
close: function(event, ui) {
21+
zIndex: 9999,
22+
close: function (e, ui) {
2123
if (closeCallback) {
22-
closeCallback(event, ui);
24+
closeCallback(e, ui);
2325
}
24-
},
25-
zIndex: 9999
26+
}
2627
});
2728

28-
treeDialog.attr('style', 'height: 500px');
29+
jQuery(document.body).append(treeDialog);
2930

3031
return treeDialog;
3132
};
3233

3334
my.generateTreeStateArray = function (path) {
3435

35-
var start, pos, segments, curSegment, curItem;
36-
37-
curSegment = '';
38-
segments = [];
39-
start = 1;
40-
pos = path.indexOf('/', start);
36+
var curItem;
37+
var curSegment = '';
38+
var segments = [];
39+
var start = 1;
40+
var pos = path.indexOf('/', start);
4141

4242
while (pos > 0) {
4343
curItem = path.substr(start, pos - start);
44-
if (curItem !== '') {
44+
if ('' !== curItem) {
4545
curSegment = curSegment + '/' + curItem;
46+
4647
segments.push(curSegment);
4748
}
49+
4850
start = pos + 1;
4951
pos = path.indexOf('/', start);
5052
}
5153

5254
curItem = path.substr(start);
5355

54-
if (curItem !== '') {
56+
if ('' !== curItem) {
5557
curSegment = curSegment + '/' + curItem;
58+
5659
segments.push(curSegment);
5760
}
5861

5962
return segments;
6063
};
6164

6265
my.initTree = function (config) {
63-
if (! 'rootNode' in config) {
64-
config.rootNode = "/";
65-
}
66-
if (! 'selected' in config) {
66+
jQuery.extend(true, {
67+
rootNode: '/',
68+
selected: null, // will be set to the rootNode by default
69+
routing_defaults: {},
70+
selector: null,
71+
path: {
72+
expanded: null,
73+
preloaded: null
74+
},
75+
ajax: {
76+
children_url: null,
77+
move_url: null,
78+
reorder_url: null
79+
},
80+
types: {},
81+
labels: {
82+
createItem: null,
83+
deleteItem: null
84+
},
85+
createInOverlay: null,
86+
editInOverlay: null
87+
}, config);
88+
89+
if (!config.hasOwnProperty('selected')) {
6790
config.selected = config.rootNode;
6891
}
69-
if (! 'routing_defaults' in config) {
70-
config.routing_defaults = {};
71-
}
92+
7293
var treeInst = jQuery(config.selector).jstree({
7394
"core": {
7495
"initially_load": config.path.expanded,
7596
"initially_open": config.path.preloaded
7697
},
77-
"plugins": [ "contextmenu", "themes", "types", "ui", "json_data", "crrm", "dnd", "cookies" ],
98+
"plugins": ["contextmenu", "themes", "types", "ui", "json_data", "crrm", "dnd", "cookies"],
7899
"json_data": {
79100
"ajax": {
80101
"url": config.ajax.children_url,
81102
"data": function (node) {
82-
if (node == -1) {
103+
if (-1 === node) {
83104
return { 'root' : config.rootNode };
84105
} else {
85106
return { 'root' : jQuery(node).attr('id') };
@@ -88,34 +109,40 @@ var AdminTree = (function () {
88109
}
89110
},
90111
"types": {
91-
"max_depth": -1,
92-
"max_children": -1,
93-
"valid_children": "all",
94-
"types": config.types
112+
"max_depth": -1,
113+
"max_children": -1,
114+
"valid_children": "all",
115+
"types": config.types
95116
},
96117
"ui": {
97-
"initially_select" : [ config.selected ]
118+
"initially_select" : [config.selected]
98119
},
99120
"contextmenu": {
100-
"items": function(node) {
121+
"items": function (node) {
101122
var result = {};
102123
var nodetype = node.attr("rel");
103-
if (nodetype in config.types) {
124+
125+
if (config.types.hasOwnProperty(nodetype)) {
104126
var createItem = {};
105127
var found = false;
128+
106129
createItem.label = config.labels.createItem;
107130
createItem.submenu = {};
108-
$.each(config.types[nodetype].valid_children, function(i, val) {
109-
if (val in config.types) {
131+
132+
jQuery.each(config.types[nodetype].valid_children, function (i, val) {
133+
if (config.types.hasOwnProperty(val)) {
110134
createItem.submenu[val] = {};
111135
createItem.submenu[val].label = config.types[val].label;
112136
createItem.submenu[val].action = function (node) {
113-
routing_defaults = config.routing_defaults;
114-
routing_defaults["parent"] = node.attr("url_safe_id");
137+
var routing_defaults = config.routing_defaults;
138+
routing_defaults.parent = node.attr("url_safe_id");
115139

116140
if (config.createInOverlay) {
117141
generateDialog(
118-
Routing.generate(config.types[val].routes.create_route, routing_defaults),
142+
Routing.generate(
143+
config.types[val].routes.create_route,
144+
routing_defaults
145+
),
119146
function () {
120147
treeInst.jstree('refresh', node);
121148
}
@@ -127,19 +154,22 @@ var AdminTree = (function () {
127154
found = true;
128155
}
129156
});
157+
130158
if (found) {
131159
result.createItem = createItem;
132160
}
133161
}
162+
134163
if (undefined !== config.types[node.attr("rel")].routes.delete_route) {
135164
result.deleteItem = {};
136165
result.deleteItem.label = config.labels.deleteItem;
137166
result.deleteItem.action = function (node) {
138-
routing_defaults = config.routing_defaults;
139-
routing_defaults["id"] = node.attr("url_safe_id");
167+
var routing_defaults = config.routing_defaults;
168+
routing_defaults.id = node.attr("url_safe_id");
140169
window.location = Routing.generate(config.types[node.attr("rel")].routes.delete_route, routing_defaults);
141170
};
142171
}
172+
143173
return result;
144174
}
145175
},
@@ -157,16 +187,19 @@ var AdminTree = (function () {
157187

158188
treeInst.bind("select_node.jstree", function (event, data) {
159189
if (data.rslt.obj.attr("rel") in config.types
160-
&& data.rslt.obj.attr("id") != config.selected
161-
&& undefined != config.types[data.rslt.obj.attr("rel")].routes.select_route
190+
&& data.rslt.obj.attr("id") !== config.selected
191+
&& undefined !== config.types[data.rslt.obj.attr("rel")].routes.select_route
162192
) {
163-
routing_defaults = config.routing_defaults;
164-
routing_defaults["id"] = data.rslt.obj.attr("url_safe_id");
193+
var routing_defaults = config.routing_defaults;
194+
routing_defaults.id = data.rslt.obj.attr("url_safe_id");
165195

166196
if (config.editInOverlay) {
167197
if (2 < data.args.length){ // only generateDialog() when the tree has received a click, not on refresh
168198
generateDialog(
169-
Routing.generate(config.types[data.rslt.obj.attr("rel")].routes.select_route, routing_defaults),
199+
Routing.generate(
200+
config.types[data.rslt.obj.attr("rel")].routes.select_route,
201+
routing_defaults
202+
),
170203
function () {
171204
treeInst.jstree('refresh');
172205
}
@@ -177,23 +210,26 @@ var AdminTree = (function () {
177210
}
178211
} else {
179212
// TODO: overlay?
180-
console.log('This node is not editable');
213+
console.log('This node is not editable'); // note this will break lte IE8
181214
}
182215
})
183216
.bind("before.jstree", function (e, data) {
184-
if (data.func === "move_node" && data.plugin === "crrm" && data.args[1] == false) {
217+
if ("move_node" === data.func && "crrm" === data.plugin && false === data.args[1]) {
185218
var confirmEvent = jQuery.Event('symfony_cmf_tree.move', data.inst);
186-
$(this).trigger(confirmEvent);
219+
220+
jQuery(this).trigger(confirmEvent);
221+
187222
if (confirmEvent.isDefaultPrevented()) {
188223
e.stopImmediatePropagation();
224+
189225
return false;
190226
}
191227
}
192228
})
193229
.bind("move_node.jstree", function (event, data) {
194-
var dropped = data.rslt.o;
195-
var target = data.rslt.r;
196-
var position = data.rslt.p;
230+
var dropped = data.rslt.o;
231+
var target = data.rslt.r;
232+
var position = data.rslt.p;
197233
var oldParent = data.rslt.op;
198234
var newParent = data.rslt.np;
199235

@@ -204,7 +240,7 @@ var AdminTree = (function () {
204240
}
205241

206242
if (!oldParent.is(newParent)) {
207-
$.post(
243+
jQuery.post(
208244
config.ajax.move_url,
209245
{ "dropped": dropped.attr("id"), "target": parent },
210246
function (data) {
@@ -213,14 +249,15 @@ var AdminTree = (function () {
213249
}
214250
);
215251
} else {
216-
$.post(
252+
jQuery.post(
217253
config.ajax.reorder_url,
218254
{ "dropped": dropped.attr("id"), "target": target.attr("id"), "parent": parent, "position": position }
219255
);
220256
}
221257
})
222-
223-
.delegate("a", "click", function (event, data) { event.preventDefault(); });
258+
.on("click", "a", function (e) {
259+
e.preventDefault();
260+
});
224261
};
225262

226263
return my;

0 commit comments

Comments
 (0)