Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r33829 -r33856
--- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 33829)
+++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 33856)
@@ -426,13 +426,15 @@
}
}
-function openModalWindowForExt(pageUrl, varArgIn, title, width, height) {
+function openModalWindowForExt(pageUrl, varArgIn, title, width, height, zseed) {
width = parseInt(width, 10) || parseInt((window.screen.width - 250), 10);
height = parseInt(height, 10) || parseInt((window.screen.height - 200), 10);
var url = '';
var tab1GroupMgr = new Ext.WindowGroup();
- tab1GroupMgr.zseed = 999999;
-
+ var win;
+ tab1GroupMgr.zseed = zseed || 999900;
+ var pageSource = '';
+ var tousseDefinitionID = '';
if (typeof varArgIn == 'object') {
var html = '';
@@ -442,26 +444,47 @@
html = html.slice(0, html.length - 1);
url = pageUrl + '?' + html;
+ pageSource = varArgIn.pageSource;
+ tousseDefinitionID = varArgIn.tousseDefinitionID || '';
} else {
url = pageUrl;
}
- var win = new top.Ext.Window({
- title: title,
- id: 'extWindow',
- width: width + 50,
- height: height + 40,
- autoScroll: false,
- isTopContainer: true,
- modal: true,
- resizable: false,
- manager: tab1GroupMgr,
- items: [{
- xtype: "panel",
- id: "index",
- html: ""
- }]
- })
+ if (pageSource == 'recycleForTouchScreen') {
+ win = new Ext.Window({
+ title: title,
+ id: 'extWindow' + tousseDefinitionID,
+ width: width + 50,
+ height: height + 40,
+ autoScroll: false,
+ isTopContainer: true,
+ modal: true,
+ resizable: false,
+ manager: tab1GroupMgr,
+ items: [{
+ xtype: "panel",
+ id: "index",
+ html: ""
+ }]
+ })
+ } else {
+ win = new top.Ext.Window({
+ title: title,
+ id: 'extWindow' + tousseDefinitionID,
+ width: width + 50,
+ height: height + 40,
+ autoScroll: false,
+ isTopContainer: true,
+ modal: true,
+ resizable: false,
+ manager: tab1GroupMgr,
+ items: [{
+ xtype: "panel",
+ id: "index",
+ html: ""
+ }]
+ })
+ }
win.show();