fernando/luos
1
0
Fork 0
Code Releases Activity

BUG-12604-12174-13122 SOLVED Problema de despliegue de contenido de la librería CodeMirror cuando se usa el navegador Internet Explorer 8, 9, 10, en la sección '/DESIGNER/', dbl-click al seleccionar un proceso, opción TRIGGERS, opciónes: 'New / Custom Trigger', 'New / Copy & Import Trigger from a Process', Edit. Todo el campo de visualización se comporta de manera anormal, y los scrolls horizontal y vertical se pierden, en otros casos cuando el contenido es muy largo la visualización simplemente se pierde y solo se puede recuperar haciendo click sobre el área nuevamente.

Browse Source
This commit is contained in:
Roly Gutierrez
2013-11-11 12:06:00 -04:00
parent 0af12c2e7a
commit 7fb2b76aa7
7 changed files with 5 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/xmlform/steps/steps_Options.xml Executable file → Normal file
View File

@@ -74,8 +74,7 @@
// Additional functions required in triggers // Additional functions required in triggers
function triggerEditWizardSource (sUID){ function triggerEditWizardSource (sUID){
//popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID=' + sUID +'&BYPASS=1' , 770, 510); window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + sUID +'&BYPASS=1','@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='+screen.width+',height='+screen.height);
//window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + sUID +'&BYPASS=1','@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=930,height=600,top=85,left=140');
} }
function triggerSave(form) function triggerSave(form)

5
workflow/engine/xmlform/steps/triggersAfter_List.xml Executable file → Normal file
View File

@@ -13,10 +13,7 @@
<triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/> <triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/>
<EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick=" <EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='+screen.width+',height='+screen.height); return false;"/>
/*popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID , 930, 600); */
window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=930,height=600,top=85,left=140');
return false;"/>
<CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, &#039;AFTER&#039;);return false;"/> <CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, &#039;AFTER&#039;);return false;"/>

5
workflow/engine/xmlform/steps/triggersBefore_List.xml Executable file → Normal file
View File

@@ -13,10 +13,7 @@
<triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/> <triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/>
<EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick=" <EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='+screen.width+',height='+screen.height); return false;"/>
/*popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID , 930, 600); */
window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=930,height=600,top=85,left=140');
return false;"/>
<CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, &#039;BEFORE&#039;);return false;"/> <CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, &#039;BEFORE&#039;);return false;"/>

23
workflow/engine/xmlform/triggers/triggerCopy.xml
View File

@@ -84,25 +84,6 @@
<JS type="javascript"> <JS type="javascript">
<![CDATA[ <![CDATA[
/*var triggerEditor = CodeMirror.fromTextArea('form[TRI_WEBBOT]', {
height: "200px",
width: "90%",
parserfile: ["parsexml.js", "parsecss.js", "tokenizejavascript.js", "parsejavascript.js",
"../contrib/php/js/tokenizephp.js", "../contrib/php/js/parsephp.js",
"../contrib/php/js/parsephphtmlmixed.js"],
stylesheet: ["css/xmlcolors.css", "css/jscolors.css", "css/csscolors.css", "css/phpcolors.css" ],
path: "js/", lineNumbers: true, continuousScanning: 500, readOnly:true, parserConfig: { phpOnly:true} });
*/
/*var triggerEditor = CodeMirror.fromTextArea(document.getElementById("form[TRI_WEBBOT]"), {
lineNumbers: true,
matchBrackets: true,
mode: "application/x-httpd-php",
PMEnabled: true,
indentUnit: 2,
indentWithTabs: false,
readOnly: true
});
triggerEditor.setSize(400,200);*/
function cancel() function cancel()
{ {
@@ -114,8 +95,6 @@
var triUid = getField("TRIGGER_UID_AUX").value; var triUid = getField("TRIGGER_UID_AUX").value;
if (triUid != triUidPrev) { if (triUid != triUidPrev) {
//triggerEditor.setValue(document.getElementById("form[TRI_WEBBOT]").value);
triUidPrev = triUid; triUidPrev = triUid;
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : 'processes_TriggersFormatCode', url : 'processes_TriggersFormatCode',
@@ -142,7 +121,6 @@
function () function ()
{ {
txtTgrTitle.value = ""; txtTgrTitle.value = "";
//triggerEditor.setValue("");
triUidPrev= ""; triUidPrev= "";
} }
); );
@@ -157,7 +135,6 @@
setTimeout("triggerCheckWebbotTimer()", 100); setTimeout("triggerCheckWebbotTimer()", 100);
} else { } else {
txtTgrTitle.value = ""; txtTgrTitle.value = "";
//triggerEditor.setValue("");
triUidPrev= ""; triUidPrev= "";
} }
} }

33
workflow/engine/xmlform/triggers/triggersCustom.xml Executable file → Normal file
View File

@@ -31,29 +31,6 @@
<JS type="JavaScript"><![CDATA[ <JS type="JavaScript"><![CDATA[
/*var triggerEditor = CodeMirror.fromTextArea('form[TRI_WEBBOT]', {
height: "220px",
width: "80%",
parserfile: ["parsexml.js", "parsecss.js", "tokenizejavascript.js", "parsejavascript.js",
"../contrib/php/js/tokenizephp.js", "../contrib/php/js/parsephp.js",
"../contrib/php/js/parsephphtmlmixed.js"],
stylesheet: ["css/xmlcolors.css", "css/jscolors.css", "css/csscolors.css", "css/phpcolors.css" ],
path: "js/", lineNumbers: true, continuousScanning: 500, parserConfig: { phpOnly:true} });*/
/*CodeMirror.commands.autocomplete = function(cm) {
CodeMirror.showHint(cm, CodeMirror.phpHint);
}
var triggerEditor = CodeMirror.fromTextArea(document.getElementById("form[TRI_WEBBOT]"), {
lineNumbers: true,
matchBrackets: true,
mode: "application/x-httpd-php",
PMEnabled: true,
indentUnit: 2,
indentWithTabs: false,
extraKeys: {"Ctrl-Space": "autocomplete"}
});
triggerEditor.setSize(450,245);*/
getField('TRI_TITLE').form.onsubmit = function() {return false;}; getField('TRI_TITLE').form.onsubmit = function() {return false;};
var _oVarsPanel_; var _oVarsPanel_;
@@ -90,16 +67,6 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
oRPC.make(); oRPC.make();
}; };
/*var insertFormVar = function(sFieldName, sValue) {
if (triggerEditor.getSelection() == "") {
triggerEditor.replaceRange(sValue, triggerEditor.getCursor());
} else {
triggerEditor.replaceSelection(sValue);
}
_oVarsPanel_.remove();
triggerEditor.focus();
};*/
function cancel(){ function cancel(){
currentPopupWindow.remove(); currentPopupWindow.remove();
} }

11
workflow/engine/xmlform/triggers/triggers_Edit.xml Executable file → Normal file
View File

@@ -20,16 +20,6 @@
</SAVE> </SAVE>
<JS type="JavaScript"><![CDATA[ <JS type="JavaScript"><![CDATA[
/*var triggerEditor = CodeMirror.fromTextArea('form[TRI_WEBBOT]', {
height: "380px",
width: "90%",
parserfile: ["parsexml.js", "parsecss.js", "tokenizejavascript.js", "parsejavascript.js",
"../contrib/php/js/tokenizephp.js", "../contrib/php/js/parsephp.js",
"../contrib/php/js/parsephphtmlmixed.js"],
stylesheet: ["css/xmlcolors.css", "css/jscolors.css", "css/csscolors.css", "css/phpcolors.css" ],
path: "js/", lineNumbers: true, continuousScanning: 500, parserConfig: { phpOnly:true} });
*/
CodeMirror.commands.autocomplete = function(cm) { CodeMirror.commands.autocomplete = function(cm) {
CodeMirror.showHint(cm, CodeMirror.phpHint); CodeMirror.showHint(cm, CodeMirror.phpHint);
} }
@@ -90,7 +80,6 @@ var insertFormVar = function(sFieldName, sValue) {
}; };
function cancel(){ function cancel(){
//currentPopupWindow.remove();
window.close(); window.close();
} }

31
workflow/engine/xmlform/triggers/triggers_Options.xml Executable file → Normal file
View File

@@ -37,32 +37,6 @@
<JS type="javascript" replaceTags="1"> <JS type="javascript" replaceTags="1">
<![CDATA[ <![CDATA[
/*
document.onkeypress=function(e){
var esIE=(document.all);
var esNS=(document.layers);
tecla=(esIE) ? event.keyCode : e.which;
if(tecla==13){
return false;
}
}
*/
/*
//Add css Codemirror
var head = document.getElementsByTagName('head')[0];
var s = document.createElement('link');
s.setAttribute('href', '/js/codemirror/lib/codemirror.css');
s.setAttribute('type', 'text/css');
s.setAttribute('rel', 'stylesheet');
head.appendChild(s);
var s = document.createElement('link');
s.setAttribute('href', '/js/codemirror/addon/hint/show-hint.css');
s.setAttribute('type', 'text/css');
s.setAttribute('rel', 'stylesheet');
head.appendChild(s);
*/
var windowWidth = 600; var windowWidth = 600;
var windowHeight = 460; var windowHeight = 460;
@@ -81,7 +55,7 @@
function triggerCopy() function triggerCopy()
{ {
popupWindow("@G::LoadTranslation(ID_TRIGGER_COPY_TITLE)", "@G::encryptlink(@#triggerCopy)?PRO_UID=@%PRO_UID" , windowWidth, windowHeight); popupWindow("@G::LoadTranslation(ID_TRIGGER_COPY_TITLE)", "@G::encryptlink(@#triggerCopy)?PRO_UID=@%PRO_UID" , 900, 460);
} }
function triggerFromLibrary() { function triggerFromLibrary() {
@@ -98,8 +72,7 @@
} }
function triggerEdit(sUID) { function triggerEdit(sUID) {
//popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID , 930, 600); window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='+screen.width+',height='+screen.height);
window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=930,height=600,top=85,left=140');
} }
function triggerProperties( sUID ) { function triggerProperties( sUID ) {