MoinMoin: attachment:FCKeditor-2.2-fixes.diff of MoinMoinBugs/GuiEditor

   1 diff -r 7c58e8af1a97 MoinMoin/action/fckdialog.py
   2 --- a/MoinMoin/action/fckdialog.py	Thu Dec 07 21:35:43 2006 +0100
   3 +++ b/MoinMoin/action/fckdialog.py	Thu Feb 01 19:29:42 2007 -0800
   4 @@ -246,7 +246,6 @@ def link_dialog(request):
   5          scriptname += "/"
   6      action = scriptname
   7      basepage = request.page.page_name.encode(config.charset)
   8 -    request.emit_http_headers()
   9      request.write('''
  10  <!--
  11   * FCKeditor - The text editor for internet
  12 @@ -397,7 +396,6 @@ def attachment_dialog(request):
  13      if not scriptname or scriptname[-1] != "/":
  14          scriptname += "/"
  15      action = scriptname
  16 -    request.emit_http_headers()
  17      request.write('''
  18  <!--
  19   * FCKeditor - The text editor for internet
  20 diff -r 7c58e8af1a97 MoinMoin/request/__init__.py
  21 --- a/MoinMoin/request/__init__.py	Thu Dec 07 21:35:43 2006 +0100
  22 +++ b/MoinMoin/request/__init__.py	Thu Feb 01 19:30:03 2007 -0800
  23 @@ -1190,7 +1190,7 @@ space between words. Group page name is 
  24          sent_headers = getattr(self, 'sent_headers', 0)
  25          self.sent_headers = sent_headers + 1
  26          if sent_headers:
  27 -            raise HeadersAlreadySentException("emit_http_headers called multiple (%d) times! Headers: %r" % (sent_headers, headers))
  28 +            raise HeadersAlreadySentException("emit_http_headers called multiple (%d) times! Headers: %r" % (sent_headers, all_headers))
  29          #else:
  30          #    self.log("Notice: emit_http_headers called first time. Headers: %r" % all_headers)
  31  
  32 diff -r 7c58e8af1a97 wiki/htdocs/applets/moinFCKplugins/moinbehaviour/fckplugin.js
  33 --- a/wiki/htdocs/applets/moinFCKplugins/moinbehaviour/fckplugin.js	Thu Dec 07 21:35:43 2006 +0100
  34 +++ b/wiki/htdocs/applets/moinFCKplugins/moinbehaviour/fckplugin.js	Thu Feb 01 19:28:52 2007 -0800
  35 @@ -59,7 +59,7 @@ function Doc_OnKeyUp_IE()
  36   * ##########################################################################
  37   */
  38  
  39 -if (FCK.EditorDocument.attachEvent) // IE
  40 +if (document.attachEvent) // IE
  41  {
  42    FCK.EditorDocument.attachEvent('onkeydown', Doc_OnKeyDown_IE);
  43    //FCK.AttachToOnSelectionChange(Doc_OnKeyUp_IE);
  44 diff -r 7c58e8af1a97 wiki/htdocs/applets/moinFCKplugins/moinformat/fckplugin.js
  45 --- a/wiki/htdocs/applets/moinFCKplugins/moinformat/fckplugin.js	Thu Dec 07 21:35:43 2006 +0100
  46 +++ b/wiki/htdocs/applets/moinFCKplugins/moinformat/fckplugin.js	Thu Feb 01 19:28:52 2007 -0800
  47 @@ -20,6 +20,7 @@ var MoinToolbarFontFormatCombo = functio
  48  var MoinToolbarFontFormatCombo = function()
  49  {
  50   this.Command =  FCKCommands.GetCommand('FontFormat');
  51 + this.CommandName = 'FontFormat';
  52  }
  53  
  54  // Inherit from MoinToolbarSpecialCombo.
  55 diff -r 7c58e8af1a97 wiki/htdocs/applets/moinFCKplugins/selection/fckplugin.js
  56 --- a/wiki/htdocs/applets/moinFCKplugins/selection/fckplugin.js	Thu Dec 07 21:35:43 2006 +0100
  57 +++ b/wiki/htdocs/applets/moinFCKplugins/selection/fckplugin.js	Thu Feb 01 19:28:52 2007 -0800
  58 @@ -12,13 +12,14 @@ function showObj(title, obj)
  59  
  60  // --------------------------------
  61  
  62 -if (FCK.EditorWindow.getSelection) // Gecko
  63 +if (window.getSelection) // Gecko
  64  { 
  65    // assume exactly one selection
  66    
  67    FCKSelection.GetStartNode = function()
  68      {
  69        var oSelection = FCK.EditorWindow.getSelection();
  70 +      if(oSelection == null) return null;
  71        var oContainer = oSelection.getRangeAt(0).startContainer;
  72        var iOffset = oSelection.getRangeAt(0).startOffset;
  73        if (oContainer.childNodes.length>iOffset) 
  74 @@ -36,6 +37,7 @@ if (FCK.EditorWindow.getSelection) // Ge
  75    FCKSelection.GetEndNode = function()
  76      {
  77        var oSelection = FCK.EditorWindow.getSelection();
  78 +      if(oSelection == null) return null;
  79        var oContainer = oSelection.getRangeAt(0).endContainer;
  80        var iOffset = oSelection.getRangeAt(0).startEndset;
  81        if (oContainer.childNodes.length>iOffset)