Skip to content
Permalink
Browse files

Merge branch 't/11856' into major

  • Loading branch information...
pjasiun committed Dec 16, 2014
2 parents b709b28 + 99438b9 commit 0a6108f8726f2a32ece12d027e68b766030d5c44
@@ -27,6 +27,7 @@ Fixed Issues:
Other Changes:

* [#10903](http://dev.ckeditor.com/ticket/10903): Performance improvements for [`addClass`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-addClass), [`removeClass`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeClass) and [`hasClass`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-hasClass) methods.
* [#11856](http://dev.ckeditor.com/ticket/11856): jQuery adapter throw an meaningful error if CKEditor or jQuery is not loaded.

## CKEditor 4.4.7

@@ -19,6 +19,14 @@
*/

( function( $ ) {
if ( typeof $ == 'undefined' ) {
throw new Error( 'jQuery should be loaded before CKEditor adapter. Have you mistaken loaded scripts order?' );
}

if ( typeof CKEDITOR == 'undefined' ) {
throw new Error( 'CKEditor core should be loaded before jQuery adapter. Have you mistaken loaded scripts order?' );
}

/**
* Allows CKEditor to override `jQuery.fn.val()`. When set to `true`, the `val()` function
* used on textarea elements replaced with CKEditor uses the CKEditor API.
@@ -47,9 +55,6 @@
:
CKEDITOR.config.jqueryOverrideVal;

if ( typeof $ == 'undefined' )
return;

// jQuery object methods.
$.extend( $.fn, {
/**
@@ -0,0 +1,3 @@
<script>
delete window.CKEDITOR;
</script>
@@ -0,0 +1,4 @@
@bender-ckeditor-adapters: jquery
@bender-tags: 4.5.0, tc, jquery

There should be an error telling that `CKEditor core should be loaded before jQuery adapter`.
@@ -0,0 +1 @@
<script src="%BASE_PATH%../apps/ckeditor/adapters/jquery.js" ></script>
@@ -0,0 +1,3 @@
@bender-tags: 4.5.0, tc

There should be an error telling that `jQuery should be loaded before CKEditor adapter`.

0 comments on commit 0a6108f

Please sign in to comment.
You can’t perform that action at this time.