Skip to content

Commit

Permalink
updated to version 4.5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
mrbaseman committed Feb 22, 2016
1 parent 6dcde47 commit 3fdb1cb
Show file tree
Hide file tree
Showing 159 changed files with 8,200 additions and 3,901 deletions.
15 changes: 14 additions & 1 deletion backend.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,17 @@ For licensing, see LICENSE.md or http://ckeditor.com/license
{
width: auto !important;
}

.fm-modal {
z-index: 10011; /** Because CKEditor image dialog was at 10010 */
width:80%;
height:80%;
top: 10%;
left:10%;
border:0;
position:fixed;
-moz-box-shadow: 0px 1px 5px 0px #656565;
-webkit-box-shadow: 0px 1px 5px 0px #656565;
-o-box-shadow: 0px 1px 5px 0px #656565;
box-shadow: 0px 1px 5px 0px #656565;
filter:progid:DXImageTransform.Microsoft.Shadow(color=#656565, Direction=180, Strength=5);
}
28 changes: 27 additions & 1 deletion ckeditor/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,32 @@
CKEditor 4 Changelog
====================

## CKEditor 4.5.6

New Features:

* Introduced the [`CKEDITOR.tools.getCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCookie) and [`CKEDITOR.tools.setCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-setCookie) methods for accessing cookies.
* Introduced the [`CKEDITOR.tools.getCsrfToken()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCsrfToken) method. The CSRF token is now automatically sent by the [File Browser](http://ckeditor.com/addon/filebrowser) and [File Tools](http://ckeditor.com/addon/filetools) plugins during file uploads. The server-side upload handlers may check it and use it to additionally secure the communication.

Other Changes:

* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type):
- New features:
- CKEditor [Language](http://ckeditor.com/addon/language) plugin support.
- CKEditor [Placeholder](http://ckeditor.com/addon/placeholder) plugin support.
- [Drag&Drop](http://sdk.ckeditor.com/samples/fileupload.html) support.
- **Experimental** [GRAYT](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-grayt_autoStartup) (Grammar As You Type) functionality.
- Fixed issues:
* [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98): SCAYT affects dialog double-click. Fixed in SCAYT core.
* [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102): SCAYT core performance enhancements.
* [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104): SCAYT's spans leak into the clipboard and after pasting.
* [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105): A JavaScript error fired in case of multiple instances of CKEditor on one page.
* [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107): SCAYT should not check non-editable parts of content.
* [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108): Latest SCAYT copies the ID of the editor element to the iframe.
* SCAYT stops working when CKEditor [Undo plugin](http://ckeditor.com/addon/undo) not enabled.
* Issue with pasting SCAYT markup in CKEditor.
* SCAYT stops working after pressing the *Cancel* button in the WSC dialog.

## CKEditor 4.5.5

Fixed Issues:
Expand All @@ -23,7 +49,7 @@ Fixed Issues:

Other Changes:

* [#13859](http://dev.ckeditor.com/ticket/13859): Test cases created with `benter.tools.createTestsForEditors` will also receive editor bot as a second parameter.
* [#13859](http://dev.ckeditor.com/ticket/13859): Test cases created with `bender.tools.createTestsForEditors` will also receive editor bot as a second parameter.

## CKEditor 4.5.4

Expand Down
18 changes: 16 additions & 2 deletions ckeditor/CKEditorPlus.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,14 @@ class CKEditorPlus extends CKEditor
)
);

public function setTemplatePath ($templateFolder='') {
// public function __construct() { }

public function setTemplatePath ($templateFolder='')
{
// static $initComplete;
if($templateFolder=='') { return; }
$this->templateFolder = $templateFolder;
$_config = $this->config;
foreach($this->files as $key=>$val) {
foreach($val as $temp_path) {
$base = "/templates/".$this->templateFolder.$temp_path;
Expand All @@ -76,6 +81,7 @@ public function setTemplatePath ($templateFolder='') {
}
}
}
$this->config = array_merge($_config, $this->paths);;
}

/**
Expand Down Expand Up @@ -137,7 +143,9 @@ public function looking_for_wysiwyg_admin( $db ) {
* @param string Optional a path_addition, e.g. "wb:"
*
*/
public function resolve_path($key= "", $aPath, $aPath_default, $path_addition="") {
public function resolve_path($key= "", $aPath, $aPath_default, $path_addition="")
{
static $initComplete = array();
$temp = WB_PATH.$aPath;
if (true === file_exists($temp)) {
$aPath = $path_addition.WB_URL.$aPath;
Expand All @@ -146,9 +154,15 @@ public function resolve_path($key= "", $aPath, $aPath_default, $path_addition=""
}
if (array_key_exists($key, $this->paths)) {
$this->config[$key] = (($this->paths[$key ] == "") ? $aPath : $this->paths[$key]) ;
$initComplete[$key] = $this->config[$key];
} else {
$this->config[$key] = $aPath;
}
/*
print '<pre class="mod-pre rounded">function <span>'.__FUNCTION__.'( '.''.' );</span> filename: <span>'.basename(__FILE__).'</span> line: '.__LINE__.' -> <br />';
print_r( $this->config ); print '</pre>'; flush (); // ob_flush();;sleep(10); die();
*/

}

/**
Expand Down
6 changes: 3 additions & 3 deletions ckeditor/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CKEditor 4
==========

Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
http://ckeditor.com - See LICENSE.md for license information.

CKEditor is a text editor to be used inside web pages. It's not a replacement
Expand Down Expand Up @@ -32,8 +32,8 @@ installation proceeded properly. Take a look at the `samples` directory.

To test your installation, just call the following page at your website:

http://<your site>/<CKEditor installation path>/samples/index.html
http://<your site>/<CKEditor installation path>/samples/index.html

For example:

http://www.example.com/ckeditor/samples/index.html
http://www.example.com/ckeditor/samples/index.html
Loading

0 comments on commit 3fdb1cb

Please sign in to comment.