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

Fixing an mceInsertContent bug, the execCommand is now the mceInsertRawHTML

Browse Source
This commit is contained in:
Gustavo Cruz
2012-12-07 09:54:12 -04:00
parent 758528ba9a
commit 610072205b
5 changed files with 19010 additions and 1653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20648
gulliver/js/maborak/core/maborak.js
View File

File diff suppressed because it is too large Load Diff

5
gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmGrids/editor_plugin.js vendored
View File

@@ -31,7 +31,7 @@
// this function can get called from the plugin inint (above) or from the callback on advlink/advimg plugins.. // this function can get called from the plugin inint (above) or from the callback on advlink/advimg plugins..
// in the latter case, win and type will be set.. In the rist case, we will just update the main editor window // in the latter case, win and type will be set.. In the rist case, we will just update the main editor window
// with the path of the uploaded file // with the path of the uploaded file
function pmGrids(field_name, url, type, win) { function pmGrids(field_name, win) {
//tinyMCE.activeEditor.anyVariable='path/to/ProcessMaker' //tinyMCE.activeEditor.anyVariable='path/to/ProcessMaker'
var strPluginPath = tinyMCE.activeEditor.plugins.pmGrids.getPluginURL(); // get the path to the uploader plugin var strPluginPath = tinyMCE.activeEditor.plugins.pmGrids.getPluginURL(); // get the path to the uploader plugin
var strScriptURL = strPluginPath + "/pmGrids.html"; var strScriptURL = strPluginPath + "/pmGrids.html";
@@ -61,6 +61,7 @@ function closePluginPopup(){
} }
function updateEditorContent(serializedHTML){ function updateEditorContent(serializedHTML){
tinyMCE.activeEditor.execCommand('mceInsertContent', false, serializedHTML); tinyMCE.activeEditor.execCommand('mceInsertRawHTML', false, serializedHTML);
closePluginPopup();
} }

4
gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmGrids/editor_plugin_src.js vendored
View File

@@ -31,7 +31,7 @@
// this function can get called from the plugin inint (above) or from the callback on advlink/advimg plugins.. // this function can get called from the plugin inint (above) or from the callback on advlink/advimg plugins..
// in the latter case, win and type will be set.. In the rist case, we will just update the main editor window // in the latter case, win and type will be set.. In the rist case, we will just update the main editor window
// with the path of the uploaded file // with the path of the uploaded file
function pmGrids(field_name, url, type, win) { function pmGrids(field_name, win) {
//tinyMCE.activeEditor.anyVariable='path/to/ProcessMaker' //tinyMCE.activeEditor.anyVariable='path/to/ProcessMaker'
var strPluginPath = tinyMCE.activeEditor.plugins.pmGrids.getPluginURL(); // get the path to the uploader plugin var strPluginPath = tinyMCE.activeEditor.plugins.pmGrids.getPluginURL(); // get the path to the uploader plugin
var strScriptURL = strPluginPath + "/pmGrids.html"; var strScriptURL = strPluginPath + "/pmGrids.html";
@@ -61,7 +61,7 @@ function closePluginPopup(){
} }
function updateEditorContent(serializedHTML){ function updateEditorContent(serializedHTML){
tinyMCE.activeEditor.execCommand('mceInsertContent', false, serializedHTML); tinyMCE.activeEditor.execCommand('mceInsertRawHTML', false, serializedHTML);
closePluginPopup(); closePluginPopup();
} }

4
gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmGrids/pmGrids.js vendored
View File

@@ -65,13 +65,13 @@ $(document).ready(function () {
var insertFormatedGrid = function(){ var insertFormatedGrid = function(){
var gridName = $("#gridList option:selected").text(); var gridName = $("#gridList option:selected").text();
var tableCode = "<table>" var tableCode = "<table>"
var gridCode = "<!--"+gridName+"@>-->"; var gridCode = "<!--@>"+gridName+"-->";
var headerCode = "<tr>"; var headerCode = "<tr>";
var fieldCode = "<tr>"; var fieldCode = "<tr>";
$('#listContainer .headerField').each(function(i){ $('#listContainer .headerField').each(function(i){
if (this.checked == true) { if (this.checked == true) {
headerCode += "<td>"+$('#'+this.value).val()+"</td>"; headerCode += "<th>"+$('#'+this.value).val()+"</th>";
fieldCode += "<td>"+$('#prefixList').val()+$('#field_'+this.value).val()+"</td>"; fieldCode += "<td>"+$('#prefixList').val()+$('#field_'+this.value).val()+"</td>";
} }
}); });

2
workflow/engine/bin/tasks/libraries.json
View File

@@ -84,7 +84,7 @@
"name": "tinymce", "name": "tinymce",
"full": "gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js", "full": "gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js",
"mini": "gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js", "mini": "gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js",
"minify": true "minify": false
} }
], ],
"build" : true, "build" : true,