Include Tinymce 4.6.1

CHANGES.rst

@@ -39,6 +39,9 @@ New features:
     - Add option for contextPath - objects with this path will not be selectable. This prevents the object where the relation is set on to from being selected and self-referenced.
   [thet]
 
+- Bring in TinyMCE 4.6.1
+  [frapell]
+
 Bug fixes:
 
 - Fixed path to tooltip less files.

bower.json

@@ -23,7 +23,7 @@
     "requirejs-text": "2.0.15",
     "select2": "3.5.4",
     "selectivizr": "1.0.2",
-    "tinymce-builded": "4.4.3"
+    "tinymce-builded": "4.6.1"
   },
   "devDependencies": {
     "expect": "0.3.1",

mockup/js/config.js

@@ -9,11 +9,11 @@
   var tinymcePlugins = [
     'advlist', 'anchor', 'autolink', 'autoresize', 'autosave', 'bbcode',
     'charmap', 'code', 'colorpicker', 'contextmenu', 'directionality',
-    'emoticons', 'fullpage', 'fullscreen', 'hr', 'image', 'importcss',
-    'insertdatetime', 'layer', 'legacyoutput', 'link', 'lists', 'media',
+    'emoticons', 'fullpage', 'fullscreen', 'help', 'hr', 'image', 'importcss',
+    'insertdatetime', 'legacyoutput', 'link', 'lists', 'media',
     'nonbreaking', 'noneditable', 'pagebreak', 'paste', 'preview', 'print',
     'save', 'searchreplace', 'spellchecker', 'tabfocus', 'table', 'template',
-    'textcolor', 'textpattern', 'visualblocks', 'visualchars', 'wordcount',
+    'textcolor', 'textpattern', 'toc', 'visualblocks', 'visualchars', 'wordcount',
     'compat3x'
   ];
 

mockup/patterns/tinymce/less/pattern.tinymce.less

@@ -1,5 +1,4 @@
-@import (less) "@{bowerPath}/tinymce-builded/js/tinymce/skins/lightgray/skin.less";
-@import (less) "@{bowerPath}/tinymce-builded/js/tinymce/skins/lightgray/Content.Objects.less";
+@import (less) "@{bowerPath}/tinymce-builded/js/tinymce/skins/lightgray/skin.min.css";
 @import (inline) "@{bowerPath}/tinymce-builded/js/tinymce/plugins/visualblocks/css/visualblocks.css";
 @import "@{mockupPath}/modal/pattern.modal.less";
 @import "@{mockupPath}/autotoc/pattern.autotoc.less";

mockup/patterns/tinymce/pattern.js

@@ -81,11 +81,11 @@ define([
   'tinymce-emoticons',
   'tinymce-fullpage',
   'tinymce-fullscreen',
+  'tinymce-help',
   'tinymce-hr',
   'tinymce-image',
   'tinymce-importcss',
   'tinymce-insertdatetime',
-  'tinymce-layer',
   'tinymce-legacyoutput',
   'tinymce-link',
   'tinymce-lists',
@@ -104,6 +104,7 @@ define([
   'tinymce-template',
   'tinymce-textcolor',
   'tinymce-textpattern',
+  'tinymce-toc',
   'tinymce-visualblocks',
   'tinymce-visualchars',
   'tinymce-wordcount',