diff --git a/e107_plugins/tinymce4/plugins/compat3x/plugin.js b/e107_plugins/tinymce4/plugins/compat3x/plugin.js
index 85b2e0578..92d433edc 100644
--- a/e107_plugins/tinymce4/plugins/compat3x/plugin.js
+++ b/e107_plugins/tinymce4/plugins/compat3x/plugin.js
@@ -1,8 +1,8 @@
 /**
  * plugin.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
@@ -19,279 +19,304 @@
  *  - No editor.onEvent
  *  - Can't cancel execCommands with beforeExecCommand
  */
-(function(tinymce) {
-	var reported;
+(function (tinymce) {
+  var reported;
 
-	function noop() {
-	}
+  function noop() {
+  }
 
-	function log(apiCall) {
-		if (!reported && window && window.console) {
-			reported = true;
-			console.log("Deprecated TinyMCE API call: " + apiCall);
-		}
-	}
+  function log(apiCall) {
+    if (!reported && window && window.console) {
+      reported = true;
+      console.log("Deprecated TinyMCE API call: " + apiCall);
+    }
+  }
 
-	function Dispatcher(target, newEventName, argsMap, defaultScope) {
-		target = target || this;
+  function Dispatcher(target, newEventName, argsMap, defaultScope) {
+    target = target || this;
+    var cbs = [];
 
-		if (!newEventName) {
-			this.add = this.addToTop = this.remove = this.dispatch = noop;
-			return;
-		}
+    if (!newEventName) {
+      this.add = this.addToTop = this.remove = this.dispatch = noop;
+      return;
+    }
 
-		this.add = function(callback, scope, prepend) {
-			log('<target>.on' + newEventName + ".add(..)");
+    this.add = function (callback, scope, prepend) {
+      log('<target>.on' + newEventName + ".add(..)");
 
-			// Convert callback({arg1:x, arg2:x}) -> callback(arg1, arg2)
-			function patchedEventCallback(e) {
-				var callbackArgs = [];
+      // Convert callback({arg1:x, arg2:x}) -> callback(arg1, arg2)
+      function patchedEventCallback(e) {
+        var callbackArgs = [];
 
-				if (typeof argsMap == "string") {
-					argsMap = argsMap.split(" ");
-				}
+        if (typeof argsMap == "string") {
+          argsMap = argsMap.split(" ");
+        }
 
-				if (argsMap && typeof argsMap != "function") {
-					for (var i = 0; i < argsMap.length; i++) {
-						callbackArgs.push(e[argsMap[i]]);
-					}
-				}
+        if (argsMap && typeof argsMap !== "function") {
+          for (var i = 0; i < argsMap.length; i++) {
+            callbackArgs.push(e[argsMap[i]]);
+          }
+        }
 
-				if (typeof argsMap == "function") {
-					callbackArgs = argsMap(newEventName, e, target);
-					if (!callbackArgs) {
-						return;
-					}
-				}
+        if (typeof argsMap == "function") {
+          callbackArgs = argsMap(newEventName, e, target);
+          if (!callbackArgs) {
+            return;
+          }
+        }
 
-				if (!argsMap) {
-					callbackArgs = [e];
-				}
+        if (!argsMap) {
+          callbackArgs = [e];
+        }
 
-				callbackArgs.unshift(defaultScope || target);
+        callbackArgs.unshift(defaultScope || target);
 
-				if (callback.apply(scope || defaultScope || target, callbackArgs) === false) {
-					e.stopImmediatePropagation();
-				}
-			}
+        if (callback.apply(scope || defaultScope || target, callbackArgs) === false) {
+          e.stopImmediatePropagation();
+        }
+      }
 
-			target.on(newEventName, patchedEventCallback, prepend);
+      target.on(newEventName, patchedEventCallback, prepend);
 
-			return patchedEventCallback;
-		};
+      var handlers = {
+        original: callback,
+        patched: patchedEventCallback
+      };
 
-		this.addToTop = function(callback, scope) {
-			this.add(callback, scope, true);
-		};
+      cbs.push(handlers);
+      return patchedEventCallback;
+    };
 
-		this.remove = function(callback) {
-			return target.off(newEventName, callback);
-		};
+    this.addToTop = function (callback, scope) {
+      this.add(callback, scope, true);
+    };
 
-		this.dispatch = function() {
-			target.fire(newEventName);
+    this.remove = function (callback) {
+      cbs.forEach(function (item, i) {
+        if (item.original === callback) {
+          cbs.splice(i, 1);
+          return target.off(newEventName, item.patched);
+        }
+      });
 
-			return true;
-		};
-	}
+      return target.off(newEventName, callback);
+    };
 
-	tinymce.util.Dispatcher = Dispatcher;
-	tinymce.onBeforeUnload = new Dispatcher(tinymce, "BeforeUnload");
-	tinymce.onAddEditor = new Dispatcher(tinymce, "AddEditor", "editor");
-	tinymce.onRemoveEditor = new Dispatcher(tinymce, "RemoveEditor", "editor");
+    this.dispatch = function () {
+      target.fire(newEventName);
+      return true;
+    };
+  }
 
-	tinymce.util.Cookie = {
-		get: noop, getHash: noop, remove: noop, set: noop, setHash: noop
-	};
+  tinymce.util.Dispatcher = Dispatcher;
+  tinymce.onBeforeUnload = new Dispatcher(tinymce, "BeforeUnload");
+  tinymce.onAddEditor = new Dispatcher(tinymce, "AddEditor", "editor");
+  tinymce.onRemoveEditor = new Dispatcher(tinymce, "RemoveEditor", "editor");
 
-	function patchEditor(editor) {
-		function patchEditorEvents(oldEventNames, argsMap) {
-			tinymce.each(oldEventNames.split(" "), function(oldName) {
-				editor["on" + oldName] = new Dispatcher(editor, oldName, argsMap);
-			});
-		}
+  tinymce.util.Cookie = {
+    get: noop, getHash: noop, remove: noop, set: noop, setHash: noop
+  };
 
-		function convertUndoEventArgs(type, event, target) {
-			return [
-				event.level,
-				target
-			];
-		}
+  function patchEditor(editor) {
 
-		function filterSelectionEvents(needsSelection) {
-			return function(type, e) {
-				if ((!e.selection && !needsSelection) || e.selection == needsSelection) {
-					return [e];
-				}
-			};
-		}
+    function translate(str) {
+      var prefix = editor.settings.language || "en";
+      var prefixedStr = [prefix, str].join('.');
+      var translatedStr = tinymce.i18n.translate(prefixedStr);
 
-		if (editor.controlManager) {
-			return;
-		}
+      return prefixedStr !== translatedStr ? translatedStr : tinymce.i18n.translate(str);
+    }
 
-		function cmNoop() {
-			var obj = {}, methods = 'add addMenu addSeparator collapse createMenu destroy displayColor expand focus ' +
-				'getLength hasMenus hideMenu isActive isCollapsed isDisabled isRendered isSelected mark ' +
-				'postRender remove removeAll renderHTML renderMenu renderNode renderTo select selectByIndex ' +
-				'setActive setAriaProperty setColor setDisabled setSelected setState showMenu update';
+    function patchEditorEvents(oldEventNames, argsMap) {
+      tinymce.each(oldEventNames.split(" "), function (oldName) {
+        editor["on" + oldName] = new Dispatcher(editor, oldName, argsMap);
+      });
+    }
 
-			log('editor.controlManager.*');
+    function convertUndoEventArgs(type, event, target) {
+      return [
+        event.level,
+        target
+      ];
+    }
 
-			function _noop() {
-				return cmNoop();
-			}
+    function filterSelectionEvents(needsSelection) {
+      return function (type, e) {
+        if ((!e.selection && !needsSelection) || e.selection == needsSelection) {
+          return [e];
+        }
+      };
+    }
 
-			tinymce.each(methods.split(' '), function(method) {
-				obj[method] = _noop;
-			});
+    if (editor.controlManager) {
+      return;
+    }
 
-			return obj;
-		}
+    function cmNoop() {
+      var obj = {}, methods = 'add addMenu addSeparator collapse createMenu destroy displayColor expand focus ' +
+        'getLength hasMenus hideMenu isActive isCollapsed isDisabled isRendered isSelected mark ' +
+        'postRender remove removeAll renderHTML renderMenu renderNode renderTo select selectByIndex ' +
+        'setActive setAriaProperty setColor setDisabled setSelected setState showMenu update';
 
-		editor.controlManager = {
-			buttons: {},
+      log('editor.controlManager.*');
 
-			setDisabled: function(name, state) {
-				log("controlManager.setDisabled(..)");
+      function _noop() {
+        return cmNoop();
+      }
 
-				if (this.buttons[name]) {
-					this.buttons[name].disabled(state);
-				}
-			},
+      tinymce.each(methods.split(' '), function (method) {
+        obj[method] = _noop;
+      });
 
-			setActive: function(name, state) {
-				log("controlManager.setActive(..)");
+      return obj;
+    }
 
-				if (this.buttons[name]) {
-					this.buttons[name].active(state);
-				}
-			},
+    editor.controlManager = {
+      buttons: {},
 
-			onAdd: new Dispatcher(),
-			onPostRender: new Dispatcher(),
+      setDisabled: function (name, state) {
+        log("controlManager.setDisabled(..)");
 
-			add: function(obj) {
-				return obj;
-			},
-			createButton: cmNoop,
-			createColorSplitButton: cmNoop,
-			createControl: cmNoop,
-			createDropMenu: cmNoop,
-			createListBox: cmNoop,
-			createMenuButton: cmNoop,
-			createSeparator: cmNoop,
-			createSplitButton: cmNoop,
-			createToolbar: cmNoop,
-			createToolbarGroup: cmNoop,
-			destroy: noop,
-			get: noop,
-			setControlType: cmNoop
-		};
+        if (this.buttons[name]) {
+          this.buttons[name].disabled(state);
+        }
+      },
 
-		patchEditorEvents("PreInit BeforeRenderUI PostRender Load Init Remove Activate Deactivate", "editor");
-		patchEditorEvents("Click MouseUp MouseDown DblClick KeyDown KeyUp KeyPress ContextMenu Paste Submit Reset");
-		patchEditorEvents("BeforeExecCommand ExecCommand", "command ui value args"); // args.terminate not supported
-		patchEditorEvents("PreProcess PostProcess LoadContent SaveContent Change");
-		patchEditorEvents("BeforeSetContent BeforeGetContent SetContent GetContent", filterSelectionEvents(false));
-		patchEditorEvents("SetProgressState", "state time");
-		patchEditorEvents("VisualAid", "element hasVisual");
-		patchEditorEvents("Undo Redo", convertUndoEventArgs);
+      setActive: function (name, state) {
+        log("controlManager.setActive(..)");
 
-		patchEditorEvents("NodeChange", function(type, e) {
-			return [
-				editor.controlManager,
-				e.element,
-				editor.selection.isCollapsed(),
-				e
-			];
-		});
+        if (this.buttons[name]) {
+          this.buttons[name].active(state);
+        }
+      },
 
-		var originalAddButton = editor.addButton;
-		editor.addButton = function(name, settings) {
-			var originalOnPostRender;
+      onAdd: new Dispatcher(),
+      onPostRender: new Dispatcher(),
 
-			function patchedPostRender() {
-				editor.controlManager.buttons[name] = this;
+      add: function (obj) {
+        return obj;
+      },
+      createButton: cmNoop,
+      createColorSplitButton: cmNoop,
+      createControl: cmNoop,
+      createDropMenu: cmNoop,
+      createListBox: cmNoop,
+      createMenuButton: cmNoop,
+      createSeparator: cmNoop,
+      createSplitButton: cmNoop,
+      createToolbar: cmNoop,
+      createToolbarGroup: cmNoop,
+      destroy: noop,
+      get: noop,
+      setControlType: cmNoop
+    };
 
-				if (originalOnPostRender) {
-					return originalOnPostRender.call(this);
-				}
-			}
+    patchEditorEvents("PreInit BeforeRenderUI PostRender Load Init Remove Activate Deactivate", "editor");
+    patchEditorEvents("Click MouseUp MouseDown DblClick KeyDown KeyUp KeyPress ContextMenu Paste Submit Reset");
+    patchEditorEvents("BeforeExecCommand ExecCommand", "command ui value args"); // args.terminate not supported
+    patchEditorEvents("PreProcess PostProcess LoadContent SaveContent Change");
+    patchEditorEvents("BeforeSetContent BeforeGetContent SetContent GetContent", filterSelectionEvents(false));
+    patchEditorEvents("SetProgressState", "state time");
+    patchEditorEvents("VisualAid", "element hasVisual");
+    patchEditorEvents("Undo Redo", convertUndoEventArgs);
 
-			for (var key in settings) {
-				if (key.toLowerCase() === "onpostrender") {
-					originalOnPostRender = settings[key];
-					settings.onPostRender = patchedPostRender;
-				}
-			}
+    patchEditorEvents("NodeChange", function (type, e) {
+      return [
+        editor.controlManager,
+        e.element,
+        editor.selection.isCollapsed(),
+        e
+      ];
+    });
 
-			if (!originalOnPostRender) {
-				settings.onPostRender = patchedPostRender;
-			}
+    var originalAddButton = editor.addButton;
+    editor.addButton = function (name, settings) {
+      var originalOnPostRender;
 
-			if (settings.title) {
-				settings.title = tinymce.i18n.translate((editor.settings.language || "en") + "." + settings.title);
-			}
+      function patchedPostRender() {
+        editor.controlManager.buttons[name] = this;
 
-			return originalAddButton.call(this, name, settings);
-		};
+        if (originalOnPostRender) {
+          return originalOnPostRender.apply(this, arguments);
+        }
+      }
 
-		editor.on('init', function() {
-			var undoManager = editor.undoManager, selection = editor.selection;
+      for (var key in settings) {
+        if (key.toLowerCase() === "onpostrender") {
+          originalOnPostRender = settings[key];
+          settings.onPostRender = patchedPostRender;
+        }
+      }
 
-			undoManager.onUndo = new Dispatcher(editor, "Undo", convertUndoEventArgs, null, undoManager);
-			undoManager.onRedo = new Dispatcher(editor, "Redo", convertUndoEventArgs, null, undoManager);
-			undoManager.onBeforeAdd = new Dispatcher(editor, "BeforeAddUndo", null, undoManager);
-			undoManager.onAdd = new Dispatcher(editor, "AddUndo", null, undoManager);
+      if (!originalOnPostRender) {
+        settings.onPostRender = patchedPostRender;
+      }
 
-			selection.onBeforeGetContent = new Dispatcher(editor, "BeforeGetContent", filterSelectionEvents(true), selection);
-			selection.onGetContent = new Dispatcher(editor, "GetContent", filterSelectionEvents(true), selection);
-			selection.onBeforeSetContent = new Dispatcher(editor, "BeforeSetContent", filterSelectionEvents(true), selection);
-			selection.onSetContent = new Dispatcher(editor, "SetContent", filterSelectionEvents(true), selection);
-		});
+      if (settings.title) {
+        settings.title = translate(settings.title);
+      }
 
-		editor.on('BeforeRenderUI', function() {
-			var windowManager = editor.windowManager;
+      return originalAddButton.call(this, name, settings);
+    };
 
-			windowManager.onOpen = new Dispatcher();
-			windowManager.onClose = new Dispatcher();
-			windowManager.createInstance = function(className, a, b, c, d, e) {
-				log("windowManager.createInstance(..)");
+    editor.on('init', function () {
+      var undoManager = editor.undoManager, selection = editor.selection;
 
-				var constr = tinymce.resolve(className);
-				return new constr(a, b, c, d, e);
-			};
-		});
-	}
+      undoManager.onUndo = new Dispatcher(editor, "Undo", convertUndoEventArgs, null, undoManager);
+      undoManager.onRedo = new Dispatcher(editor, "Redo", convertUndoEventArgs, null, undoManager);
+      undoManager.onBeforeAdd = new Dispatcher(editor, "BeforeAddUndo", null, undoManager);
+      undoManager.onAdd = new Dispatcher(editor, "AddUndo", null, undoManager);
 
-	tinymce.on('SetupEditor', patchEditor);
-	tinymce.PluginManager.add("compat3x", patchEditor);
+      selection.onBeforeGetContent = new Dispatcher(editor, "BeforeGetContent", filterSelectionEvents(true), selection);
+      selection.onGetContent = new Dispatcher(editor, "GetContent", filterSelectionEvents(true), selection);
+      selection.onBeforeSetContent = new Dispatcher(editor, "BeforeSetContent", filterSelectionEvents(true), selection);
+      selection.onSetContent = new Dispatcher(editor, "SetContent", filterSelectionEvents(true), selection);
+    });
 
-	tinymce.addI18n = function(prefix, o) {
-		var I18n = tinymce.util.I18n, each = tinymce.each;
+    editor.on('BeforeRenderUI', function () {
+      var windowManager = editor.windowManager;
 
-		if (typeof prefix == "string" && prefix.indexOf('.') === -1) {
-			I18n.add(prefix, o);
-			return;
-		}
+      windowManager.onOpen = new Dispatcher();
+      windowManager.onClose = new Dispatcher();
+      windowManager.createInstance = function (className, a, b, c, d, e) {
+        log("windowManager.createInstance(..)");
 
-		if (!tinymce.is(prefix, 'string')) {
-			each(prefix, function(o, lc) {
-				each(o, function(o, g) {
-					each(o, function(o, k) {
-						if (g === 'common') {
-							I18n.data[lc + '.' + k] = o;
-						} else {
-							I18n.data[lc + '.' + g + '.' + k] = o;
-						}
-					});
-				});
-			});
-		} else {
-			each(o, function(o, k) {
-				I18n.data[prefix + '.' + k] = o;
-			});
-		}
-	};
+        var constr = tinymce.resolve(className);
+        return new constr(a, b, c, d, e);
+      };
+    });
+  }
+
+  tinymce.on('SetupEditor', function (e) {
+    patchEditor(e.editor);
+  });
+
+  tinymce.PluginManager.add("compat3x", patchEditor);
+
+  tinymce.addI18n = function (prefix, o) {
+    var I18n = tinymce.util.I18n, each = tinymce.each;
+
+    if (typeof prefix == "string" && prefix.indexOf('.') === -1) {
+      I18n.add(prefix, o);
+      return;
+    }
+
+    if (!tinymce.is(prefix, 'string')) {
+      each(prefix, function (o, lc) {
+        each(o, function (o, g) {
+          each(o, function (o, k) {
+            if (g === 'common') {
+              I18n.data[lc + '.' + k] = o;
+            } else {
+              I18n.data[lc + '.' + g + '.' + k] = o;
+            }
+          });
+        });
+      });
+    } else {
+      each(o, function (o, k) {
+        I18n.data[prefix + '.' + k] = o;
+      });
+    }
+  };
 })(tinymce);
diff --git a/e107_plugins/tinymce4/plugins/compat3x/plugin.min.js b/e107_plugins/tinymce4/plugins/compat3x/plugin.min.js
index d9fee4629..8562cb7c7 100644
--- a/e107_plugins/tinymce4/plugins/compat3x/plugin.min.js
+++ b/e107_plugins/tinymce4/plugins/compat3x/plugin.min.js
@@ -1 +1 @@
-!function(a){function b(){}function c(a){!f&&window&&window.console&&(f=!0,console.log("Deprecated TinyMCE API call: "+a))}function d(a,d,e,f){return a=a||this,d?(this.add=function(b,g,h){function i(c){var h=[];if("string"==typeof e&&(e=e.split(" ")),e&&"function"!=typeof e)for(var i=0;i<e.length;i++)h.push(c[e[i]]);("function"!=typeof e||(h=e(d,c,a)))&&(e||(h=[c]),h.unshift(f||a),b.apply(g||f||a,h)===!1&&c.stopImmediatePropagation())}return c("<target>.on"+d+".add(..)"),a.on(d,i,h),i},this.addToTop=function(a,b){this.add(a,b,!0)},this.remove=function(b){return a.off(d,b)},void(this.dispatch=function(){return a.fire(d),!0})):void(this.add=this.addToTop=this.remove=this.dispatch=b)}function e(e){function f(b,c){a.each(b.split(" "),function(a){e["on"+a]=new d(e,a,c)})}function g(a,b,c){return[b.level,c]}function h(a){return function(b,c){return!c.selection&&!a||c.selection==a?[c]:void 0}}function i(){function b(){return i()}var d={},e="add addMenu addSeparator collapse createMenu destroy displayColor expand focus getLength hasMenus hideMenu isActive isCollapsed isDisabled isRendered isSelected mark postRender remove removeAll renderHTML renderMenu renderNode renderTo select selectByIndex setActive setAriaProperty setColor setDisabled setSelected setState showMenu update";return c("editor.controlManager.*"),a.each(e.split(" "),function(a){d[a]=b}),d}if(!e.controlManager){e.controlManager={buttons:{},setDisabled:function(a,b){c("controlManager.setDisabled(..)"),this.buttons[a]&&this.buttons[a].disabled(b)},setActive:function(a,b){c("controlManager.setActive(..)"),this.buttons[a]&&this.buttons[a].active(b)},onAdd:new d,onPostRender:new d,add:function(a){return a},createButton:i,createColorSplitButton:i,createControl:i,createDropMenu:i,createListBox:i,createMenuButton:i,createSeparator:i,createSplitButton:i,createToolbar:i,createToolbarGroup:i,destroy:b,get:b,setControlType:i},f("PreInit BeforeRenderUI PostRender Load Init Remove Activate Deactivate","editor"),f("Click MouseUp MouseDown DblClick KeyDown KeyUp KeyPress ContextMenu Paste Submit Reset"),f("BeforeExecCommand ExecCommand","command ui value args"),f("PreProcess PostProcess LoadContent SaveContent Change"),f("BeforeSetContent BeforeGetContent SetContent GetContent",h(!1)),f("SetProgressState","state time"),f("VisualAid","element hasVisual"),f("Undo Redo",g),f("NodeChange",function(a,b){return[e.controlManager,b.element,e.selection.isCollapsed(),b]});var j=e.addButton;e.addButton=function(b,c){function d(){return e.controlManager.buttons[b]=this,f?f.call(this):void 0}var f;for(var g in c)"onpostrender"===g.toLowerCase()&&(f=c[g],c.onPostRender=d);return f||(c.onPostRender=d),c.title&&(c.title=a.i18n.translate((e.settings.language||"en")+"."+c.title)),j.call(this,b,c)},e.on("init",function(){var a=e.undoManager,b=e.selection;a.onUndo=new d(e,"Undo",g,null,a),a.onRedo=new d(e,"Redo",g,null,a),a.onBeforeAdd=new d(e,"BeforeAddUndo",null,a),a.onAdd=new d(e,"AddUndo",null,a),b.onBeforeGetContent=new d(e,"BeforeGetContent",h(!0),b),b.onGetContent=new d(e,"GetContent",h(!0),b),b.onBeforeSetContent=new d(e,"BeforeSetContent",h(!0),b),b.onSetContent=new d(e,"SetContent",h(!0),b)}),e.on("BeforeRenderUI",function(){var b=e.windowManager;b.onOpen=new d,b.onClose=new d,b.createInstance=function(b,d,e,f,g,h){c("windowManager.createInstance(..)");var i=a.resolve(b);return new i(d,e,f,g,h)}})}}var f;a.util.Dispatcher=d,a.onBeforeUnload=new d(a,"BeforeUnload"),a.onAddEditor=new d(a,"AddEditor","editor"),a.onRemoveEditor=new d(a,"RemoveEditor","editor"),a.util.Cookie={get:b,getHash:b,remove:b,set:b,setHash:b},a.on("SetupEditor",e),a.PluginManager.add("compat3x",e),a.addI18n=function(b,c){var d=a.util.I18n,e=a.each;return"string"==typeof b&&-1===b.indexOf(".")?void d.add(b,c):void(a.is(b,"string")?e(c,function(a,c){d.data[b+"."+c]=a}):e(b,function(a,b){e(a,function(a,c){e(a,function(a,e){"common"===c?d.data[b+"."+e]=a:d.data[b+"."+c+"."+e]=a})})}))}}(tinymce);
\ No newline at end of file
+!function(u){var t;function l(){}function f(e){!t&&window&&window.console&&(t=!0,console.log("Deprecated TinyMCE API call: "+e))}function i(i,a,d,s){i=i||this;var c=[];a?(this.add=function(o,r,e){function t(e){var t=[];if("string"==typeof d&&(d=d.split(" ")),d&&"function"!=typeof d)for(var n=0;n<d.length;n++)t.push(e[d[n]]);("function"!=typeof d||(t=d(a,e,i)))&&(d||(t=[e]),t.unshift(s||i),!1===o.apply(r||s||i,t)&&e.stopImmediatePropagation())}f("<target>.on"+a+".add(..)"),i.on(a,t,e);var n={original:o,patched:t};return c.push(n),t},this.addToTop=function(e,t){this.add(e,t,!0)},this.remove=function(n){return c.forEach(function(e,t){if(e.original===n)return c.splice(t,1),i.off(a,e.patched)}),i.off(a,n)},this.dispatch=function(){return i.fire(a),!0}):this.add=this.addToTop=this.remove=this.dispatch=l}function n(s){function e(e,t){u.each(e.split(" "),function(e){s["on"+e]=new i(s,e,t)})}function n(e,t,n){return[t.level,n]}function o(n){return function(e,t){if(!t.selection&&!n||t.selection==n)return[t]}}if(!s.controlManager){s.controlManager={buttons:{},setDisabled:function(e,t){f("controlManager.setDisabled(..)"),this.buttons[e]&&this.buttons[e].disabled(t)},setActive:function(e,t){f("controlManager.setActive(..)"),this.buttons[e]&&this.buttons[e].active(t)},onAdd:new i,onPostRender:new i,add:function(e){return e},createButton:r,createColorSplitButton:r,createControl:r,createDropMenu:r,createListBox:r,createMenuButton:r,createSeparator:r,createSplitButton:r,createToolbar:r,createToolbarGroup:r,destroy:l,get:l,setControlType:r},e("PreInit BeforeRenderUI PostRender Load Init Remove Activate Deactivate","editor"),e("Click MouseUp MouseDown DblClick KeyDown KeyUp KeyPress ContextMenu Paste Submit Reset"),e("BeforeExecCommand ExecCommand","command ui value args"),e("PreProcess PostProcess LoadContent SaveContent Change"),e("BeforeSetContent BeforeGetContent SetContent GetContent",o(!1)),e("SetProgressState","state time"),e("VisualAid","element hasVisual"),e("Undo Redo",n),e("NodeChange",function(e,t){return[s.controlManager,t.element,s.selection.isCollapsed(),t]});var c=s.addButton;s.addButton=function(e,t){var n,o,r,i;function a(){if(s.controlManager.buttons[e]=this,n)return n.apply(this,arguments)}for(var d in t)"onpostrender"===d.toLowerCase()&&(n=t[d],t.onPostRender=a);return n||(t.onPostRender=a),t.title&&(t.title=(o=t.title,r=[s.settings.language||"en",o].join("."),i=u.i18n.translate(r),r!==i?i:u.i18n.translate(o))),c.call(this,e,t)},s.on("init",function(){var e=s.undoManager,t=s.selection;e.onUndo=new i(s,"Undo",n,null,e),e.onRedo=new i(s,"Redo",n,null,e),e.onBeforeAdd=new i(s,"BeforeAddUndo",null,e),e.onAdd=new i(s,"AddUndo",null,e),t.onBeforeGetContent=new i(s,"BeforeGetContent",o(!0),t),t.onGetContent=new i(s,"GetContent",o(!0),t),t.onBeforeSetContent=new i(s,"BeforeSetContent",o(!0),t),t.onSetContent=new i(s,"SetContent",o(!0),t)}),s.on("BeforeRenderUI",function(){var e=s.windowManager;e.onOpen=new i,e.onClose=new i,e.createInstance=function(e,t,n,o,r,i){return f("windowManager.createInstance(..)"),new(u.resolve(e))(t,n,o,r,i)}})}function r(){var t={};function n(){return r()}return f("editor.controlManager.*"),u.each("add addMenu addSeparator collapse createMenu destroy displayColor expand focus getLength hasMenus hideMenu isActive isCollapsed isDisabled isRendered isSelected mark postRender remove removeAll renderHTML renderMenu renderNode renderTo select selectByIndex setActive setAriaProperty setColor setDisabled setSelected setState showMenu update".split(" "),function(e){t[e]=n}),t}}u.util.Dispatcher=i,u.onBeforeUnload=new i(u,"BeforeUnload"),u.onAddEditor=new i(u,"AddEditor","editor"),u.onRemoveEditor=new i(u,"RemoveEditor","editor"),u.util.Cookie={get:l,getHash:l,remove:l,set:l,setHash:l},u.on("SetupEditor",function(e){n(e.editor)}),u.PluginManager.add("compat3x",n),u.addI18n=function(n,e){var r=u.util.I18n,t=u.each;"string"!=typeof n||-1!==n.indexOf(".")?u.is(n,"string")?t(e,function(e,t){r.data[n+"."+t]=e}):t(n,function(e,o){t(e,function(e,n){t(e,function(e,t){"common"===n?r.data[o+"."+t]=e:r.data[o+"."+n+"."+t]=e})})}):r.add(n,e)}}(tinymce);
\ No newline at end of file
diff --git a/e107_plugins/tinymce4/plugins/compat3x/tiny_mce_popup.js b/e107_plugins/tinymce4/plugins/compat3x/tiny_mce_popup.js
index 733f4397e..92e87effe 100644
--- a/e107_plugins/tinymce4/plugins/compat3x/tiny_mce_popup.js
+++ b/e107_plugins/tinymce4/plugins/compat3x/tiny_mce_popup.js
@@ -1,8 +1,8 @@
 /**
- * Popup.js
+ * tinymce_mce_popup.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
@@ -19,524 +19,524 @@ var tinymce, tinyMCE;
  * @class tinyMCEPopup
  */
 var tinyMCEPopup = {
-	/**
-	 * Initializes the popup this will be called automatically.
-	 *
-	 * @method init
-	 */
-	init: function() {
-		var self = this, parentWin, settings, uiWindow;
-
-		// Find window & API
-		parentWin = self.getWin();
-		tinymce = tinyMCE = parentWin.tinymce;
-		self.editor = tinymce.EditorManager.activeEditor;
-		self.params = self.editor.windowManager.getParams();
-
-		uiWindow = self.editor.windowManager.windows[self.editor.windowManager.windows.length - 1];
-		self.features = uiWindow.features;
-		self.uiWindow = uiWindow;
-
-		settings = self.editor.settings;
-
-		// Setup popup CSS path(s)
-		if (settings.popup_css !== false) {
-			if (settings.popup_css) {
-				settings.popup_css = self.editor.documentBaseURI.toAbsolute(settings.popup_css);
-			} else {
-				settings.popup_css = self.editor.baseURI.toAbsolute("plugins/compat3x/css/dialog.css");
-			}
-		}
-
-		if (settings.popup_css_add) {
-			settings.popup_css += ',' + self.editor.documentBaseURI.toAbsolute(settings.popup_css_add);
-		}
-
-		// Setup local DOM
-		self.dom = self.editor.windowManager.createInstance('tinymce.dom.DOMUtils', document, {
-			ownEvents: true,
-			proxy: tinyMCEPopup._eventProxy
-		});
-
-		self.dom.bind(window, 'ready', self._onDOMLoaded, self);
-
-		// Enables you to skip loading the default css
-		if (self.features.popup_css !== false) {
-			self.dom.loadCSS(self.features.popup_css || self.editor.settings.popup_css);
-		}
-
-		// Setup on init listeners
-		self.listeners = [];
-
-		/**
-		 * Fires when the popup is initialized.
-		 *
-		 * @event onInit
-		 * @param {tinymce.Editor} editor Editor instance.
-		 * @example
-		 * // Alerts the selected contents when the dialog is loaded
-		 * tinyMCEPopup.onInit.add(function(ed) {
-		 *     alert(ed.selection.getContent());
-		 * });
-		 * 
-		 * // Executes the init method on page load in some object using the SomeObject scope
-		 * tinyMCEPopup.onInit.add(SomeObject.init, SomeObject);
-		 */
-		self.onInit = {
-			add: function(func, scope) {
-				self.listeners.push({func : func, scope : scope});
-			}
-		};
-
-		self.isWindow = !self.getWindowArg('mce_inline');
-		self.id = self.getWindowArg('mce_window_id');
-	},
-
-	/**
-	 * Returns the reference to the parent window that opened the dialog.
-	 *
-	 * @method getWin
-	 * @return {Window} Reference to the parent window that opened the dialog.
-	 */
-	getWin: function() {
-		// Added frameElement check to fix bug: #2817583
-		return (!window.frameElement && window.dialogArguments) || opener || parent || top;
-	},
-
-	/**
-	 * Returns a window argument/parameter by name.
-	 *
-	 * @method getWindowArg
-	 * @param {String} name Name of the window argument to retrive.
-	 * @param {String} defaultValue Optional default value to return.
-	 * @return {String} Argument value or default value if it wasn't found.
-	 */
-	getWindowArg : function(name, defaultValue) {
-		var value = this.params[name];
-
-		return tinymce.is(value) ? value : defaultValue;
-	},
-
-	/**
-	 * Returns a editor parameter/config option value.
-	 *
-	 * @method getParam
-	 * @param {String} name Name of the editor config option to retrive.
-	 * @param {String} defaultValue Optional default value to return.
-	 * @return {String} Parameter value or default value if it wasn't found.
-	 */
-	getParam : function(name, defaultValue) {
-		return this.editor.getParam(name, defaultValue);
-	},
-
-	/**
-	 * Returns a language item by key.
-	 *
-	 * @method getLang
-	 * @param {String} name Language item like mydialog.something.
-	 * @param {String} defaultValue Optional default value to return.
-	 * @return {String} Language value for the item like "my string" or the default value if it wasn't found.
-	 */
-	getLang : function(name, defaultValue) {
-		return this.editor.getLang(name, defaultValue);
-	},
-
-	/**
-	 * Executed a command on editor that opened the dialog/popup.
-	 *
-	 * @method execCommand
-	 * @param {String} cmd Command to execute.
-	 * @param {Boolean} ui Optional boolean value if the UI for the command should be presented or not.
-	 * @param {Object} val Optional value to pass with the comman like an URL.
-	 * @param {Object} a Optional arguments object.
-	 */
-	execCommand : function(cmd, ui, val, args) {
-		args = args || {};
-		args.skip_focus = 1;
-
-		this.restoreSelection();
-		return this.editor.execCommand(cmd, ui, val, args);
-	},
-
-	/**
-	 * Resizes the dialog to the inner size of the window. This is needed since various browsers
-	 * have different border sizes on windows.
-	 *
-	 * @method resizeToInnerSize
-	 */
-	resizeToInnerSize : function() {
-		/*var self = this;
-
-		// Detach it to workaround a Chrome specific bug
-		// https://sourceforge.net/tracker/?func=detail&atid=635682&aid=2926339&group_id=103281
-		setTimeout(function() {
-			var vp = self.dom.getViewPort(window);
-
-			self.editor.windowManager.resizeBy(
-				self.getWindowArg('mce_width') - vp.w,
-				self.getWindowArg('mce_height') - vp.h,
-				self.id || window
-			);
-		}, 10);*/
-	},
-
-	/**
-	 * Will executed the specified string when the page has been loaded. This function
-	 * was added for compatibility with the 2.x branch.
-	 *
-	 * @method executeOnLoad
-	 * @param {String} evil String to evalutate on init.
-	 */
-	executeOnLoad : function(evil) {
-		this.onInit.add(function() {
-			eval(evil);
-		});
-	},
-
-	/**
-	 * Stores the current editor selection for later restoration. This can be useful since some browsers
-	 * looses it's selection if a control element is selected/focused inside the dialogs.
-	 *
-	 * @method storeSelection
-	 */
-	storeSelection : function() {
-		this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark(1);
-	},
-
-	/**
-	 * Restores any stored selection. This can be useful since some browsers
-	 * looses it's selection if a control element is selected/focused inside the dialogs.
-	 *
-	 * @method restoreSelection
-	 */
-	restoreSelection : function() {
-		var self = tinyMCEPopup;
-
-		if (!self.isWindow && tinymce.isIE) {
-			self.editor.selection.moveToBookmark(self.editor.windowManager.bookmark);
-		}
-	},
-
-	/**
-	 * Loads a specific dialog language pack. If you pass in plugin_url as a argument
-	 * when you open the window it will load the <plugin url>/langs/<code>_dlg.js lang pack file.
-	 *
-	 * @method requireLangPack
-	 */
-	requireLangPack : function() {
-		var self = this, url = self.getWindowArg('plugin_url') || self.getWindowArg('theme_url'), settings = self.editor.settings, lang;
-
-		if (settings.language !== false) {
-			lang = settings.language || "en";
-		}
-
-		if (url && lang && self.features.translate_i18n !== false && settings.language_load !== false) {
-			url += '/langs/' + lang + '_dlg.js';
-
-			if (!tinymce.ScriptLoader.isDone(url)) {
-				document.write('<script type="text/javascript" src="' + url + '"></script>');
-				tinymce.ScriptLoader.markDone(url);
-			}
-		}
-	},
-
-	/**
-	 * Executes a color picker on the specified element id. When the user
-	 * then selects a color it will be set as the value of the specified element.
-	 *
-	 * @method pickColor
-	 * @param {DOMEvent} e DOM event object.
-	 * @param {string} element_id Element id to be filled with the color value from the picker.
-	 */
-	pickColor : function(e, element_id) {
-		var el = document.getElementById(element_id), colorPickerCallback = this.editor.settings.color_picker_callback;
-		if (colorPickerCallback) {
-			colorPickerCallback.call(
-				this.editor,
-				function (value) {
-					el.value = value;
-					try {
-						el.onchange();
-					} catch (ex) {
-						// Try fire event, ignore errors
-					}
-				},
-				el.value
-			);
-		}
-	},
-
-	/**
-	 * Opens a filebrowser/imagebrowser this will set the output value from
-	 * the browser as a value on the specified element.
-	 *
-	 * @method openBrowser
-	 * @param {string} element_id Id of the element to set value in.
-	 * @param {string} type Type of browser to open image/file/flash.
-	 * @param {string} option Option name to get the file_broswer_callback function name from.
-	 */
-	openBrowser : function(element_id, type) {
-		tinyMCEPopup.restoreSelection();
-		this.editor.execCallback('file_browser_callback', element_id, document.getElementById(element_id).value, type, window);
-	},
-
-	/**
-	 * Creates a confirm dialog. Please don't use the blocking behavior of this
-	 * native version use the callback method instead then it can be extended.
-	 *
-	 * @method confirm
-	 * @param {String} t Title for the new confirm dialog.
-	 * @param {function} cb Callback function to be executed after the user has selected ok or cancel.
-	 * @param {Object} s Optional scope to execute the callback in.
-	 */
-	confirm : function(t, cb, s) {
-		this.editor.windowManager.confirm(t, cb, s, window);
-	},
-
-	/**
-	 * Creates a alert dialog. Please don't use the blocking behavior of this
-	 * native version use the callback method instead then it can be extended.
-	 *
-	 * @method alert
-	 * @param {String} tx Title for the new alert dialog.
-	 * @param {function} cb Callback function to be executed after the user has selected ok.
-	 * @param {Object} s Optional scope to execute the callback in.
-	 */
-	alert : function(tx, cb, s) {
-		this.editor.windowManager.alert(tx, cb, s, window);
-	},
-
-	/**
-	 * Closes the current window.
-	 *
-	 * @method close
-	 */
-	close : function() {
-		var t = this;
-
-		// To avoid domain relaxing issue in Opera
-		function close() {
-			t.editor.windowManager.close(window);
-			tinymce = tinyMCE = t.editor = t.params = t.dom = t.dom.doc = null; // Cleanup
-		}
-
-		if (tinymce.isOpera) {
-			t.getWin().setTimeout(close, 0);
-		} else {
-			close();
-		}
-	},
-
-	// Internal functions	
-
-	_restoreSelection : function() {
-		var e = window.event.srcElement;
-
-		if (e.nodeName == 'INPUT' && (e.type == 'submit' || e.type == 'button')) {
-			tinyMCEPopup.restoreSelection();
-		}
-	},
-
-/*	_restoreSelection : function() {
-		var e = window.event.srcElement;
-
-		// If user focus a non text input or textarea
-		if ((e.nodeName != 'INPUT' && e.nodeName != 'TEXTAREA') || e.type != 'text')
-			tinyMCEPopup.restoreSelection();
-	},*/
-
-	_onDOMLoaded : function() {
-		var t = tinyMCEPopup, ti = document.title, h, nv;
-
-		// Translate page
-		if (t.features.translate_i18n !== false) {
-			var map = {
-				"update": "Ok",
-				"insert": "Ok",
-				"cancel": "Cancel",
-				"not_set": "--",
-				"class_name": "Class name",
-				"browse": "Browse"
-			};
-
-			var langCode = tinymce.settings.language || 'en';
-			for (var key in map) {
-				tinymce.i18n.data[langCode + "." + key] = tinymce.i18n.translate(map[key]);
-			}
-
-			h = document.body.innerHTML;
-
-			// Replace a=x with a="x" in IE
-			if (tinymce.isIE) {
-				h = h.replace(/ (value|title|alt)=([^"][^\s>]+)/gi, ' $1="$2"');
-			}
-
-			document.dir = t.editor.getParam('directionality','');
-
-			if ((nv = t.editor.translate(h)) && nv != h) {
-				document.body.innerHTML = nv;
-			}
-
-			if ((nv = t.editor.translate(ti)) && nv != ti) {
-				document.title = ti = nv;
-			}
-		}
-
-		if (!t.editor.getParam('browser_preferred_colors', false) || !t.isWindow) {
-			t.dom.addClass(document.body, 'forceColors');
-		}
-
-		document.body.style.display = '';
-
-		// Restore selection in IE when focus is placed on a non textarea or input element of the type text
-		if (tinymce.Env.ie) {
-			if (tinymce.Env.ie < 11) {
-				document.attachEvent('onmouseup', tinyMCEPopup._restoreSelection);
-
-				// Add base target element for it since it would fail with modal dialogs
-				t.dom.add(t.dom.select('head')[0], 'base', {target: '_self'});
-			} else {
-				document.addEventListener('mouseup', tinyMCEPopup._restoreSelection, false);
-			}
-		}
-
-		t.restoreSelection();
-		t.resizeToInnerSize();
-
-		// Set inline title
-		if (!t.isWindow) {
-			t.editor.windowManager.setTitle(window, ti);
-		} else {
-			window.focus();
-		}
-
-		if (!tinymce.isIE && !t.isWindow) {
-			t.dom.bind(document, 'focus', function() {
-				t.editor.windowManager.focus(t.id);
-			});
-		}
-
-		// Patch for accessibility
-		tinymce.each(t.dom.select('select'), function(e) {
-			e.onkeydown = tinyMCEPopup._accessHandler;
-		});
-
-		// Call onInit
-		// Init must be called before focus so the selection won't get lost by the focus call
-		tinymce.each(t.listeners, function(o) {
-			o.func.call(o.scope, t.editor);
-		});
-
-		// Move focus to window
-		if (t.getWindowArg('mce_auto_focus', true)) {
-			window.focus();
-
-			// Focus element with mceFocus class
-			tinymce.each(document.forms, function(f) {
-				tinymce.each(f.elements, function(e) {
-					if (t.dom.hasClass(e, 'mceFocus') && !e.disabled) {
-						e.focus();
-						return false; // Break loop
-					}
-				});
-			});
-		}
-
-		document.onkeyup = tinyMCEPopup._closeWinKeyHandler;
-
-		if ('textContent' in document) {
-			t.uiWindow.getEl('head').firstChild.textContent = document.title;
-		} else {
-			t.uiWindow.getEl('head').firstChild.innerText = document.title;
-		}
-	},
-
-	_accessHandler : function(e) {
-		e = e || window.event;
-
-		if (e.keyCode == 13 || e.keyCode == 32) {
-			var elm = e.target || e.srcElement;
-
-			if (elm.onchange) {
-				elm.onchange();
-			}
-
-			return tinymce.dom.Event.cancel(e);
-		}
-	},
-
-	_closeWinKeyHandler : function(e) {
-		e = e || window.event;
-
-		if (e.keyCode == 27) {
-			tinyMCEPopup.close();
-		}
-	},
-
-	_eventProxy: function(id) {
-		return function(evt) {
-			tinyMCEPopup.dom.events.callNativeHandler(id, evt);
-		};
-	}
+  /**
+   * Initializes the popup this will be called automatically.
+   *
+   * @method init
+   */
+  init: function () {
+    var self = this, parentWin, settings, uiWindow;
+
+    // Find window & API
+    parentWin = self.getWin();
+    tinymce = tinyMCE = parentWin.tinymce;
+    self.editor = tinymce.EditorManager.activeEditor;
+    self.params = self.editor.windowManager.getParams();
+
+    uiWindow = self.editor.windowManager.windows[self.editor.windowManager.windows.length - 1];
+    self.features = uiWindow.features;
+    self.uiWindow = uiWindow;
+
+    settings = self.editor.settings;
+
+    // Setup popup CSS path(s)
+    if (settings.popup_css !== false) {
+      if (settings.popup_css) {
+        settings.popup_css = self.editor.documentBaseURI.toAbsolute(settings.popup_css);
+      } else {
+        settings.popup_css = self.editor.baseURI.toAbsolute("plugins/compat3x/css/dialog.css");
+      }
+    }
+
+    if (settings.popup_css_add) {
+      settings.popup_css += ',' + self.editor.documentBaseURI.toAbsolute(settings.popup_css_add);
+    }
+
+    // Setup local DOM
+    self.dom = self.editor.windowManager.createInstance('tinymce.dom.DOMUtils', document, {
+      ownEvents: true,
+      proxy: tinyMCEPopup._eventProxy
+    });
+
+    self.dom.bind(window, 'ready', self._onDOMLoaded, self);
+
+    // Enables you to skip loading the default css
+    if (self.features.popup_css !== false) {
+      self.dom.loadCSS(self.features.popup_css || self.editor.settings.popup_css);
+    }
+
+    // Setup on init listeners
+    self.listeners = [];
+
+    /**
+     * Fires when the popup is initialized.
+     *
+     * @event onInit
+     * @param {tinymce.Editor} editor Editor instance.
+     * @example
+     * // Alerts the selected contents when the dialog is loaded
+     * tinyMCEPopup.onInit.add(function(ed) {
+     *     alert(ed.selection.getContent());
+     * });
+     *
+     * // Executes the init method on page load in some object using the SomeObject scope
+     * tinyMCEPopup.onInit.add(SomeObject.init, SomeObject);
+     */
+    self.onInit = {
+      add: function (func, scope) {
+        self.listeners.push({ func: func, scope: scope });
+      }
+    };
+
+    self.isWindow = !self.getWindowArg('mce_inline');
+    self.id = self.getWindowArg('mce_window_id');
+  },
+
+  /**
+   * Returns the reference to the parent window that opened the dialog.
+   *
+   * @method getWin
+   * @return {Window} Reference to the parent window that opened the dialog.
+   */
+  getWin: function () {
+    // Added frameElement check to fix bug: #2817583
+    return (!window.frameElement && window.dialogArguments) || opener || parent || top;
+  },
+
+  /**
+   * Returns a window argument/parameter by name.
+   *
+   * @method getWindowArg
+   * @param {String} name Name of the window argument to retrieve.
+   * @param {String} defaultValue Optional default value to return.
+   * @return {String} Argument value or default value if it wasn't found.
+   */
+  getWindowArg: function (name, defaultValue) {
+    var value = this.params[name];
+
+    return tinymce.is(value) ? value : defaultValue;
+  },
+
+  /**
+   * Returns a editor parameter/config option value.
+   *
+   * @method getParam
+   * @param {String} name Name of the editor config option to retrieve.
+   * @param {String} defaultValue Optional default value to return.
+   * @return {String} Parameter value or default value if it wasn't found.
+   */
+  getParam: function (name, defaultValue) {
+    return this.editor.getParam(name, defaultValue);
+  },
+
+  /**
+   * Returns a language item by key.
+   *
+   * @method getLang
+   * @param {String} name Language item like mydialog.something.
+   * @param {String} defaultValue Optional default value to return.
+   * @return {String} Language value for the item like "my string" or the default value if it wasn't found.
+   */
+  getLang: function (name, defaultValue) {
+    return this.editor.getLang(name, defaultValue);
+  },
+
+  /**
+   * Executed a command on editor that opened the dialog/popup.
+   *
+   * @method execCommand
+   * @param {String} cmd Command to execute.
+   * @param {Boolean} ui Optional boolean value if the UI for the command should be presented or not.
+   * @param {Object} val Optional value to pass with the comman like an URL.
+   * @param {Object} a Optional arguments object.
+   */
+  execCommand: function (cmd, ui, val, args) {
+    args = args || {};
+    args.skip_focus = 1;
+
+    this.restoreSelection();
+    return this.editor.execCommand(cmd, ui, val, args);
+  },
+
+  /**
+   * Resizes the dialog to the inner size of the window. This is needed since various browsers
+   * have different border sizes on windows.
+   *
+   * @method resizeToInnerSize
+   */
+  resizeToInnerSize: function () {
+    /*var self = this;
+
+    // Detach it to workaround a Chrome specific bug
+    // https://sourceforge.net/tracker/?func=detail&atid=635682&aid=2926339&group_id=103281
+    setTimeout(function() {
+      var vp = self.dom.getViewPort(window);
+
+      self.editor.windowManager.resizeBy(
+        self.getWindowArg('mce_width') - vp.w,
+        self.getWindowArg('mce_height') - vp.h,
+        self.id || window
+      );
+    }, 10);*/
+  },
+
+  /**
+   * Will executed the specified string when the page has been loaded. This function
+   * was added for compatibility with the 2.x branch.
+   *
+   * @method executeOnLoad
+   * @param {String} evil String to evalutate on init.
+   */
+  executeOnLoad: function (evil) {
+    this.onInit.add(function () {
+      eval(evil);
+    });
+  },
+
+  /**
+   * Stores the current editor selection for later restoration. This can be useful since some browsers
+   * looses it's selection if a control element is selected/focused inside the dialogs.
+   *
+   * @method storeSelection
+   */
+  storeSelection: function () {
+    this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark(1);
+  },
+
+  /**
+   * Restores any stored selection. This can be useful since some browsers
+   * looses it's selection if a control element is selected/focused inside the dialogs.
+   *
+   * @method restoreSelection
+   */
+  restoreSelection: function () {
+    var self = tinyMCEPopup;
+
+    if (!self.isWindow && tinymce.isIE) {
+      self.editor.selection.moveToBookmark(self.editor.windowManager.bookmark);
+    }
+  },
+
+  /**
+   * Loads a specific dialog language pack. If you pass in plugin_url as a argument
+   * when you open the window it will load the <plugin url>/langs/<code>_dlg.js lang pack file.
+   *
+   * @method requireLangPack
+   */
+  requireLangPack: function () {
+    var self = this, url = self.getWindowArg('plugin_url') || self.getWindowArg('theme_url'), settings = self.editor.settings, lang;
+
+    if (settings.language !== false) {
+      lang = settings.language || "en";
+    }
+
+    if (url && lang && self.features.translate_i18n !== false && settings.language_load !== false) {
+      url += '/langs/' + lang + '_dlg.js';
+
+      if (!tinymce.ScriptLoader.isDone(url)) {
+        document.write('<script type="text/javascript" src="' + url + '"></script>');
+        tinymce.ScriptLoader.markDone(url);
+      }
+    }
+  },
+
+  /**
+   * Executes a color picker on the specified element id. When the user
+   * then selects a color it will be set as the value of the specified element.
+   *
+   * @method pickColor
+   * @param {DOMEvent} e DOM event object.
+   * @param {string} element_id Element id to be filled with the color value from the picker.
+   */
+  pickColor: function (e, element_id) {
+    var el = document.getElementById(element_id), colorPickerCallback = this.editor.settings.color_picker_callback;
+    if (colorPickerCallback) {
+      colorPickerCallback.call(
+        this.editor,
+        function (value) {
+          el.value = value;
+          try {
+            el.onchange();
+          } catch (ex) {
+            // Try fire event, ignore errors
+          }
+        },
+        el.value
+      );
+    }
+  },
+
+  /**
+   * Opens a filebrowser/imagebrowser this will set the output value from
+   * the browser as a value on the specified element.
+   *
+   * @method openBrowser
+   * @param {string} element_id Id of the element to set value in.
+   * @param {string} type Type of browser to open image/file/flash.
+   * @param {string} option Option name to get the file_broswer_callback function name from.
+   */
+  openBrowser: function (element_id, type) {
+    tinyMCEPopup.restoreSelection();
+    this.editor.execCallback('file_browser_callback', element_id, document.getElementById(element_id).value, type, window);
+  },
+
+  /**
+   * Creates a confirm dialog. Please don't use the blocking behavior of this
+   * native version use the callback method instead then it can be extended.
+   *
+   * @method confirm
+   * @param {String} t Title for the new confirm dialog.
+   * @param {function} cb Callback function to be executed after the user has selected ok or cancel.
+   * @param {Object} s Optional scope to execute the callback in.
+   */
+  confirm: function (t, cb, s) {
+    this.editor.windowManager.confirm(t, cb, s, window);
+  },
+
+  /**
+   * Creates a alert dialog. Please don't use the blocking behavior of this
+   * native version use the callback method instead then it can be extended.
+   *
+   * @method alert
+   * @param {String} tx Title for the new alert dialog.
+   * @param {function} cb Callback function to be executed after the user has selected ok.
+   * @param {Object} s Optional scope to execute the callback in.
+   */
+  alert: function (tx, cb, s) {
+    this.editor.windowManager.alert(tx, cb, s, window);
+  },
+
+  /**
+   * Closes the current window.
+   *
+   * @method close
+   */
+  close: function () {
+    var t = this;
+
+    // To avoid domain relaxing issue in Opera
+    function close() {
+      t.editor.windowManager.close(window);
+      tinymce = tinyMCE = t.editor = t.params = t.dom = t.dom.doc = null; // Cleanup
+    }
+
+    if (tinymce.isOpera) {
+      t.getWin().setTimeout(close, 0);
+    } else {
+      close();
+    }
+  },
+
+  // Internal functions
+
+  _restoreSelection: function () {
+    var e = window.event.srcElement;
+
+    if (e.nodeName == 'INPUT' && (e.type == 'submit' || e.type == 'button')) {
+      tinyMCEPopup.restoreSelection();
+    }
+  },
+
+  /* _restoreSelection : function() {
+      var e = window.event.srcElement;
+
+      // If user focus a non text input or textarea
+      if ((e.nodeName != 'INPUT' && e.nodeName != 'TEXTAREA') || e.type != 'text')
+        tinyMCEPopup.restoreSelection();
+    },*/
+
+  _onDOMLoaded: function () {
+    var t = tinyMCEPopup, ti = document.title, h, nv;
+
+    // Translate page
+    if (t.features.translate_i18n !== false) {
+      var map = {
+        "update": "Ok",
+        "insert": "Ok",
+        "cancel": "Cancel",
+        "not_set": "--",
+        "class_name": "Class name",
+        "browse": "Browse"
+      };
+
+      var langCode = (tinymce.settings ? tinymce.settings : t.editor.settings).language || 'en';
+      for (var key in map) {
+        tinymce.i18n.data[langCode + "." + key] = tinymce.i18n.translate(map[key]);
+      }
+
+      h = document.body.innerHTML;
+
+      // Replace a=x with a="x" in IE
+      if (tinymce.isIE) {
+        h = h.replace(/ (value|title|alt)=([^"][^\s>]+)/gi, ' $1="$2"');
+      }
+
+      document.dir = t.editor.getParam('directionality', '');
+
+      if ((nv = t.editor.translate(h)) && nv != h) {
+        document.body.innerHTML = nv;
+      }
+
+      if ((nv = t.editor.translate(ti)) && nv != ti) {
+        document.title = ti = nv;
+      }
+    }
+
+    if (!t.editor.getParam('browser_preferred_colors', false) || !t.isWindow) {
+      t.dom.addClass(document.body, 'forceColors');
+    }
+
+    document.body.style.display = '';
+
+    // Restore selection in IE when focus is placed on a non textarea or input element of the type text
+    if (tinymce.Env.ie) {
+      if (tinymce.Env.ie < 11) {
+        document.attachEvent('onmouseup', tinyMCEPopup._restoreSelection);
+
+        // Add base target element for it since it would fail with modal dialogs
+        t.dom.add(t.dom.select('head')[0], 'base', { target: '_self' });
+      } else {
+        document.addEventListener('mouseup', tinyMCEPopup._restoreSelection, false);
+      }
+    }
+
+    t.restoreSelection();
+    t.resizeToInnerSize();
+
+    // Set inline title
+    if (!t.isWindow) {
+      t.editor.windowManager.setTitle(window, ti);
+    } else {
+      window.focus();
+    }
+
+    if (!tinymce.isIE && !t.isWindow) {
+      t.dom.bind(document, 'focus', function () {
+        t.editor.windowManager.focus(t.id);
+      });
+    }
+
+    // Patch for accessibility
+    tinymce.each(t.dom.select('select'), function (e) {
+      e.onkeydown = tinyMCEPopup._accessHandler;
+    });
+
+    // Call onInit
+    // Init must be called before focus so the selection won't get lost by the focus call
+    tinymce.each(t.listeners, function (o) {
+      o.func.call(o.scope, t.editor);
+    });
+
+    // Move focus to window
+    if (t.getWindowArg('mce_auto_focus', true)) {
+      window.focus();
+
+      // Focus element with mceFocus class
+      tinymce.each(document.forms, function (f) {
+        tinymce.each(f.elements, function (e) {
+          if (t.dom.hasClass(e, 'mceFocus') && !e.disabled) {
+            e.focus();
+            return false; // Break loop
+          }
+        });
+      });
+    }
+
+    document.onkeyup = tinyMCEPopup._closeWinKeyHandler;
+
+    if ('textContent' in document) {
+      t.uiWindow.getEl('head').firstChild.textContent = document.title;
+    } else {
+      t.uiWindow.getEl('head').firstChild.innerText = document.title;
+    }
+  },
+
+  _accessHandler: function (e) {
+    e = e || window.event;
+
+    if (e.keyCode == 13 || e.keyCode == 32) {
+      var elm = e.target || e.srcElement;
+
+      if (elm.onchange) {
+        elm.onchange();
+      }
+
+      return tinymce.dom.Event.cancel(e);
+    }
+  },
+
+  _closeWinKeyHandler: function (e) {
+    e = e || window.event;
+
+    if (e.keyCode == 27) {
+      tinyMCEPopup.close();
+    }
+  },
+
+  _eventProxy: function (id) {
+    return function (evt) {
+      tinyMCEPopup.dom.events.callNativeHandler(id, evt);
+    };
+  }
 };
 
 tinyMCEPopup.init();
 
-tinymce.util.Dispatcher = function(scope) {
-	this.scope = scope || this;
-	this.listeners = [];
+tinymce.util.Dispatcher = function (scope) {
+  this.scope = scope || this;
+  this.listeners = [];
 
-	this.add = function(callback, scope) {
-		this.listeners.push({cb : callback, scope : scope || this.scope});
+  this.add = function (callback, scope) {
+    this.listeners.push({ cb: callback, scope: scope || this.scope });
 
-		return callback;
-	};
+    return callback;
+  };
 
-	this.addToTop = function(callback, scope) {
-		var self = this, listener = {cb : callback, scope : scope || self.scope};
+  this.addToTop = function (callback, scope) {
+    var self = this, listener = { cb: callback, scope: scope || self.scope };
 
-		// Create new listeners if addToTop is executed in a dispatch loop
-		if (self.inDispatch) {
-			self.listeners = [listener].concat(self.listeners);
-		} else {
-			self.listeners.unshift(listener);
-		}
+    // Create new listeners if addToTop is executed in a dispatch loop
+    if (self.inDispatch) {
+      self.listeners = [listener].concat(self.listeners);
+    } else {
+      self.listeners.unshift(listener);
+    }
 
-		return callback;
-	};
+    return callback;
+  };
 
-	this.remove = function(callback) {
-		var listeners = this.listeners, output = null;
+  this.remove = function (callback) {
+    var listeners = this.listeners, output = null;
 
-		tinymce.each(listeners, function(listener, i) {
-			if (callback == listener.cb) {
-				output = listener;
-				listeners.splice(i, 1);
-				return false;
-			}
-		});
+    tinymce.each(listeners, function (listener, i) {
+      if (callback == listener.cb) {
+        output = listener;
+        listeners.splice(i, 1);
+        return false;
+      }
+    });
 
-		return output;
-	};
+    return output;
+  };
 
-	this.dispatch = function() {
-		var self = this, returnValue, args = arguments, i, listeners = self.listeners, listener;
+  this.dispatch = function () {
+    var self = this, returnValue, args = arguments, i, listeners = self.listeners, listener;
 
-		self.inDispatch = true;
-		
-		// Needs to be a real loop since the listener count might change while looping
-		// And this is also more efficient
-		for (i = 0; i < listeners.length; i++) {
-			listener = listeners[i];
-			returnValue = listener.cb.apply(listener.scope, args.length > 0 ? args : [listener.scope]);
+    self.inDispatch = true;
 
-			if (returnValue === false) {
-				break;
-			}
-		}
+    // Needs to be a real loop since the listener count might change while looping
+    // And this is also more efficient
+    for (i = 0; i < listeners.length; i++) {
+      listener = listeners[i];
+      returnValue = listener.cb.apply(listener.scope, args.length > 0 ? args : [listener.scope]);
 
-		self.inDispatch = false;
+      if (returnValue === false) {
+        break;
+      }
+    }
 
-		return returnValue;
-	};
+    self.inDispatch = false;
+
+    return returnValue;
+  };
 };
diff --git a/e107_plugins/tinymce4/plugins/compat3x/utils/editable_selects.js b/e107_plugins/tinymce4/plugins/compat3x/utils/editable_selects.js
index 8d30787d5..3dd44a8f1 100644
--- a/e107_plugins/tinymce4/plugins/compat3x/utils/editable_selects.js
+++ b/e107_plugins/tinymce4/plugins/compat3x/utils/editable_selects.js
@@ -1,70 +1,72 @@
 /**
  * editable_selects.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
  */
 
 var TinyMCE_EditableSelects = {
-	editSelectElm : null,
+  editSelectElm : null,
 
-	init : function() {
-		var nl = document.getElementsByTagName("select"), i, d = document, o;
+  init : function () {
+    var nl = document.getElementsByTagName("select"), i, d = document, o;
 
-		for (i=0; i<nl.length; i++) {
-			if (nl[i].className.indexOf('mceEditableSelect') != -1) {
-				o = new Option(tinyMCEPopup.editor.translate('value'), '__mce_add_custom__');
+    for (i = 0; i < nl.length; i++) {
+      if (nl[i].className.indexOf('mceEditableSelect') != -1) {
+        o = new Option(tinyMCEPopup.editor.translate('value'), '__mce_add_custom__');
 
-				o.className = 'mceAddSelectValue';
+        o.className = 'mceAddSelectValue';
 
-				nl[i].options[nl[i].options.length] = o;
-				nl[i].onchange = TinyMCE_EditableSelects.onChangeEditableSelect;
-			}
-		}
-	},
+        nl[i].options[nl[i].options.length] = o;
+        nl[i].onchange = TinyMCE_EditableSelects.onChangeEditableSelect;
+      }
+    }
+  },
 
-	onChangeEditableSelect : function(e) {
-		var d = document, ne, se = window.event ? window.event.srcElement : e.target;
+  onChangeEditableSelect : function (e) {
+    var d = document, ne, se = window.event ? window.event.srcElement : e.target;
 
-		if (se.options[se.selectedIndex].value == '__mce_add_custom__') {
-			ne = d.createElement("input");
-			ne.id = se.id + "_custom";
-			ne.name = se.name + "_custom";
-			ne.type = "text";
+    if (se.options[se.selectedIndex].value == '__mce_add_custom__') {
+      ne = d.createElement("input");
+      ne.id = se.id + "_custom";
+      ne.name = se.name + "_custom";
+      ne.type = "text";
 
-			ne.style.width = se.offsetWidth + 'px';
-			se.parentNode.insertBefore(ne, se);
-			se.style.display = 'none';
-			ne.focus();
-			ne.onblur = TinyMCE_EditableSelects.onBlurEditableSelectInput;
-			ne.onkeydown = TinyMCE_EditableSelects.onKeyDown;
-			TinyMCE_EditableSelects.editSelectElm = se;
-		}
-	},
+      ne.style.width = se.offsetWidth + 'px';
+      se.parentNode.insertBefore(ne, se);
+      se.style.display = 'none';
+      ne.focus();
+      ne.onblur = TinyMCE_EditableSelects.onBlurEditableSelectInput;
+      ne.onkeydown = TinyMCE_EditableSelects.onKeyDown;
+      TinyMCE_EditableSelects.editSelectElm = se;
+    }
+  },
 
-	onBlurEditableSelectInput : function() {
-		var se = TinyMCE_EditableSelects.editSelectElm;
+  onBlurEditableSelectInput : function () {
+    var se = TinyMCE_EditableSelects.editSelectElm;
 
-		if (se) {
-			if (se.previousSibling.value != '') {
-				addSelectValue(document.forms[0], se.id, se.previousSibling.value, se.previousSibling.value);
-				selectByValue(document.forms[0], se.id, se.previousSibling.value);
-			} else
-				selectByValue(document.forms[0], se.id, '');
+    if (se) {
+      if (se.previousSibling.value != '') {
+        addSelectValue(document.forms[0], se.id, se.previousSibling.value, se.previousSibling.value);
+        selectByValue(document.forms[0], se.id, se.previousSibling.value);
+      } else {
+        selectByValue(document.forms[0], se.id, '');
+      }
 
-			se.style.display = 'inline';
-			se.parentNode.removeChild(se.previousSibling);
-			TinyMCE_EditableSelects.editSelectElm = null;
-		}
-	},
+      se.style.display = 'inline';
+      se.parentNode.removeChild(se.previousSibling);
+      TinyMCE_EditableSelects.editSelectElm = null;
+    }
+  },
 
-	onKeyDown : function(e) {
-		e = e || window.event;
+  onKeyDown : function (e) {
+    e = e || window.event;
 
-		if (e.keyCode == 13)
-			TinyMCE_EditableSelects.onBlurEditableSelectInput();
-	}
+    if (e.keyCode == 13) {
+      TinyMCE_EditableSelects.onBlurEditableSelectInput();
+    }
+  }
 };
diff --git a/e107_plugins/tinymce4/plugins/compat3x/utils/form_utils.js b/e107_plugins/tinymce4/plugins/compat3x/utils/form_utils.js
index 5c7134fca..358ad60a9 100644
--- a/e107_plugins/tinymce4/plugins/compat3x/utils/form_utils.js
+++ b/e107_plugins/tinymce4/plugins/compat3x/utils/form_utils.js
@@ -1,8 +1,8 @@
 /**
  * form_utils.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
@@ -11,200 +11,212 @@
 var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
 
 function getColorPickerHTML(id, target_form_element) {
-	var h = "", dom = tinyMCEPopup.dom;
+  var h = "", dom = tinyMCEPopup.dom;
 
-	if (label = dom.select('label[for=' + target_form_element + ']')[0]) {
-		label.id = label.id || dom.uniqueId();
-	}
+  if (label = dom.select('label[for=' + target_form_element + ']')[0]) {
+    label.id = label.id || dom.uniqueId();
+  }
 
-	h += '<a role="button" aria-labelledby="' + id + '_label" id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
-	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;<span id="' + id + '_label" class="mceVoiceLabel mceIconOnly" style="display:none;">' + tinyMCEPopup.getLang('browse') + '</span></span></a>';
+  h += '<a role="button" aria-labelledby="' + id + '_label" id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element + '\');" onmousedown="return false;" class="pickcolor">';
+  h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;<span id="' + id + '_label" class="mceVoiceLabel mceIconOnly" style="display:none;">' + tinyMCEPopup.getLang('browse') + '</span></span></a>';
 
-	return h;
+  return h;
 }
 
 function updateColor(img_id, form_element_id) {
-	document.getElementById(img_id).style.backgroundColor = document.forms[0].elements[form_element_id].value;
+  document.getElementById(img_id).style.backgroundColor = document.forms[0].elements[form_element_id].value;
 }
 
 function setBrowserDisabled(id, state) {
-	var img = document.getElementById(id);
-	var lnk = document.getElementById(id + "_link");
+  var img = document.getElementById(id);
+  var lnk = document.getElementById(id + "_link");
 
-	if (lnk) {
-		if (state) {
-			lnk.setAttribute("realhref", lnk.getAttribute("href"));
-			lnk.removeAttribute("href");
-			tinyMCEPopup.dom.addClass(img, 'disabled');
-		} else {
-			if (lnk.getAttribute("realhref"))
-				lnk.setAttribute("href", lnk.getAttribute("realhref"));
+  if (lnk) {
+    if (state) {
+      lnk.setAttribute("realhref", lnk.getAttribute("href"));
+      lnk.removeAttribute("href");
+      tinyMCEPopup.dom.addClass(img, 'disabled');
+    } else {
+      if (lnk.getAttribute("realhref")) {
+        lnk.setAttribute("href", lnk.getAttribute("realhref"));
+      }
 
-			tinyMCEPopup.dom.removeClass(img, 'disabled');
-		}
-	}
+      tinyMCEPopup.dom.removeClass(img, 'disabled');
+    }
+  }
 }
 
 function getBrowserHTML(id, target_form_element, type, prefix) {
-	var option = prefix + "_" + type + "_browser_callback", cb, html;
+  var option = prefix + "_" + type + "_browser_callback", cb, html;
 
-	cb = tinyMCEPopup.getParam(option, tinyMCEPopup.getParam("file_browser_callback"));
+  cb = tinyMCEPopup.getParam(option, tinyMCEPopup.getParam("file_browser_callback"));
 
-	if (!cb)
-		return "";
+  if (!cb) {
+    return "";
+  }
 
-	html = "";
-	html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';
-	html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
+  html = "";
+  html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';
+  html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
 
-	return html;
+  return html;
 }
 
 function openBrowser(img_id, target_form_element, type, option) {
-	var img = document.getElementById(img_id);
+  var img = document.getElementById(img_id);
 
-	if (img.className != "mceButtonDisabled")
-		tinyMCEPopup.openBrowser(target_form_element, type, option);
+  if (img.className != "mceButtonDisabled") {
+    tinyMCEPopup.openBrowser(target_form_element, type, option);
+  }
 }
 
 function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
-	if (!form_obj || !form_obj.elements[field_name])
-		return;
+  if (!form_obj || !form_obj.elements[field_name]) {
+    return;
+  }
 
-	if (!value)
-		value = "";
+  if (!value) {
+    value = "";
+  }
 
-	var sel = form_obj.elements[field_name];
+  var sel = form_obj.elements[field_name];
 
-	var found = false;
-	for (var i=0; i<sel.options.length; i++) {
-		var option = sel.options[i];
+  var found = false;
+  for (var i = 0; i < sel.options.length; i++) {
+    var option = sel.options[i];
 
-		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
-			option.selected = true;
-			found = true;
-		} else
-			option.selected = false;
-	}
+    if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
+      option.selected = true;
+      found = true;
+    } else {
+      option.selected = false;
+    }
+  }
 
-	if (!found && add_custom && value != '') {
-		var option = new Option(value, value);
-		option.selected = true;
-		sel.options[sel.options.length] = option;
-		sel.selectedIndex = sel.options.length - 1;
-	}
+  if (!found && add_custom && value != '') {
+    var option = new Option(value, value);
+    option.selected = true;
+    sel.options[sel.options.length] = option;
+    sel.selectedIndex = sel.options.length - 1;
+  }
 
-	return found;
+  return found;
 }
 
 function getSelectValue(form_obj, field_name) {
-	var elm = form_obj.elements[field_name];
+  var elm = form_obj.elements[field_name];
 
-	if (elm == null || elm.options == null || elm.selectedIndex === -1)
-		return "";
+  if (elm == null || elm.options == null || elm.selectedIndex === -1) {
+    return "";
+  }
 
-	return elm.options[elm.selectedIndex].value;
+  return elm.options[elm.selectedIndex].value;
 }
 
 function addSelectValue(form_obj, field_name, name, value) {
-	var s = form_obj.elements[field_name];
-	var o = new Option(name, value);
-	s.options[s.options.length] = o;
+  var s = form_obj.elements[field_name];
+  var o = new Option(name, value);
+  s.options[s.options.length] = o;
 }
 
 function addClassesToList(list_id, specific_option) {
-	// Setup class droplist
-	var styleSelectElm = document.getElementById(list_id);
-	var styles = tinyMCEPopup.getParam('theme_advanced_styles', false);
-	styles = tinyMCEPopup.getParam(specific_option, styles);
+  // Setup class droplist
+  var styleSelectElm = document.getElementById(list_id);
+  var styles = tinyMCEPopup.getParam('theme_advanced_styles', false);
+  styles = tinyMCEPopup.getParam(specific_option, styles);
 
-	if (styles) {
-		var stylesAr = styles.split(';');
+  if (styles) {
+    var stylesAr = styles.split(';');
 
-		for (var i=0; i<stylesAr.length; i++) {
-			if (stylesAr != "") {
-				var key, value;
+    for (var i = 0; i < stylesAr.length; i++) {
+      if (stylesAr != "") {
+        var key, value;
 
-				key = stylesAr[i].split('=')[0];
-				value = stylesAr[i].split('=')[1];
+        key = stylesAr[i].split('=')[0];
+        value = stylesAr[i].split('=')[1];
 
-				styleSelectElm.options[styleSelectElm.length] = new Option(key, value);
-			}
-		}
-	} else {
-		/*tinymce.each(tinyMCEPopup.editor.dom.getClasses(), function(o) {
-			styleSelectElm.options[styleSelectElm.length] = new Option(o.title || o['class'], o['class']);
-		});*/
-	}
+        styleSelectElm.options[styleSelectElm.length] = new Option(key, value);
+      }
+    }
+  } else {
+    /*tinymce.each(tinyMCEPopup.editor.dom.getClasses(), function(o) {
+    styleSelectElm.options[styleSelectElm.length] = new Option(o.title || o['class'], o['class']);
+    });*/
+  }
 }
 
 function isVisible(element_id) {
-	var elm = document.getElementById(element_id);
+  var elm = document.getElementById(element_id);
 
-	return elm && elm.style.display != "none";
+  return elm && elm.style.display != "none";
 }
 
 function convertRGBToHex(col) {
-	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
+  var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
 
-	var rgb = col.replace(re, "$1,$2,$3").split(',');
-	if (rgb.length == 3) {
-		r = parseInt(rgb[0]).toString(16);
-		g = parseInt(rgb[1]).toString(16);
-		b = parseInt(rgb[2]).toString(16);
+  var rgb = col.replace(re, "$1,$2,$3").split(',');
+  if (rgb.length == 3) {
+    r = parseInt(rgb[0]).toString(16);
+    g = parseInt(rgb[1]).toString(16);
+    b = parseInt(rgb[2]).toString(16);
 
-		r = r.length == 1 ? '0' + r : r;
-		g = g.length == 1 ? '0' + g : g;
-		b = b.length == 1 ? '0' + b : b;
+    r = r.length == 1 ? '0' + r : r;
+    g = g.length == 1 ? '0' + g : g;
+    b = b.length == 1 ? '0' + b : b;
 
-		return "#" + r + g + b;
-	}
+    return "#" + r + g + b;
+  }
 
-	return col;
+  return col;
 }
 
 function convertHexToRGB(col) {
-	if (col.indexOf('#') != -1) {
-		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
+  if (col.indexOf('#') != -1) {
+    col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
 
-		r = parseInt(col.substring(0, 2), 16);
-		g = parseInt(col.substring(2, 4), 16);
-		b = parseInt(col.substring(4, 6), 16);
+    r = parseInt(col.substring(0, 2), 16);
+    g = parseInt(col.substring(2, 4), 16);
+    b = parseInt(col.substring(4, 6), 16);
 
-		return "rgb(" + r + "," + g + "," + b + ")";
-	}
+    return "rgb(" + r + "," + g + "," + b + ")";
+  }
 
-	return col;
+  return col;
 }
 
 function trimSize(size) {
-	return size.replace(/([0-9\.]+)(px|%|in|cm|mm|em|ex|pt|pc)/i, '$1$2');
+  return size.replace(/([0-9\.]+)(px|%|in|cm|mm|em|ex|pt|pc)/i, '$1$2');
 }
 
 function getCSSSize(size) {
-	size = trimSize(size);
+  size = trimSize(size);
 
-	if (size == "")
-		return "";
+  if (size == "") {
+    return "";
+  }
 
-	// Add px
-	if (/^[0-9]+$/.test(size))
-		size += 'px';
-	// Sanity check, IE doesn't like broken values
-	else if (!(/^[0-9\.]+(px|%|in|cm|mm|em|ex|pt|pc)$/i.test(size)))
-		return "";
+  // Add px
+  if (/^[0-9]+$/.test(size)) {
+    size += 'px';
+  }
+  // Sanity check, IE doesn't like broken values
+  else if (!(/^[0-9\.]+(px|%|in|cm|mm|em|ex|pt|pc)$/i.test(size))) {
+    return "";
+  }
 
-	return size;
+  return size;
 }
 
 function getStyle(elm, attrib, style) {
-	var val = tinyMCEPopup.dom.getAttrib(elm, attrib);
+  var val = tinyMCEPopup.dom.getAttrib(elm, attrib);
 
-	if (val != '')
-		return '' + val;
+  if (val != '') {
+    return '' + val;
+  }
 
-	if (typeof(style) == 'undefined')
-		style = attrib;
+  if (typeof (style) == 'undefined') {
+    style = attrib;
+  }
 
-	return tinyMCEPopup.dom.getStyle(elm, style);
+  return tinyMCEPopup.dom.getStyle(elm, style);
 }
diff --git a/e107_plugins/tinymce4/plugins/compat3x/utils/mctabs.js b/e107_plugins/tinymce4/plugins/compat3x/utils/mctabs.js
index 2391c782f..a04519be7 100644
--- a/e107_plugins/tinymce4/plugins/compat3x/utils/mctabs.js
+++ b/e107_plugins/tinymce4/plugins/compat3x/utils/mctabs.js
@@ -1,8 +1,8 @@
 /**
  * mctabs.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
@@ -11,154 +11,158 @@
 /*jshint globals: tinyMCEPopup */
 
 function MCTabs() {
-	this.settings = [];
-	this.onChange = tinyMCEPopup.editor.windowManager.createInstance('tinymce.util.Dispatcher');
+  this.settings = [];
+  this.onChange = tinyMCEPopup.editor.windowManager.createInstance('tinymce.util.Dispatcher');
+}
+
+MCTabs.prototype.init = function (settings) {
+  this.settings = settings;
 };
 
-MCTabs.prototype.init = function(settings) {
-	this.settings = settings;
+MCTabs.prototype.getParam = function (name, default_value) {
+  var value = null;
+
+  value = (typeof (this.settings[name]) == "undefined") ? default_value : this.settings[name];
+
+  // Fix bool values
+  if (value == "true" || value == "false") {
+    return (value == "true");
+  }
+
+  return value;
 };
 
-MCTabs.prototype.getParam = function(name, default_value) {
-	var value = null;
-
-	value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
-
-	// Fix bool values
-	if (value == "true" || value == "false")
-		return (value == "true");
-
-	return value;
+MCTabs.prototype.showTab = function (tab) {
+  tab.className = 'current';
+  tab.setAttribute("aria-selected", true);
+  tab.setAttribute("aria-expanded", true);
+  tab.tabIndex = 0;
 };
 
-MCTabs.prototype.showTab =function(tab){
-	tab.className = 'current';
-	tab.setAttribute("aria-selected", true);
-	tab.setAttribute("aria-expanded", true);
-	tab.tabIndex = 0;
+MCTabs.prototype.hideTab = function (tab) {
+  var t = this;
+
+  tab.className = '';
+  tab.setAttribute("aria-selected", false);
+  tab.setAttribute("aria-expanded", false);
+  tab.tabIndex = -1;
 };
 
-MCTabs.prototype.hideTab =function(tab){
-	var t=this;
-
-	tab.className = '';
-	tab.setAttribute("aria-selected", false);
-	tab.setAttribute("aria-expanded", false);
-	tab.tabIndex = -1;
+MCTabs.prototype.showPanel = function (panel) {
+  panel.className = 'current';
+  panel.setAttribute("aria-hidden", false);
 };
 
-MCTabs.prototype.showPanel = function(panel) {
-	panel.className = 'current'; 
-	panel.setAttribute("aria-hidden", false);
+MCTabs.prototype.hidePanel = function (panel) {
+  panel.className = 'panel';
+  panel.setAttribute("aria-hidden", true);
 };
 
-MCTabs.prototype.hidePanel = function(panel) {
-	panel.className = 'panel';
-	panel.setAttribute("aria-hidden", true);
-}; 
-
-MCTabs.prototype.getPanelForTab = function(tabElm) {
-	return tinyMCEPopup.dom.getAttrib(tabElm, "aria-controls");
+MCTabs.prototype.getPanelForTab = function (tabElm) {
+  return tinyMCEPopup.dom.getAttrib(tabElm, "aria-controls");
 };
 
-MCTabs.prototype.displayTab = function(tab_id, panel_id, avoid_focus) {
-	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i, t = this;
+MCTabs.prototype.displayTab = function (tab_id, panel_id, avoid_focus) {
+  var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i, t = this;
 
-	tabElm = document.getElementById(tab_id);
+  tabElm = document.getElementById(tab_id);
 
-	if (panel_id === undefined) {
-		panel_id = t.getPanelForTab(tabElm);
-	}
+  if (panel_id === undefined) {
+    panel_id = t.getPanelForTab(tabElm);
+  }
 
-	panelElm= document.getElementById(panel_id);
-	panelContainerElm = panelElm ? panelElm.parentNode : null;
-	tabContainerElm = tabElm ? tabElm.parentNode : null;
-	selectionClass = t.getParam('selection_class', 'current');
+  panelElm = document.getElementById(panel_id);
+  panelContainerElm = panelElm ? panelElm.parentNode : null;
+  tabContainerElm = tabElm ? tabElm.parentNode : null;
+  selectionClass = t.getParam('selection_class', 'current');
 
-	if (tabElm && tabContainerElm) {
-		nodes = tabContainerElm.childNodes;
+  if (tabElm && tabContainerElm) {
+    nodes = tabContainerElm.childNodes;
 
-		// Hide all other tabs
-		for (i = 0; i < nodes.length; i++) {
-			if (nodes[i].nodeName == "LI") {
-				t.hideTab(nodes[i]);
-			}
-		}
+    // Hide all other tabs
+    for (i = 0; i < nodes.length; i++) {
+      if (nodes[i].nodeName == "LI") {
+        t.hideTab(nodes[i]);
+      }
+    }
 
-		// Show selected tab
-		t.showTab(tabElm);
-	}
+    // Show selected tab
+    t.showTab(tabElm);
+  }
 
-	if (panelElm && panelContainerElm) {
-		nodes = panelContainerElm.childNodes;
+  if (panelElm && panelContainerElm) {
+    nodes = panelContainerElm.childNodes;
 
-		// Hide all other panels
-		for (i = 0; i < nodes.length; i++) {
-			if (nodes[i].nodeName == "DIV")
-				t.hidePanel(nodes[i]);
-		}
+    // Hide all other panels
+    for (i = 0; i < nodes.length; i++) {
+      if (nodes[i].nodeName == "DIV") {
+        t.hidePanel(nodes[i]);
+      }
+    }
 
-		if (!avoid_focus) { 
-			tabElm.focus();
-		}
+    if (!avoid_focus) {
+      tabElm.focus();
+    }
 
-		// Show selected panel
-		t.showPanel(panelElm);
-	}
+    // Show selected panel
+    t.showPanel(panelElm);
+  }
 };
 
-MCTabs.prototype.getAnchor = function() {
-	var pos, url = document.location.href;
+MCTabs.prototype.getAnchor = function () {
+  var pos, url = document.location.href;
 
-	if ((pos = url.lastIndexOf('#')) != -1)
-		return url.substring(pos + 1);
+  if ((pos = url.lastIndexOf('#')) != -1) {
+    return url.substring(pos + 1);
+  }
 
-	return "";
+  return "";
 };
 
 
 //Global instance
 var mcTabs = new MCTabs();
 
-tinyMCEPopup.onInit.add(function() {
-	var tinymce = tinyMCEPopup.getWin().tinymce, dom = tinyMCEPopup.dom, each = tinymce.each;
+tinyMCEPopup.onInit.add(function () {
+  var tinymce = tinyMCEPopup.getWin().tinymce, dom = tinyMCEPopup.dom, each = tinymce.each;
 
-	each(dom.select('div.tabs'), function(tabContainerElm) {
-		//var keyNav;
+  each(dom.select('div.tabs'), function (tabContainerElm) {
+    //var keyNav;
 
-		dom.setAttrib(tabContainerElm, "role", "tablist");
+    dom.setAttrib(tabContainerElm, "role", "tablist");
 
-		var items = tinyMCEPopup.dom.select('li', tabContainerElm);
-		var action = function(id) {
-			mcTabs.displayTab(id, mcTabs.getPanelForTab(id));
-			mcTabs.onChange.dispatch(id);
-		};
+    var items = tinyMCEPopup.dom.select('li', tabContainerElm);
+    var action = function (id) {
+      mcTabs.displayTab(id, mcTabs.getPanelForTab(id));
+      mcTabs.onChange.dispatch(id);
+    };
 
-		each(items, function(item) {
-			dom.setAttrib(item, 'role', 'tab');
-			dom.bind(item, 'click', function(evt) {
-				action(item.id);
-			});
-		});
+    each(items, function (item) {
+      dom.setAttrib(item, 'role', 'tab');
+      dom.bind(item, 'click', function (evt) {
+        action(item.id);
+      });
+    });
 
-		dom.bind(dom.getRoot(), 'keydown', function(evt) {
-			if (evt.keyCode === 9 && evt.ctrlKey && !evt.altKey) { // Tab
-				//keyNav.moveFocus(evt.shiftKey ? -1 : 1);
-				tinymce.dom.Event.cancel(evt);
-			}
-		});
+    dom.bind(dom.getRoot(), 'keydown', function (evt) {
+      if (evt.keyCode === 9 && evt.ctrlKey && !evt.altKey) { // Tab
+        //keyNav.moveFocus(evt.shiftKey ? -1 : 1);
+        tinymce.dom.Event.cancel(evt);
+      }
+    });
 
-		each(dom.select('a', tabContainerElm), function(a) {
-			dom.setAttrib(a, 'tabindex', '-1');
-		});
+    each(dom.select('a', tabContainerElm), function (a) {
+      dom.setAttrib(a, 'tabindex', '-1');
+    });
 
-		/*keyNav = tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {
-			root: tabContainerElm,
-			items: items,
-			onAction: action,
-			actOnFocus: true,
-			enableLeftRight: true,
-			enableUpDown: true
-		}, tinyMCEPopup.dom);*/
-	});
+    /*keyNav = tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {
+      root: tabContainerElm,
+      items: items,
+      onAction: action,
+      actOnFocus: true,
+      enableLeftRight: true,
+      enableUpDown: true
+    }, tinyMCEPopup.dom);*/
+  }
+);
 });
\ No newline at end of file
diff --git a/e107_plugins/tinymce4/plugins/compat3x/utils/validate.js b/e107_plugins/tinymce4/plugins/compat3x/utils/validate.js
index d13aaa1ba..5600666d3 100644
--- a/e107_plugins/tinymce4/plugins/compat3x/utils/validate.js
+++ b/e107_plugins/tinymce4/plugins/compat3x/utils/validate.js
@@ -1,252 +1,267 @@
 /**
  * validate.js
  *
- * Copyright, Moxiecode Systems AB
  * Released under LGPL License.
+ * Copyright (c) 1999-2017 Ephox Corp. All rights reserved
  *
  * License: http://www.tinymce.com/license
  * Contributing: http://www.tinymce.com/contributing
  */
 
 /**
-	// String validation:
+  // String validation:
 
-	if (!Validator.isEmail('myemail'))
-		alert('Invalid email.');
+  if (!Validator.isEmail('myemail'))
+    alert('Invalid email.');
 
-	// Form validation:
+  // Form validation:
 
-	var f = document.forms['myform'];
+  var f = document.forms['myform'];
 
-	if (!Validator.isEmail(f.myemail))
-		alert('Invalid email.');
+  if (!Validator.isEmail(f.myemail))
+    alert('Invalid email.');
 */
 
 var Validator = {
-	isEmail : function(s) {
-		return this.test(s, '^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$');
-	},
+  isEmail : function (s) {
+    return this.test(s, '^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$');
+  },
 
-	isAbsUrl : function(s) {
-		return this.test(s, '^(news|telnet|nttp|file|http|ftp|https)://[-A-Za-z0-9\\.]+\\/?.*$');
-	},
+  isAbsUrl : function (s) {
+    return this.test(s, '^(news|telnet|nttp|file|http|ftp|https)://[-A-Za-z0-9\\.]+\\/?.*$');
+  },
 
-	isSize : function(s) {
-		return this.test(s, '^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
-	},
+  isSize : function (s) {
+    return this.test(s, '^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
+  },
 
-	isId : function(s) {
-		return this.test(s, '^[A-Za-z_]([A-Za-z0-9_])*$');
-	},
+  isId : function (s) {
+    return this.test(s, '^[A-Za-z_]([A-Za-z0-9_])*$');
+  },
 
-	isEmpty : function(s) {
-		var nl, i;
+  isEmpty : function (s) {
+    var nl, i;
 
-		if (s.nodeName == 'SELECT' && s.selectedIndex < 1)
-			return true;
+    if (s.nodeName == 'SELECT' && s.selectedIndex < 1) {
+      return true;
+    }
 
-		if (s.type == 'checkbox' && !s.checked)
-			return true;
+    if (s.type == 'checkbox' && !s.checked) {
+      return true;
+    }
 
-		if (s.type == 'radio') {
-			for (i=0, nl = s.form.elements; i<nl.length; i++) {
-				if (nl[i].type == "radio" && nl[i].name == s.name && nl[i].checked)
-					return false;
-			}
+    if (s.type == 'radio') {
+      for (i = 0, nl = s.form.elements; i < nl.length; i++) {
+        if (nl[i].type == "radio" && nl[i].name == s.name && nl[i].checked) {
+          return false;
+        }
+      }
 
-			return true;
-		}
+      return true;
+    }
 
-		return new RegExp('^\\s*$').test(s.nodeType == 1 ? s.value : s);
-	},
+    return new RegExp('^\\s*$').test(s.nodeType == 1 ? s.value : s);
+  },
 
-	isNumber : function(s, d) {
-		return !isNaN(s.nodeType == 1 ? s.value : s) && (!d || !this.test(s, '^-?[0-9]*\\.[0-9]*$'));
-	},
+  isNumber : function (s, d) {
+    return !isNaN(s.nodeType == 1 ? s.value : s) && (!d || !this.test(s, '^-?[0-9]*\\.[0-9]*$'));
+  },
 
-	test : function(s, p) {
-		s = s.nodeType == 1 ? s.value : s;
+  test : function (s, p) {
+    s = s.nodeType == 1 ? s.value : s;
 
-		return s == '' || new RegExp(p).test(s);
-	}
+    return s == '' || new RegExp(p).test(s);
+  }
 };
 
 var AutoValidator = {
-	settings : {
-		id_cls : 'id',
-		int_cls : 'int',
-		url_cls : 'url',
-		number_cls : 'number',
-		email_cls : 'email',
-		size_cls : 'size',
-		required_cls : 'required',
-		invalid_cls : 'invalid',
-		min_cls : 'min',
-		max_cls : 'max'
-	},
+  settings : {
+    id_cls : 'id',
+    int_cls : 'int',
+    url_cls : 'url',
+    number_cls : 'number',
+    email_cls : 'email',
+    size_cls : 'size',
+    required_cls : 'required',
+    invalid_cls : 'invalid',
+    min_cls : 'min',
+    max_cls : 'max'
+  },
 
-	init : function(s) {
-		var n;
+  init : function (s) {
+    var n;
 
-		for (n in s)
-			this.settings[n] = s[n];
-	},
+    for (n in s) {
+      this.settings[n] = s[n];
+    }
+  },
 
-	validate : function(f) {
-		var i, nl, s = this.settings, c = 0;
+  validate : function (f) {
+    var i, nl, s = this.settings, c = 0;
 
-		nl = this.tags(f, 'label');
-		for (i=0; i<nl.length; i++) {
-			this.removeClass(nl[i], s.invalid_cls);
-			nl[i].setAttribute('aria-invalid', false);
-		}
+    nl = this.tags(f, 'label');
+    for (i = 0; i < nl.length; i++) {
+      this.removeClass(nl[i], s.invalid_cls);
+      nl[i].setAttribute('aria-invalid', false);
+    }
 
-		c += this.validateElms(f, 'input');
-		c += this.validateElms(f, 'select');
-		c += this.validateElms(f, 'textarea');
+    c += this.validateElms(f, 'input');
+    c += this.validateElms(f, 'select');
+    c += this.validateElms(f, 'textarea');
 
-		return c == 3;
-	},
+    return c == 3;
+  },
 
-	invalidate : function(n) {
-		this.mark(n.form, n);
-	},
-	
-	getErrorMessages : function(f) {
-		var nl, i, s = this.settings, field, msg, values, messages = [], ed = tinyMCEPopup.editor;
-		nl = this.tags(f, "label");
-		for (i=0; i<nl.length; i++) {
-			if (this.hasClass(nl[i], s.invalid_cls)) {
-				field = document.getElementById(nl[i].getAttribute("for"));
-				values = { field: nl[i].textContent };
-				if (this.hasClass(field, s.min_cls, true)) {
-					message = ed.getLang('invalid_data_min');
-					values.min = this.getNum(field, s.min_cls);
-				} else if (this.hasClass(field, s.number_cls)) {
-					message = ed.getLang('invalid_data_number');
-				} else if (this.hasClass(field, s.size_cls)) {
-					message = ed.getLang('invalid_data_size');
-				} else {
-					message = ed.getLang('invalid_data');
-				}
-				
-				message = message.replace(/{\#([^}]+)\}/g, function(a, b) {
-					return values[b] || '{#' + b + '}';
-				});
-				messages.push(message);
-			}
-		}
-		return messages;
-	},
+  invalidate : function (n) {
+    this.mark(n.form, n);
+  },
 
-	reset : function(e) {
-		var t = ['label', 'input', 'select', 'textarea'];
-		var i, j, nl, s = this.settings;
+  getErrorMessages : function (f) {
+    var nl, i, s = this.settings, field, msg, values, messages = [], ed = tinyMCEPopup.editor;
+    nl = this.tags(f, "label");
+    for (i = 0; i < nl.length; i++) {
+      if (this.hasClass(nl[i], s.invalid_cls)) {
+        field = document.getElementById(nl[i].getAttribute("for"));
+        values = { field: nl[i].textContent };
+        if (this.hasClass(field, s.min_cls, true)) {
+          message = ed.getLang('invalid_data_min');
+          values.min = this.getNum(field, s.min_cls);
+        } else if (this.hasClass(field, s.number_cls)) {
+          message = ed.getLang('invalid_data_number');
+        } else if (this.hasClass(field, s.size_cls)) {
+          message = ed.getLang('invalid_data_size');
+        } else {
+          message = ed.getLang('invalid_data');
+        }
 
-		if (e == null)
-			return;
+        message = message.replace(/{\#([^}]+)\}/g, function (a, b) {
+          return values[b] || '{#' + b + '}';
+        });
+        messages.push(message);
+      }
+    }
+    return messages;
+  },
 
-		for (i=0; i<t.length; i++) {
-			nl = this.tags(e.form ? e.form : e, t[i]);
-			for (j=0; j<nl.length; j++) {
-				this.removeClass(nl[j], s.invalid_cls);
-				nl[j].setAttribute('aria-invalid', false);
-			}
-		}
-	},
+  reset : function (e) {
+    var t = ['label', 'input', 'select', 'textarea'];
+    var i, j, nl, s = this.settings;
 
-	validateElms : function(f, e) {
-		var nl, i, n, s = this.settings, st = true, va = Validator, v;
+    if (e == null) {
+      return;
+    }
 
-		nl = this.tags(f, e);
-		for (i=0; i<nl.length; i++) {
-			n = nl[i];
+    for (i = 0; i < t.length; i++) {
+      nl = this.tags(e.form ? e.form : e, t[i]);
+      for (j = 0; j < nl.length; j++) {
+        this.removeClass(nl[j], s.invalid_cls);
+        nl[j].setAttribute('aria-invalid', false);
+      }
+    }
+  },
 
-			this.removeClass(n, s.invalid_cls);
+  validateElms : function (f, e) {
+    var nl, i, n, s = this.settings, st = true, va = Validator, v;
 
-			if (this.hasClass(n, s.required_cls) && va.isEmpty(n))
-				st = this.mark(f, n);
+    nl = this.tags(f, e);
+    for (i = 0; i < nl.length; i++) {
+      n = nl[i];
 
-			if (this.hasClass(n, s.number_cls) && !va.isNumber(n))
-				st = this.mark(f, n);
+      this.removeClass(n, s.invalid_cls);
 
-			if (this.hasClass(n, s.int_cls) && !va.isNumber(n, true))
-				st = this.mark(f, n);
+      if (this.hasClass(n, s.required_cls) && va.isEmpty(n)) {
+        st = this.mark(f, n);
+      }
 
-			if (this.hasClass(n, s.url_cls) && !va.isAbsUrl(n))
-				st = this.mark(f, n);
+      if (this.hasClass(n, s.number_cls) && !va.isNumber(n)) {
+        st = this.mark(f, n);
+      }
 
-			if (this.hasClass(n, s.email_cls) && !va.isEmail(n))
-				st = this.mark(f, n);
+      if (this.hasClass(n, s.int_cls) && !va.isNumber(n, true)) {
+        st = this.mark(f, n);
+      }
 
-			if (this.hasClass(n, s.size_cls) && !va.isSize(n))
-				st = this.mark(f, n);
+      if (this.hasClass(n, s.url_cls) && !va.isAbsUrl(n)) {
+        st = this.mark(f, n);
+      }
 
-			if (this.hasClass(n, s.id_cls) && !va.isId(n))
-				st = this.mark(f, n);
+      if (this.hasClass(n, s.email_cls) && !va.isEmail(n)) {
+        st = this.mark(f, n);
+      }
 
-			if (this.hasClass(n, s.min_cls, true)) {
-				v = this.getNum(n, s.min_cls);
+      if (this.hasClass(n, s.size_cls) && !va.isSize(n)) {
+        st = this.mark(f, n);
+      }
 
-				if (isNaN(v) || parseInt(n.value) < parseInt(v))
-					st = this.mark(f, n);
-			}
+      if (this.hasClass(n, s.id_cls) && !va.isId(n)) {
+        st = this.mark(f, n);
+      }
 
-			if (this.hasClass(n, s.max_cls, true)) {
-				v = this.getNum(n, s.max_cls);
+      if (this.hasClass(n, s.min_cls, true)) {
+        v = this.getNum(n, s.min_cls);
 
-				if (isNaN(v) || parseInt(n.value) > parseInt(v))
-					st = this.mark(f, n);
-			}
-		}
+        if (isNaN(v) || parseInt(n.value) < parseInt(v)) {
+          st = this.mark(f, n);
+        }
+      }
 
-		return st;
-	},
+      if (this.hasClass(n, s.max_cls, true)) {
+        v = this.getNum(n, s.max_cls);
 
-	hasClass : function(n, c, d) {
-		return new RegExp('\\b' + c + (d ? '[0-9]+' : '') + '\\b', 'g').test(n.className);
-	},
+        if (isNaN(v) || parseInt(n.value) > parseInt(v)) {
+          st = this.mark(f, n);
+        }
+      }
+    }
 
-	getNum : function(n, c) {
-		c = n.className.match(new RegExp('\\b' + c + '([0-9]+)\\b', 'g'))[0];
-		c = c.replace(/[^0-9]/g, '');
+    return st;
+  },
 
-		return c;
-	},
+  hasClass : function (n, c, d) {
+    return new RegExp('\\b' + c + (d ? '[0-9]+' : '') + '\\b', 'g').test(n.className);
+  },
 
-	addClass : function(n, c, b) {
-		var o = this.removeClass(n, c);
-		n.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c;
-	},
+  getNum : function (n, c) {
+    c = n.className.match(new RegExp('\\b' + c + '([0-9]+)\\b', 'g'))[0];
+    c = c.replace(/[^0-9]/g, '');
 
-	removeClass : function(n, c) {
-		c = n.className.replace(new RegExp("(^|\\s+)" + c + "(\\s+|$)"), ' ');
-		return n.className = c != ' ' ? c : '';
-	},
+    return c;
+  },
 
-	tags : function(f, s) {
-		return f.getElementsByTagName(s);
-	},
+  addClass : function (n, c, b) {
+    var o = this.removeClass(n, c);
+    n.className = b ? c + (o !== '' ? (' ' + o) : '') : (o !== '' ? (o + ' ') : '') + c;
+  },
 
-	mark : function(f, n) {
-		var s = this.settings;
+  removeClass : function (n, c) {
+    c = n.className.replace(new RegExp("(^|\\s+)" + c + "(\\s+|$)"), ' ');
+    return n.className = c !== ' ' ? c : '';
+  },
 
-		this.addClass(n, s.invalid_cls);
-		n.setAttribute('aria-invalid', 'true');
-		this.markLabels(f, n, s.invalid_cls);
+  tags : function (f, s) {
+    return f.getElementsByTagName(s);
+  },
 
-		return false;
-	},
+  mark : function (f, n) {
+    var s = this.settings;
 
-	markLabels : function(f, n, ic) {
-		var nl, i;
+    this.addClass(n, s.invalid_cls);
+    n.setAttribute('aria-invalid', 'true');
+    this.markLabels(f, n, s.invalid_cls);
 
-		nl = this.tags(f, "label");
-		for (i=0; i<nl.length; i++) {
-			if (nl[i].getAttribute("for") == n.id || nl[i].htmlFor == n.id)
-				this.addClass(nl[i], ic);
-		}
+    return false;
+  },
 
-		return null;
-	}
+  markLabels : function (f, n, ic) {
+    var nl, i;
+
+    nl = this.tags(f, "label");
+    for (i = 0; i < nl.length; i++) {
+      if (nl[i].getAttribute("for") == n.id || nl[i].htmlFor == n.id) {
+        this.addClass(nl[i], ic);
+      }
+    }
+
+    return null;
+  }
 };