lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We do not force disabling of ckeditor for phones. We let ckeditor

Browse Source 
decide (currently ckeditor is disabled with android).
This commit is contained in:
Laurent Destailleur 2014-03-31 13:25:40 +02:00
parent 3d8fb60f94
commit 56c7d14b9a
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/admin/fckeditor.php
View File

@ -167,8 +167,27 @@ else
$editor=new DolEditor('formtestfield',isset($conf->global->FCKEDITOR_TEST)?$conf->global->FCKEDITOR_TEST:'Test','',200,$mode,'In', true, $uselocalbrowser, 1, 120, 8, $readonly);
$editor->Create();
print '<center><br><input class="button" type="submit" name="save" value="'.$langs->trans("Save").'"></center>'."\n";
print '<div id="divforlog"></div>';
print '</form>'."\n";
// Add env of ckeditor
// This is to show how CKEditor detect browser to understand why editor is disabled or not
if (1 == 2) // Change this to enable output
{
print '<br><script language="javascript">
function jsdump(obj, id) {
var out = \'\';
for (var i in obj) {
out += i + ": " + obj[i] + "<br>\n";
}
jQuery("#"+id).html(out);
}
jsdump(CKEDITOR.env, "divforlog");
</script>';
}
/*
print '<!-- Result -->';
print $_POST["formtestfield"];

2
htdocs/core/class/doleditor.class.php
View File

@ -81,7 +81,7 @@ class DolEditor
// Check if extended editor is ok. If not we force textarea
if (empty($conf->fckeditor->enabled) || ! $okforextendededitor) $this->tool = 'textarea';
if ($conf->browser->phone) $this->tool = 'textarea';
//if ($conf->browser->phone) $this->tool = 'textarea';
// Define content and some properties
if ($this->tool == 'ckeditor')

2
htdocs/core/menus/standard/eldy.lib.php
View File

@ -1283,7 +1283,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
{
for ($j=0; $j < $tabul; $j++)
{
$tabstring.='&nbsp; &nbsp;';
$tabstring.='&nbsp; &nbsp; &nbsp;';
}
}