Skip to content
Permalink
Browse files

Merge branch 't/12930'

  • Loading branch information...
pjasiun committed Mar 2, 2015
2 parents 4176abb + 3588f4e commit d3b2b45c99881537dd1cd8142bd0d02ec2f9f98d
Showing with 8 additions and 3 deletions.
  1. +1 −0 CHANGES.md
  2. +1 −1 tests/plugins/mathjax/frameWrapper.js
  3. +6 −2 tests/plugins/mathjax/mathjax.js
@@ -13,6 +13,7 @@ Fixed Issues:
Other Changes:

* [#12844](http://dev.ckeditor.com/ticket/12844): Upgraded the [testing environment](http://docs.ckeditor.com/#!/guide/dev_tests) to [Bender.js](https://github.com/benderjs/benderjs) `0.2.*`.
* [#12930](http://dev.ckeditor.com/ticket/12930): Because of licenses, removed truncated-mathjax from the test directory, now `bender.config.mathJaxLibPath` need to be configured manually.

## CKEditor 4.4.7

@@ -17,7 +17,7 @@
doc = iFrame.getFrameDocument(),
fakeEditor = {
config: {
mathJaxLib: 'http://cdn.mathjax.org/mathjax/2.2-latest/MathJax.js?config=TeX-AMS_HTML'
mathJaxLib: ''
},
fire: function() {
//mock
@@ -6,7 +6,7 @@

CKEDITOR.disableAutoInline = true;

var mathJaxLib = 'http://cdn.mathjax.org/mathjax/2.2-latest/MathJax.js?config=TeX-AMS_HTML';
var mathJaxLib = bender.config.mathJaxLibPath;

var editor;

@@ -47,8 +47,12 @@
},

'async:init': function() {
if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 )
if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
assert.ignore();
}

assert.isString( mathJaxLib,
'bender.config.mathJaxLibPath should be defined with the path to MathJax lib (MathJax.js?config=TeX-AMS_HTML).' );

var tc = this;

0 comments on commit d3b2b45

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