pixl-xyapp 2.1.25 → 2.1.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/js/page.js +2 -2
- package/js/tools.js +6 -1
- package/package.json +1 -1
package/js/page.js
CHANGED
|
@@ -942,13 +942,13 @@ window.Page = class Page {
|
|
|
942
942
|
|
|
943
943
|
app.api.post( 'user/resume_session', {}, function(resp) {
|
|
944
944
|
if (resp.user) {
|
|
945
|
-
Debug.trace("User Session Resume: " + resp.username);
|
|
945
|
+
Debug.trace('user', "User Session Resume: " + resp.username);
|
|
946
946
|
Dialog.hideProgress();
|
|
947
947
|
app.doUserLogin( resp );
|
|
948
948
|
Nav.refresh();
|
|
949
949
|
}
|
|
950
950
|
else {
|
|
951
|
-
Debug.trace("User cookie is invalid, redirecting to login page");
|
|
951
|
+
Debug.trace('user', "User cookie is invalid, redirecting to login page");
|
|
952
952
|
app.setPref('username', '');
|
|
953
953
|
setTimeout( function() { Nav.go('Login'); }, 1 );
|
|
954
954
|
}
|
package/js/tools.js
CHANGED
|
@@ -337,8 +337,13 @@ function render_menu_options(items, sel_value, auto_add) {
|
|
|
337
337
|
if (isa_hash(item)) {
|
|
338
338
|
if (('label' in item) && ('items' in item)) {
|
|
339
339
|
// optgroup, recurse for items within
|
|
340
|
+
var sub_items = deep_copy_object(item.items);
|
|
341
|
+
if (sub_items[0] && (typeof(sub_items[0]) == 'object')) {
|
|
342
|
+
sub_items[0].group = item.label;
|
|
343
|
+
}
|
|
344
|
+
|
|
340
345
|
html += '<optgroup label="' + encode_attrib_entities(item.label) + '">';
|
|
341
|
-
html += render_menu_options(
|
|
346
|
+
html += render_menu_options( sub_items, sel_value, false );
|
|
342
347
|
html += '</optgroup>';
|
|
343
348
|
continue;
|
|
344
349
|
}
|
package/package.json
CHANGED