Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

LimeSurvey · Apr 20, 2016 · 7a6a3bf · 7a6a3bf
2 parents c5588eb + 8ff8202
commit 7a6a3bf
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -627,7 +627,6 @@
 
 $config['publicstyleurl']          = $config['publicurl'].'styles-public/';
 $config['sCKEditorURL']            = $config['third_party'].'ckeditor';
-//$config['sCKEditorURL']            = '/scripts/admin/ckeditor.36';
 $config['usertemplaterooturl']     = $config['uploadurl'].'/templates';     // Location of the user templates
 
 $config['adminimageurl']           = $config['styleurl'].$config['admintheme'].'/images/';         // Location of button bar files for admin script

diff --git a/application/helpers/admin/htmleditor_helper.php b/application/helpers/admin/htmleditor_helper.php
@@ -261,7 +261,6 @@ function(){ var $oCKeditorVarName = CKEDITOR.replace('$fieldname', {
         ,LimeReplacementFieldsType : \"".$fieldtype."\"
         ,LimeReplacementFieldsAction : \"".$action."\"
         ,LimeReplacementFieldsPath : \"".Yii::app()->getController()->createUrl("admin/limereplacementfields/sa/index/")."\"
-        ,width:'660'
         ,language:'".sTranslateLangCode2CK(Yii::app()->session['adminlang'])."'
         ,smiley_path : \"".Yii::app()->getConfig('imageurl')."/emoticons/texteditor/\"\n"
         . $sFileBrowserAvailable

diff --git a/scripts/admin/ckeditor-config.js b/scripts/admin/ckeditor-config.js
@@ -11,8 +11,7 @@ CKEDITOR.editorConfig = function( config )
     config.removeDialogTabs = 'link:upload;image:Upload';
 
     config.skin = 'bootstrapck';
-    config.toolbarCanCollapse = false;
-    config.resize_enabled = false;
+    //config.toolbarCanCollapse = true;
     config.autoParagraph = false;
     config.basicEntities = false; // For <, >, & ( and nbsp)
     config.entities = false; // For ' ( and a lot of other but not <>&)