pixl-xyapp 2.1.14 → 2.1.16
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 +1 -0
- package/css/boilerplate.css +1 -1
- package/css/normalize.css +1 -1
- package/js/base.js +1 -0
- package/js/dialog.js +4 -1
- package/js/tools.js +2 -2
- package/package.json +1 -1
package/css/base.css
CHANGED
package/css/boilerplate.css
CHANGED
package/css/normalize.css
CHANGED
package/js/base.js
CHANGED
|
@@ -157,6 +157,7 @@ var app = {
|
|
|
157
157
|
var id = this.page_manager.current_page_id;
|
|
158
158
|
var page = this.page_manager.find(id);
|
|
159
159
|
if (page && page.onResizeDelay) page.onResizeDelay( get_inner_window_size() );
|
|
160
|
+
if (page && page.updateBoxButtonFloaterState) page.updateBoxButtonFloaterState();
|
|
160
161
|
}
|
|
161
162
|
},
|
|
162
163
|
|
package/js/dialog.js
CHANGED
|
@@ -7,6 +7,7 @@ var Dialog = {
|
|
|
7
7
|
clickBlock: false,
|
|
8
8
|
progress: null,
|
|
9
9
|
onHide: null,
|
|
10
|
+
onDragDrop: null,
|
|
10
11
|
|
|
11
12
|
show: function(html, click_block) {
|
|
12
13
|
// show dialog, auto-size and center
|
|
@@ -99,6 +100,8 @@ var Dialog = {
|
|
|
99
100
|
this.onHide = null;
|
|
100
101
|
callback();
|
|
101
102
|
}
|
|
103
|
+
|
|
104
|
+
this.onDragDrop = null;
|
|
102
105
|
}
|
|
103
106
|
},
|
|
104
107
|
|
|
@@ -124,7 +127,7 @@ var Dialog = {
|
|
|
124
127
|
var extra_classes = '';
|
|
125
128
|
if (counter == 1.0) extra_classes = 'indeterminate';
|
|
126
129
|
|
|
127
|
-
html += '<div id="d_progress_bar_cont" class="progress_bar_container '+extra_classes+'" style="width:196px; margin:0 auto 0 auto;">';
|
|
130
|
+
html += '<div id="d_progress_bar_cont" class="progress_bar_container '+extra_classes+'" style="width:196px; margin:0 auto 0 auto;" role="progressbar">';
|
|
128
131
|
html += '<div id="d_progress_bar" class="progress_bar_inner" style="width:'+cx+'px;"></div>';
|
|
129
132
|
html += '</div>';
|
|
130
133
|
|
package/js/tools.js
CHANGED
|
@@ -169,10 +169,10 @@ function get_text_from_seconds(sec, abbrev, no_secondary) {
|
|
|
169
169
|
} // min>59
|
|
170
170
|
} // sec>59
|
|
171
171
|
|
|
172
|
-
var text = p_amt + "
|
|
172
|
+
var text = p_amt + " " + p_text;
|
|
173
173
|
if ((p_amt != 1) && !abbrev) text += "s";
|
|
174
174
|
if (s_amt && !no_secondary) {
|
|
175
|
-
text += ", " + s_amt + "
|
|
175
|
+
text += ", " + s_amt + " " + s_text;
|
|
176
176
|
if ((s_amt != 1) && !abbrev) text += "s";
|
|
177
177
|
}
|
|
178
178
|
|
package/package.json
CHANGED