Changeset 2962:10af9b4f1ce0 for plugins/dcCKEditor/js/ckeditor/adapters

Timestamp:

02/17/15 10:21:10 (11 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Update CKEditor to last published release
Fixes #2039

File:

• plugins/dcCKEditor/js/ckeditor/adapters/jquery.js (modified) (8 diffs)

plugins/dcCKEditor/js/ckeditor/adapters/jquery.js

@@ -1 +1 @@
 /**
- * @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md or http://ckeditor.com/license
  */
@@ -19 +19 @@
  */
 
-(function( $ ) {
+( function( $ ) {
      /**
       * Allows CKEditor to override `jQuery.fn.val()`. When set to `true`, the `val()` function
@@ -74 +74 @@
            * A jQuery function which triggers the creation of CKEditor with `<textarea>` and
            * {@link CKEDITOR.dtd#$editable editable} elements.
-           * Every `<textarea>` element will be converted to a framed editor, while any other
-           * supported element will be converted to an inline editor.
+           * Every `<textarea>` element will be converted to a classic (`iframe`-based) editor,
+           * while any other supported element will be converted to an inline editor.
            * This method binds the callback to the `instanceReady` event of all instances.
            * If the editor has already been created, the callback is fired straightaway.
@@ -122 +122 @@
                          dfd = new $.Deferred();
 
-                         promises.push( dfd.promise() );
+                    promises.push( dfd.promise() );
 
                     if ( editor && !instanceLock ) {
@@ -133 +133 @@
 
                          // Handle config.autoUpdateElement inside this plugin if desired.
-                         if ( config.autoUpdateElement
-                              || ( typeof config.autoUpdateElement == 'undefined' && CKEDITOR.config.autoUpdateElement ) ) {
+                         if ( config.autoUpdateElement || ( typeof config.autoUpdateElement == 'undefined' && CKEDITOR.config.autoUpdateElement ) ) {
                               config.autoUpdateElementJquery = true;
                          }
@@ -261 +260 @@
                     } else {
                          // Editor is already during creation process, bind our code to the event.
-                         editor.once( 'instanceReady', function( evt ) {
+                         editor.once( 'instanceReady', function() {
                               setTimeout( function() {
                                    // Delay bit more if editor is still not ready.
@@ -340 +339 @@
                                         promises.push( dfd.promise() );
                                         return true;
+                                        // Call default .val function for rest of elements
+                                   } else {
+                                        return oldValMethod.call( $elem, value );
                                    }
-                                   // Call default .val function for rest of elements
-                                   else
-                                        return oldValMethod.call( $elem, value );
                               } );
 
@@ -373 +372 @@
           } );
      }
-})( window.jQuery );
+} )( window.jQuery );