jsharmony 1.30.0 → 1.30.2
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/clientjs/XExt.js +19 -13
- package/package.json +1 -1
- package/public/js/jsHarmony.js +1 -1
- package/render/RenderTemplate.js +1 -1
- package/views/jsh_render.js.ejs +1 -1
package/clientjs/XExt.js
CHANGED
|
@@ -1966,28 +1966,34 @@ exports = module.exports = function(jsh){
|
|
|
1966
1966
|
jsh.$dialogBlock(sel + ' input').off('click');
|
|
1967
1967
|
jsh.$dialogBlock(sel + ' input').off('keydown');
|
|
1968
1968
|
|
|
1969
|
-
var cancelDialogFunc =
|
|
1970
|
-
|
|
1971
|
-
|
|
1972
|
-
|
|
1973
|
-
|
|
1974
|
-
|
|
1969
|
+
var cancelDialogFunc = function(_onClosed){
|
|
1970
|
+
XExt.dialogButtonFunc(sel, oldactive, function () {
|
|
1971
|
+
if (onClosed) onClosed();
|
|
1972
|
+
if (_onClosed) _onClosed();
|
|
1973
|
+
if(options.reuse) jsh.$dialogBlock(sel).hide();
|
|
1974
|
+
else jsh.$dialogBlock(sel).remove();
|
|
1975
|
+
}, { onClosing: options.onClosing })();
|
|
1976
|
+
};
|
|
1977
|
+
var cancelfunc = function(options, _onClosed){
|
|
1975
1978
|
options = _.extend({ force: false }, options);
|
|
1976
1979
|
options.forceCancel = function(){ cancelfunc({ force: true }); };
|
|
1977
1980
|
if (onCancel){
|
|
1978
1981
|
if((onCancel(options)===false) && !options.force) return;
|
|
1979
1982
|
}
|
|
1980
|
-
cancelDialogFunc();
|
|
1983
|
+
cancelDialogFunc(_onClosed);
|
|
1984
|
+
};
|
|
1985
|
+
var acceptfunc_aftervalidate = function(_onClosed){
|
|
1986
|
+
XExt.dialogButtonFunc(sel, oldactive, function () {
|
|
1987
|
+
if (onClosed) onClosed();
|
|
1988
|
+
if (_onClosed) _onClosed();
|
|
1989
|
+
}, { onClosing: options.onClosing })();
|
|
1981
1990
|
};
|
|
1982
|
-
var
|
|
1983
|
-
if (onClosed) onClosed();
|
|
1984
|
-
}, { onClosing: options.onClosing });
|
|
1985
|
-
var acceptfunc = function () {
|
|
1991
|
+
var acceptfunc = function (_onClosed) {
|
|
1986
1992
|
//Verify this is the topmost dialog
|
|
1987
1993
|
if ((jsh.xDialog.length > 0) && (jsh.xDialog[0] != (sel))) return;
|
|
1988
1994
|
|
|
1989
|
-
if (onAccept) return onAccept(function () { acceptfunc_aftervalidate(); });
|
|
1990
|
-
else acceptfunc_aftervalidate();
|
|
1995
|
+
if (onAccept) return onAccept(function () { acceptfunc_aftervalidate(_onClosed); });
|
|
1996
|
+
else acceptfunc_aftervalidate(_onClosed);
|
|
1991
1997
|
};
|
|
1992
1998
|
XExt.execif(true,
|
|
1993
1999
|
function(done){
|