app/assets/source/tinymce/tinymce.jquery.js in tinymce-rails-4.3.0 vs app/assets/source/tinymce/tinymce.jquery.js in tinymce-rails-4.3.1

- old
+ new

@@ -1,6 +1,6 @@ -// 4.3.0 (2015-11-23) +// 4.3.1 (2015-11-30) /** * Compiled inline version. (Library mode) */ @@ -80,11 +80,11 @@ target = target[fragments[fi]]; } target[fragments[fragments.length - 1]] = modules[id]; } - + // Expose private modules for unit tests if (exports.AMDLC_TESTS) { privateModules = exports.privateModules || {}; for (id in modules) { @@ -1697,11 +1697,11 @@ /** * Creates a class, subclass or static singleton. * More details on this method can be found in the Wiki. * * @method create - * @param {String} s Class name, inheritage and prefix. + * @param {String} s Class name, inheritance and prefix. * @param {Object} p Collection of methods to add to the class. * @param {Object} root Optional root object defaults to the global window object. * @example * // Creates a basic class * tinymce.create('tinymce.somepackage.SomeClass', { @@ -3922,11 +3922,11 @@ if (styles.border === 'medium none') { delete styles.border; } // IE 11 will produce a border-image: none when getting the style attribute from <p style="border: 1px solid red"></p> - // So lets asume it shouldn't be there + // So let us assume it shouldn't be there if (styles['border-image'] === 'none') { delete styles['border-image']; } } @@ -4837,11 +4837,11 @@ function toStringIE() { return dom.create('body', null, cloneContents()).outerText; } extend(self, { - // Inital states + // Initial states startContainer: doc, startOffset: 0, endContainer: doc, endOffset: 0, collapsed: TRUE, @@ -12700,12 +12700,13 @@ if (!collapsed) { findEndPoint(); } } catch (ex) { // IE has a nasty bug where text nodes might throw "invalid argument" when you - // access the nodeValue or other properties of text nodes. This seems to happend when - // text nodes are split into two nodes by a delete/backspace call. So lets detect it and try to fix it. + // access the nodeValue or other properties of text nodes. This seems to happen when + // text nodes are split into two nodes by a delete/backspace call. + // So let us detect and try to fix it. if (ex.number == -2147024809) { // Get the current selection bookmark = self.getBookmark(2); // Get start element @@ -13255,10 +13256,11 @@ } function showResizeRect(targetElm, mouseDownHandleName, mouseDownEvent) { var position, targetWidth, targetHeight, e, rect; + hideResizeRect(); unbindResizeHandleEvents(); // Get position and size of target position = dom.getPos(targetElm, rootElement); selectedElmX = position.x; @@ -18526,11 +18528,11 @@ selection.setRng(rng); } } - // Applies formatting to the caret postion + // Applies formatting to the caret position function applyCaretFormat() { var rng, caretContainer, textNode, offset, bookmark, container, text; rng = selection.getRng(true); offset = rng.startOffset; @@ -18646,11 +18648,11 @@ if (block && dom.isEmpty(block)) { // Replace formatNode with caretContainer when removing format from empty block like <p><b>|</b></p> formatNode.parentNode.replaceChild(caretContainer, formatNode); } else { - // Insert caret container after the formated node + // Insert caret container after the formatted node dom.insertAfter(caretContainer, formatNode); } // Move selection to text node selection.setCursorLocation(node, 1); @@ -21396,11 +21398,11 @@ * License: http://www.tinymce.com/license * Contributing: http://www.tinymce.com/contributing */ /** - * This utilitiy class is used for easier inheritage. + * This utilitiy class is used for easier inheritance. * * Features: * * Exposed super functions: this._super(); * * Mixins * * Dummy functions @@ -23453,11 +23455,11 @@ * Contributing: http://www.tinymce.com/contributing */ /** * This class will automatically reflow controls on the next animation frame within a few milliseconds on older browsers. - * If the user manually reflows then the automatic reflow will be cancelled. This class is unsed internally when various control states + * If the user manually reflows then the automatic reflow will be cancelled. This class is used internally when various control states * changes that triggers a reflow. * * @class tinymce.ui.ReflowQueue * @static */ @@ -29030,11 +29032,11 @@ } else { record.target.removeAttribute("style"); } } - // Remove all spans that isn't maked and retain selection + // Remove all spans that aren't marked and retain selection Tools.each(record.addedNodes, function(node) { if (node.nodeName == "SPAN" && !node.getAttribute('mce-data-marked')) { var offset, container; if (node == caretElement) { @@ -32663,11 +32665,11 @@ function SelectionOverrides(editor) { var rootNode = editor.getBody(), caretWalker = new CaretWalker(rootNode); var getNextVisualCaretPosition = curry(getVisualCaretPosition, caretWalker.next); var getPrevVisualCaretPosition = curry(getVisualCaretPosition, caretWalker.prev), fakeCaret = new FakeCaret(editor.getBody(), isBlock), - realSelectionId = editor.dom.uniqueId(), + realSelectionId = 'sel-' + editor.dom.uniqueId(), selectedContentEditableNode, $ = editor.$; function isBlock(node) { return editor.dom.isBlock(node); } @@ -33905,10 +33907,14 @@ if (Plugin && inArray(initializedPlugins, plugin) === -1) { each(PluginManager.dependencies(plugin), function(dep) { initPlugin(dep); }); + if (self.plugins[plugin]) { + return; + } + pluginInstance = new Plugin(self, pluginUrl, self.$); self.plugins[plugin] = pluginInstance; if (pluginInstance.init) { @@ -35556,11 +35562,11 @@ }, _refreshContentEditable: function() { var self = this, body, parent; - // Check if the editor was hidden and the re-initalize contentEditable mode by removing and adding the body again + // Check if the editor was hidden and the re-initialize contentEditable mode by removing and adding the body again if (self._isHidden()) { body = self.getBody(); parent = body.parentNode; parent.removeChild(body); @@ -35885,11 +35891,11 @@ editor.on('focusout', function() { Delay.setEditorTimeout(editor, function() { var focusedEditor = editorManager.focusedEditor; - // Still the same editor the the blur was outside any editor UI + // Still the same editor the blur was outside any editor UI if (!isUIElement(getActiveElement()) && focusedEditor == editor) { editor.fire('blur', {focusedEditor: null}); editorManager.focusedEditor = null; // Make sure selection is valid could be invalid if the editor is blured and removed before the timeout occurs @@ -36090,19 +36096,19 @@ * Minor version of TinyMCE build. * * @property minorVersion * @type String */ - minorVersion: '3.0', + minorVersion: '3.1', /** * Release date of TinyMCE build. * * @property releaseDate * @type String */ - releaseDate: '2015-11-23', + releaseDate: '2015-11-30', /** * Collection of editor instances. * * @property editors @@ -43097,6 +43103,6 @@ }; }; }); expose(["tinymce/geom/Rect","tinymce/util/Promise","tinymce/util/Delay","tinymce/dom/EventUtils","tinymce/dom/Sizzle","tinymce/Env","tinymce/util/Tools","tinymce/dom/DomQuery","tinymce/html/Styles","tinymce/dom/TreeWalker","tinymce/html/Entities","tinymce/dom/DOMUtils","tinymce/dom/ScriptLoader","tinymce/AddOnManager","tinymce/dom/RangeUtils","tinymce/html/Node","tinymce/html/Schema","tinymce/html/SaxParser","tinymce/html/DomParser","tinymce/html/Writer","tinymce/html/Serializer","tinymce/dom/Serializer","tinymce/util/VK","tinymce/dom/ControlSelection","tinymce/dom/BookmarkManager","tinymce/dom/Selection","tinymce/Formatter","tinymce/UndoManager","tinymce/EditorCommands","tinymce/util/URI","tinymce/util/Class","tinymce/util/EventDispatcher","tinymce/util/Observable","tinymce/ui/Selector","tinymce/ui/Collection","tinymce/ui/ReflowQueue","tinymce/ui/Control","tinymce/ui/Factory","tinymce/ui/KeyboardNavigation","tinymce/ui/Container","tinymce/ui/DragHelper","tinymce/ui/Scrollable","tinymce/ui/Panel","tinymce/ui/Movable","tinymce/ui/Resizable","tinymce/ui/FloatPanel","tinymce/ui/Window","tinymce/ui/MessageBox","tinymce/WindowManager","tinymce/ui/Tooltip","tinymce/ui/Widget","tinymce/ui/Progress","tinymce/ui/Notification","tinymce/NotificationManager","tinymce/EditorObservable","tinymce/Shortcuts","tinymce/Editor","tinymce/util/I18n","tinymce/FocusManager","tinymce/EditorManager","tinymce/util/XHR","tinymce/util/JSON","tinymce/util/JSONRequest","tinymce/util/JSONP","tinymce/util/LocalStorage","tinymce/Compat","tinymce/ui/Layout","tinymce/ui/AbsoluteLayout","tinymce/ui/Button","tinymce/ui/ButtonGroup","tinymce/ui/Checkbox","tinymce/ui/ComboBox","tinymce/ui/ColorBox","tinymce/ui/PanelButton","tinymce/ui/ColorButton","tinymce/util/Color","tinymce/ui/ColorPicker","tinymce/ui/Path","tinymce/ui/ElementPath","tinymce/ui/FormItem","tinymce/ui/Form","tinymce/ui/FieldSet","tinymce/ui/FilePicker","tinymce/ui/FitLayout","tinymce/ui/FlexLayout","tinymce/ui/FlowLayout","tinymce/ui/FormatControls","tinymce/ui/GridLayout","tinymce/ui/Iframe","tinymce/ui/Label","tinymce/ui/Toolbar","tinymce/ui/MenuBar","tinymce/ui/MenuButton","tinymce/ui/MenuItem","tinymce/ui/Menu","tinymce/ui/ListBox","tinymce/ui/Radio","tinymce/ui/ResizeHandle","tinymce/ui/SelectBox","tinymce/ui/Slider","tinymce/ui/Spacer","tinymce/ui/SplitButton","tinymce/ui/StackLayout","tinymce/ui/TabPanel","tinymce/ui/TextBox","tinymce/ui/Throbber"]); -})(window); +})(this); \ No newline at end of file