Permalink
Browse files

build 928: fixes and add new CKEditor version

Signed-off-by: Fabian Vogelsteller <fabian@frozeman.de>
  • Loading branch information...
1 parent 2267ffb commit a4e87ac6c3bee18cfdb8a85e0594e766bf85803b @frozeman committed Jun 11, 2012
Showing with 95 additions and 50 deletions.
  1. +2 −1 CHANGELOG
  2. +1 −1 library/classes/FeinduraBase.class.php
  3. +1 −1 library/classes/GeneralFunctions.class.php
  4. +1 −1 library/controllers/frontendEditing.controller.php
  5. +3 −0 library/includes/editor.include.php
  6. +15 −14 library/javascripts/content.js
  7. +4 −4 library/javascripts/frontendEditing.js
  8. +13 −1 library/thirdparty/ckeditor/CHANGES.html
  9. +3 −3 library/thirdparty/ckeditor/ckeditor.asp
  10. +2 −2 library/thirdparty/ckeditor/ckeditor.js
  11. +1 −1 library/thirdparty/ckeditor/ckeditor.php
  12. +1 −1 library/thirdparty/ckeditor/ckeditor_basic.js
  13. +3 −3 library/thirdparty/ckeditor/ckeditor_php4.php
  14. +3 −3 library/thirdparty/ckeditor/ckeditor_php5.php
  15. +3 −2 library/thirdparty/ckeditor/lang/_translationstatus.txt
  16. +1 −1 library/thirdparty/ckeditor/lang/da.js
  17. +1 −1 library/thirdparty/ckeditor/lang/el.js
  18. +6 −0 library/thirdparty/ckeditor/lang/id.js
  19. +1 −1 library/thirdparty/ckeditor/lang/ro.js
  20. +3 −2 library/thirdparty/ckeditor/plugins/a11yhelp/lang/_translationstatus.txt
  21. +1 −1 library/thirdparty/ckeditor/plugins/a11yhelp/lang/da.js
  22. +1 −1 library/thirdparty/ckeditor/plugins/a11yhelp/lang/el.js
  23. +6 −0 library/thirdparty/ckeditor/plugins/a11yhelp/lang/ro.js
  24. +1 −1 library/thirdparty/ckeditor/plugins/devtools/plugin.js
  25. +1 −1 library/thirdparty/ckeditor/plugins/placeholder/lang/da.js
  26. +2 −0 library/thirdparty/ckeditor/plugins/specialchar/lang/_translationstatus.txt
  27. +6 −0 library/thirdparty/ckeditor/plugins/specialchar/lang/el.js
  28. +6 −0 library/thirdparty/ckeditor/plugins/specialchar/lang/he.js
  29. +1 −1 library/views/listPages.php
  30. +1 −1 library/views/windowBox/fileManager.php
  31. +1 −1 snippets/example.php
View
@@ -1,7 +1,7 @@
feindura - Flat File Content Management System
Version
2.0
-Build 927
+Build 928
==================================================
Copyright (C) Fabian Vogelsteller [frozeman.de]
published under the GNU General Public License version 3
@@ -24,6 +24,7 @@ ChangeLog:
2.0
+ build 928: fixes and add new CKEditor version
build 927: add replaceContent in the frontend editing, to be able to view the snippets imediately
build 926: add text to the plugins, how to add it in the editor
build 925: made thumbnail upload ajax based, when updating the image in the editor page
@@ -1102,7 +1102,7 @@ protected function createTitle($pageContent, $titleLength = false, $titleAsLink
$uniqueId = md5(rand(0,9999));
$titleText = '<span class="feindura_editTitle" id="feindura_editTitle'.$pageContent['id'].'_'.$uniqueId.'" data-feindura="'.$pageContent['id'].' '.$pageContent['category'].' '.$langCode.'">'.$this->getLocalized($pageContent,'title',$langCode).'</span>';
- $titleText .= '<script type="text/javascript">/* <![CDATA[ */ $("feindura_editTitle'.$pageContent['id'].'_'.$uniqueId.'").store("content",$("feindura_editTitle'.$pageContent['id'].'_'.$uniqueId.'").get("html")); /* ]]> */</script>'."\n";
+ $titleText .= '<script type="text/javascript">/* <![CDATA[ */ $("feindura_editTitle'.$pageContent['id'].'_'.$uniqueId.'").store("editContent",$("feindura_editTitle'.$pageContent['id'].'_'.$uniqueId.'").get("html")); /* ]]> */</script>'."\n";
} else
$titleText = $this->getLocalized($pageContent,'title');
@@ -1590,7 +1590,7 @@ public function replaceCodeSnippets($pageContentString, $pageId, $removeSnippets
// Store the content of the snippet in a variable
ob_start();
- @include(dirname(__FILE__).'/../../snippets/'.$feindura_match[3]);
+ include(dirname(__FILE__).'/../../snippets/'.$feindura_match[3]);
$snippet = ob_get_contents();
ob_end_clean();
@@ -70,7 +70,7 @@
$return = '####SAVING-ERROR####';
}
- // echo $return;
+ echo $return; // needed for editor.php title edit
}
// ACTIVATE/DEACTIVATE frontend editing
@@ -96,6 +96,9 @@
CKEDITOR.config.bodyId = '<?php echo $editorStyleId; ?>';
CKEDITOR.config.bodyClass = '<?php echo $editorStyleClass; ?>';
+ CKEDITOR.config.forceEnterMode = true; // forces p inside a div
+
+
<?php
// ENTER MODE
if($adminConfig['editor']['enterMode'] == 'br') { ?>
@@ -1509,21 +1509,22 @@ window.addEvent('domready', function() {
// ------------------------------
// CONFIG the HTMlEditor
- CKEDITOR.config.dialog_backgroundCoverColor = '#333333';
- CKEDITOR.config.uiColor = '#cccccc';
- CKEDITOR.config.width = 792;
- if($('documentSaved') !== null && $('documentSaved').hasClass('saved'))
- CKEDITOR.config.height = editorTweenToHeight;
+ CKEDITOR.config.dialog_backgroundCoverColor = '#333333';
+ CKEDITOR.config.uiColor = '#cccccc';
+ CKEDITOR.config.width = 792;
+ if($('documentSaved') !== null && $('documentSaved').hasClass('saved'))
+ CKEDITOR.config.height = editorTweenToHeight;
else
- CKEDITOR.config.height = editorStartHeight;
- CKEDITOR.config.resize_minWidth = 792;
- CKEDITOR.config.resize_maxWidth = 1400;
- CKEDITOR.config.resize_minHeight = (editorStartHeight+136);
- CKEDITOR.config.resize_maxHeight = 900;
- CKEDITOR.config.forcePasteAsPlainText = false; // was true
- CKEDITOR.config.scayt_autoStartup = false;
- CKEDITOR.config.colorButton_enableMore = true;
- CKEDITOR.config.entities = false;
+ CKEDITOR.config.height = editorStartHeight;
+ CKEDITOR.config.resize_minWidth = 792;
+ CKEDITOR.config.resize_maxWidth = 1400;
+ CKEDITOR.config.resize_minHeight = (editorStartHeight+136);
+ CKEDITOR.config.resize_maxHeight = 900;
+ CKEDITOR.config.forcePasteAsPlainText = false; // was true
+ CKEDITOR.config.pasteFromWordNumberedHeadingToList = true;
+ CKEDITOR.config.scayt_autoStartup = false;
+ CKEDITOR.config.colorButton_enableMore = true;
+ CKEDITOR.config.entities = false;
CKEDITOR.config.protectedSource.push( /<\?[\s\S]*?\?>/g ); // protect php code
//CKEDITOR.config.disableNativeSpellChecker = false;
if($('documentSaved') === null || !$('documentSaved').hasClass('saved'))
@@ -155,13 +155,13 @@
if(isUnloading)
return;
-
+
new Request.HTML({
url: feindura_url + feindura_basePath + 'library/controllers/frontendEditing.controller.php',
method: 'post',
link: 'cancel',
update: block,
- evalScripts: false,
+ evalScripts: false
// onSuccess: function(responseTree, responseElements, responseHTML, responseJavaScript) {
// block.set('html',responseHTML);
// Browser.exec(responseJavaScript);
@@ -243,7 +243,7 @@
} else {
// set the session var
- new Request({ url: feindura_url + feindura_basePath + 'library/controllers/frontendEditing.controller.php' }).send('deactivateFrontendEditing=true');
+ new Request({ url: feindura_url + feindura_basePath + 'library/controllers/frontendEditing.controller.php', link: 'chain' }).send('deactivateFrontendEditing=true');
logo.tween('top', '-55px');
if(typeOf($$('div.MooRTE.rtePageTop')[0]) !== 'null')
@@ -292,7 +292,7 @@
function activate() {
// set the session var
- new Request({ url: feindura_url + feindura_basePath + 'library/controllers/frontendEditing.controller.php' }).send('deactivateFrontendEditing=false');
+ new Request({ url: feindura_url + feindura_basePath + 'library/controllers/frontendEditing.controller.php', link: 'chain' }).send('deactivateFrontendEditing=false');
topBarVisible = true;
@@ -35,6 +35,18 @@
CKEditor Changelog
</h1>
<h3>
+ CKEditor 3.6.4 (SVN)</h3>
+ <p>
+ New features:</p>
+ <ul>
+ <li></li>
+ </ul>
+ <p>
+ Fixed issues:</p>
+ <ul>
+ <li></li>
+ </ul>
+ <h3>
CKEditor 3.6.3</h3>
<p>
New features:</p>
@@ -163,7 +175,7 @@
<li><a href="http://dev.ckeditor.com/ticket/8179">#8179</a> : Hungarian;</li>
<li><a href="http://dev.ckeditor.com/ticket/8128">#8128</a> : Italian;</li>
<li><a href="http://dev.ckeditor.com/ticket/8371">#8371</a> : Lithuanian;</li>
- <li><a href="http://dev.ckeditor.com/ticket/8126">#8126</a>, <a href="http://dev.ckeditor.com/ticket/8256">#8256</a> : Norwegian (Bokmal and Nynorsk);</li>
+ <li><a href="http://dev.ckeditor.com/ticket/8126">#8126</a>, <a href="http://dev.ckeditor.com/ticket/8256">#8256</a> : Norwegian (Bokmål and Nynorsk);</li>
<li><a href="http://dev.ckeditor.com/ticket/8356">#8356</a> : Persian;</li>
<li>Polish;</li>
<li>Portuguese (Brazil);</li>
@@ -91,9 +91,9 @@ Class CKEditor
Private Sub Class_Initialize()
- version = "3.6.3"
- timeStamp = "C3HA5RM"
- mTimeStamp = "C3HA5RM"
+ version = "3.6.3 (SVN)"
+ timeStamp = "C5775S3"
+ mTimeStamp = "C5775S3"
Set oInstanceConfig = CreateObject("Scripting.Dictionary")
Set oAllInstancesConfig = CreateObject("Scripting.Dictionary")
Oops, something went wrong.

0 comments on commit a4e87ac

Please sign in to comment.