Changeset 1198

Show
Ignore:
Timestamp:
11/07/09 23:06:56 (3 years ago)
Author:
gogo
Message:

Ticket #1387

  • modules/insertImage/pluginMethods.js already fixed at some point
  • modules/InternetExplorer/InternetExplorer.js I've added in the patch, if it's preventing a crash I see no good reason to with-hold
  • plugins/ContextMenu/ContextMenu.js - patch not applied, _insertImage() is correct I think
  • plugins/ContextMenu/menu.css - patch applied, can't see any harm
  • popups/editor_help.html - patch applied, agree for the end user "Editor" is better than "Xinha"
  • XinhaCore?.js - saveas button patch applied, missing return applied, removal of "false" not applied, I don't think the return is checked anywhere anyway so no need to change, GET vs HEAD already dealt with in #1429
Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/XinhaCore.js

    r1192 r1198  
    11291129    toggleborders: [ "Toggle Borders", ["ed_buttons_main.png",7,2], false, function(e) { e._toggleBorders(); } ], 
    11301130    print: [ "Print document", ["ed_buttons_main.png",8,1], false, function(e) { if(Xinha.is_gecko) {e._iframe.contentWindow.print(); } else { e.focusEditor(); print(); } } ], 
    1131     saveas: [ "Save as", "ed_saveas.png", false, function(e) { e.execCommand("saveas",false,"noname.htm"); } ], 
     1131    saveas: [ "Save as", ["ed_buttons_main.png",9,1], false, function(e) { e.execCommand("saveas",false,"noname.htm"); } ], 
    11321132    about: [ "About this editor", ["ed_buttons_main.png",8,2], true, function(e) { e.getPluginInstance("AboutBox").show(); } ], 
    11331133    showhelp: [ "Help using editor", ["ed_buttons_main.png",9,2], true, function(e) { e.execCommand("showhelp"); } ], 
    … …  
    32473247  { // try later 
    32483248    setTimeout(function() { editor.initIframe(); }, 50); 
     3249    return false; 
    32493250  } 
    32503251   

  • trunk/modules/InternetExplorer/InternetExplorer.js

    r1173 r1198  
    452452{ 
    453453  if (!savedSelection) return; 
     454   
     455  // Ticket #1387 
     456  // avoid problem where savedSelection does not implement parentElement().  
     457  // This condition occurs if there was no text selection at the time saveSelection() was called.  In the case  
     458  // an image selection, the situation is confusing... the image may be selected in two different ways:  1) by  
     459  // simply clicking the image it will appear to be selected by a box with sizing handles; or 2) by clicking and  
     460  // dragging over the image as you might click and drag over text.  In the first case, the resulting selection  
     461  // object does not implement parentElement(), leading to a crash later on in the code below.  The following  
     462  // hack avoids that problem.  
     463  if (!savedSelection.parentElement)  
     464  { 
     465    return; 
     466  }  
     467   
    454468  // In order to prevent triggering the IE bug mentioned below, we will try to 
    455469  // optimize by not restoring the selection if it happens to match the current 

  • trunk/popups/editor_help.html

    r740 r1198  
    2424 
    2525<body class="dialog" onload="Init()"> 
    26 <div class="title">Xinha Help</div> 
     26<div class="title">Editor Help</div> 
    2727<table width="100%" style="background: white none repeat scroll 0%;"> 
    2828  <thead style="border: 1px solid gray; background: silver none repeat scroll 0%;">