fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/master' into BUG-10852

Browse Source
This commit is contained in:
Hector Cortez
2013-04-19 12:17:06 -04:00
parent 66a23c0a96 cb2e9ad6d5
commit 24be16d049
16 changed files with 107 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
workflow/engine/xmlform/dynaforms/dynaforms_Editor.xml
View File

@@ -33,6 +33,19 @@ function loadEditor()
dynaformEditor.A="@#URL";
dynaformEditor.dynUid="@#DYN_UID";
dynaformEditor._run();
//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);
mainPanel.events.remove = function()
{
var canClose=dynaformEditor.close();

1
workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html
View File

@@ -20,6 +20,7 @@
<td class='FormLabel' width="{$form_labelWidth}">{$HTML2}</td>
<td class='FormFieldContent' >{$form.HTML2}</td>
</tr -->
</table>
</td>
</tr>
</table>

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

@@ -93,7 +93,7 @@
indentWithTabs: false,
readOnly: true
});
triggerEditor.setSize(350,200);
triggerEditor.setSize(400,200);
function cancel()
{

2
workflow/engine/xmlform/triggers/triggersCustom.xml
View File

@@ -52,7 +52,7 @@ var triggerEditor = CodeMirror.fromTextArea(document.getElementById("form[TRI_WE
indentWithTabs: false,
extraKeys: {"Ctrl-Space": "autocomplete"}
});
triggerEditor.setSize(400,250);
triggerEditor.setSize(450,245);
getField('TRI_TITLE').form.onsubmit = function() {return false;};
var _oVarsPanel_;

2
workflow/engine/xmlform/triggers/triggers_Edit.xml
View File

@@ -43,7 +43,7 @@ var triggerEditor = CodeMirror.fromTextArea(document.getElementById("form[TRI_WE
indentWithTabs: false,
extraKeys: {"Ctrl-Space": "autocomplete"}
});
triggerEditor.setSize(800,400);
triggerEditor.setSize(890, 440);
var _oVarsPanel_;
var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) {

14
workflow/engine/xmlform/triggers/triggers_Options.xml
View File

@@ -46,6 +46,20 @@
}
}
*/
//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 windowHeight = 460;