pixl-xyapp 2.1.30 → 2.1.32
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/css/base.css +2 -1
- package/js/page.js +5 -5
- package/js/select.js +4 -4
- package/package.json +1 -1
package/css/base.css
CHANGED
package/js/page.js
CHANGED
|
@@ -1525,10 +1525,10 @@ window.PageManager = class PageManager {
|
|
|
1525
1525
|
else throw("Page " + id + " onActivate did not return a boolean!");
|
|
1526
1526
|
}
|
|
1527
1527
|
|
|
1528
|
-
deactivate(id, new_id) {
|
|
1528
|
+
deactivate(id, new_id, anchor) {
|
|
1529
1529
|
// send deactivate event to page by id (i.e. Plugin Name)
|
|
1530
1530
|
var page = this.find(id);
|
|
1531
|
-
var result = page.onDeactivate(new_id);
|
|
1531
|
+
var result = page.onDeactivate(new_id, anchor);
|
|
1532
1532
|
if (result) {
|
|
1533
1533
|
$('#page_'+id).hide();
|
|
1534
1534
|
$('#tab_'+id).removeClass('active').addClass('inactive');
|
|
@@ -1541,12 +1541,12 @@ window.PageManager = class PageManager {
|
|
|
1541
1541
|
return result;
|
|
1542
1542
|
}
|
|
1543
1543
|
|
|
1544
|
-
click(id, args) {
|
|
1544
|
+
click(id, args, anchor) {
|
|
1545
1545
|
// exit current page and enter specified page
|
|
1546
1546
|
Debug.trace('page', "Switching pages to: " + id);
|
|
1547
1547
|
var old_id = this.current_page_id;
|
|
1548
1548
|
if (this.current_page_id) {
|
|
1549
|
-
var result = this.deactivate( this.current_page_id, id );
|
|
1549
|
+
var result = this.deactivate( this.current_page_id, id, anchor );
|
|
1550
1550
|
if (!result) return false; // current page said no
|
|
1551
1551
|
}
|
|
1552
1552
|
this.current_page_id = id;
|
|
@@ -1711,7 +1711,7 @@ var Nav = {
|
|
|
1711
1711
|
// app.hideMessage();
|
|
1712
1712
|
app.pushSidebar();
|
|
1713
1713
|
|
|
1714
|
-
var result = app.page_manager.click( page_name, page_args );
|
|
1714
|
+
var result = app.page_manager.click( page_name, page_args, full_anchor );
|
|
1715
1715
|
if (result) {
|
|
1716
1716
|
this.old_loc = this.loc;
|
|
1717
1717
|
if (this.old_loc == 'init') this.old_loc = config.DefaultPage || 'Main';
|
package/js/select.js
CHANGED
|
@@ -118,7 +118,7 @@ var SingleSelect = {
|
|
|
118
118
|
$('#d_sel_dialog_scrollarea > div.sel_dialog_item').on('click', function() {
|
|
119
119
|
// select item, close dialog and update multi-select
|
|
120
120
|
var $item = $(this);
|
|
121
|
-
$this.val( $item.
|
|
121
|
+
$this.val( $item.attr('data-value') );
|
|
122
122
|
|
|
123
123
|
Popover.detach();
|
|
124
124
|
// redraw();
|
|
@@ -261,7 +261,7 @@ var SingleSelect = {
|
|
|
261
261
|
$('#d_sel_dialog_scrollarea > div.sel_dialog_item').on('click', function() {
|
|
262
262
|
// select item, close dialog and update state
|
|
263
263
|
var $item = $(this);
|
|
264
|
-
var value = $item.
|
|
264
|
+
var value = $item.attr('data-value');
|
|
265
265
|
|
|
266
266
|
delete opts.onCancel;
|
|
267
267
|
Popover.detach();
|
|
@@ -487,7 +487,7 @@ var MultiSelect = {
|
|
|
487
487
|
var $item = $(this);
|
|
488
488
|
if ($item.hasClass('inherited')) return; // no clicky on inherited items
|
|
489
489
|
|
|
490
|
-
var value = $item.
|
|
490
|
+
var value = $item.attr('data-value');
|
|
491
491
|
var new_sel_state = !$item.hasClass('selected');
|
|
492
492
|
var new_sel_idx = -1;
|
|
493
493
|
|
|
@@ -700,7 +700,7 @@ var MultiSelect = {
|
|
|
700
700
|
|
|
701
701
|
var values = [];
|
|
702
702
|
$('#d_sel_dialog_scrollarea > div.sel_dialog_item.selected').each( function() {
|
|
703
|
-
values.push( $(this).
|
|
703
|
+
values.push( $(this).attr('data-value') );
|
|
704
704
|
});
|
|
705
705
|
|
|
706
706
|
Popover.detach();
|
package/package.json
CHANGED