Corrections submitted by Andreas Waschinski to config.js and edit.php…

… and adds some debugging in helper.php for tests.
turnermm · Nov 6, 2018 · acff500 · acff500
1 parent ce63e2c
commit acff500
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/action/edit.php b/action/edit.php
@@ -599,14 +599,16 @@ function _print()
                     on : {  'instanceReady' : function( evt ) {
                          evt.editor.document.on( 'mousedown', function()
                    {
-                               parent. handlekeypress(evt);
+                              var browser_level = (window.top != window.self) ? window.self : window.top; browser_level.handlekeypress(evt);
+                             //  parent. handlekeypress(evt);
                          } );
                        }
                      },
                      on : {  'instanceReady' : function( evt ) {
                          evt.editor.document.on( 'focus', function()
                       {
-                               parent. handlekeypress(evt);
+                               var browser_level = (window.top != window.self) ? window.self : window.top; browser_level.handlekeypress(evt);
+                              // parent. handlekeypress(evt);
                          } );
                       }
                    },  

diff --git a/ckeditor/config.js b/ckeditor/config.js
diff --git a/ckeditor/config.js.unc b/ckeditor/config.js.unc
@@ -114,12 +114,12 @@ config.colors = new Array(
       config.pasteFromWordRemoveFontStyles = false;   // preserve font style when "paste from word"
       config.pasteFromWordRemoveStyles = false;       // preserve style (color) when "paste from word"
       config.allowedContent=true;                     // preserve highlight when "paste from word"     
-     config.removeButtons = top.remove_styling(); 
+      config.removeButtons = browser_level.remove_styling(); 
      var font_assist = 'FontAssist';
      //config.removeButtons = 'TextColor,BGColor, FontAssist,Font,FontSize';
      if(config.removeButtons.match(/FontAssist/)) font_assist = "";
      config.addPaste = function () {
-         config.extraPlugins +=',pastebase64';       
+     config.extraPlugins +=',pastebase64';       
      }
 
     config.skin =  browser_level.getCKEditorGUI() ? browser_level.getCKEditorGUI() : 'moono';

diff --git a/ckeditor/plugins/plugin.info.txt b/ckeditor/plugins/plugin.info.txt
diff --git a/helper.php b/helper.php
@@ -198,13 +198,17 @@ function getCurrentWikiNS() {
     *    assigned in fckeditor.html
   */
  
- function handlekeypress (e) {  
- 
+ var  nn__nn=0;
+ var getnum = function () {  return (++nn__nn);  } 
  
+ function handlekeypress (e) {  
+    var n = getnum();
    if(ourLockTimerIsSet) {
          lockTimerRefresh();        
    }
    window.dwfckTextChanged = true;
+   
+   console.log('TextChanged  ' + n);
  }
 
  function unsetDokuWikiLockTimer() {

diff --git a/plugin.info.txt b/plugin.info.txt
@@ -1,7 +1,7 @@
 base  ckgedit
 author  Myron Turner
 email  [email protected]
-date 2018-10-30
+date 2018-11-05
 name  ckgedit
 desc  WYSIWYG plugin for Dokuwiki
 url  https://www.dokuwiki.org/plugin:ckgedit

diff --git a/version b/version
@@ -1,2 +1,2 @@
-master_18-Oct_30-20_37
+iframe_18-Nov_05-21_38