From dda586618082beeb3b43c39e3352e5f52f90a2b3 Mon Sep 17 00:00:00 2001 From: Abdallah Date: Thu, 13 Feb 2014 18:02:42 +0200 Subject: [PATCH] new tinymce js changes to support new tinymce scss changes for alignments --- cms/templates/base.html | 4 ++-- common/lib/xmodule/xmodule/css/html/edit.scss | 2 +- common/lib/xmodule/xmodule/js/js_test.yml | 4 ++-- common/lib/xmodule/xmodule/js/src/html/edit.coffee | 12 +++++------- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/cms/templates/base.html b/cms/templates/base.html index 625777fe23..dae4e65974 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -70,8 +70,8 @@ "backbone": "js/vendor/backbone-min", "backbone.associations": "js/vendor/backbone-associations-min", "backbone.paginator": "js/vendor/backbone.paginator.min", - "tinymce": "js/vendor/tiny_mce/tiny_mce", - "jquery.tinymce": "js/vendor/tiny_mce/jquery.tinymce", + "tinymce": "js/vendor/tiny_mce/tinymce.min", + "jquery.tinymce": "js/vendor/tiny_mce/jquery.tinymce.min", "xmodule": "/xmodule/xmodule", "xblock": "coffee/src/xblock", "utility": "js/src/utility", diff --git a/common/lib/xmodule/xmodule/css/html/edit.scss b/common/lib/xmodule/xmodule/css/html/edit.scss index bd9722df67..8b8e48d944 100644 --- a/common/lib/xmodule/xmodule/css/html/edit.scss +++ b/common/lib/xmodule/xmodule/css/html/edit.scss @@ -19,7 +19,7 @@ } .editor-tabs { - top: 11px !important; + top: 0 !important; right: 10px; z-index: 99; } diff --git a/common/lib/xmodule/xmodule/js/js_test.yml b/common/lib/xmodule/xmodule/js/js_test.yml index 8aeeaba122..00ecfac488 100644 --- a/common/lib/xmodule/xmodule/js/js_test.yml +++ b/common/lib/xmodule/xmodule/js/js_test.yml @@ -49,8 +49,8 @@ lib_paths: - common_static/js/vendor/backbone-min.js - common_static/js/vendor/jquery.leanModal.min.js - common_static/js/vendor/CodeMirror/codemirror.js - - common_static/js/vendor/tiny_mce/jquery.tinymce.js - - common_static/js/vendor/tiny_mce/tiny_mce.js + - common_static/js/vendor/tiny_mce/jquery.tinymce.min.js + - common_static/js/vendor/tiny_mce/tinymce.min.js - common_static/js/vendor/mathjax-MathJax-c9db6ac/MathJax.js - common_static/js/vendor/jquery.timeago.js - common_static/js/vendor/sinon-1.7.1.js diff --git a/common/lib/xmodule/xmodule/js/src/html/edit.coffee b/common/lib/xmodule/xmodule/js/src/html/edit.coffee index e99922c873..2e60d75fe2 100644 --- a/common/lib/xmodule/xmodule/js/src/html/edit.coffee +++ b/common/lib/xmodule/xmodule/js/src/html/edit.coffee @@ -20,8 +20,8 @@ class @HTMLEditingDescriptor # instances (like sandbox). It is not necessary to explicitly set baseURL when running locally. tinyMCE.baseURL = "#{baseUrl}/js/vendor/tiny_mce" @tiny_mce_textarea = $(".tiny-mce", @element).tinymce({ - script_url : "#{baseUrl}/js/vendor/tiny_mce/tiny_mce.js", - theme : "advanced", + script_url : "#{baseUrl}/js/vendor/tiny_mce/tiny_mce.min.js", + theme : "modern", skin: 'studio', schema: "html5", # Necessary to preserve relative URLs to our images. @@ -42,7 +42,7 @@ class @HTMLEditingDescriptor # Disable visual aid on borderless table. visual:false, # We may want to add "styleselect" when we collect all styles used throughout the LMS - theme_advanced_buttons1 : "formatselect,fontselect,bold,italic,underline,forecolor,|,bullist,numlist,outdent,indent,|,link,unlink,image,|,blockquote,wrapAsCode", + toolbar : "formatselect,fontselect,bold,italic,underline,forecolor,|,bullist,numlist,outdent,indent,|,link,unlink,image,|,blockquote,wrapAsCode,", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left", theme_advanced_statusbar_location : "none", @@ -50,6 +50,8 @@ class @HTMLEditingDescriptor theme_advanced_blockformats : "p,pre,h1,h2,h3", width: '100%', height: '400px', + menubar: false, + statusbar: false, setup : @setupTinyMCE, # Cannot get access to tinyMCE Editor instance (for focusing) until after it is rendered. # The tinyMCE callback passes in the editor as a paramter. @@ -75,10 +77,6 @@ class @HTMLEditingDescriptor ed.isNotDirty = false }) - ed.onNodeChange.add((editor, command, e) -> - command.setActive('wrapAsCode', e.nodeName == 'CODE') - ) - @visualEditor = ed ed.onExecCommand.add(@onExecCommandHandler)