knguyen     2004/11/10 20:07:19 CET

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/views/jsp/jahia/htmleditors/htmlarea htmlarea.js 
  Log:
  - fix for JAHIA-165
  
  Revision  Changes    Path
  1.1.2.5   +10 -8     
jahia/src/views/jsp/jahia/htmleditors/htmlarea/htmlarea.js
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/htmlarea.js.diff?r1=1.1.2.4&r2=1.1.2.5&f=h
  
  
  
  Index: htmlarea.js
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/views/jsp/jahia/htmleditors/htmlarea/Attic/htmlarea.js,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- htmlarea.js       26 Oct 2004 16:55:03 -0000      1.1.2.4
  +++ htmlarea.js       10 Nov 2004 19:07:19 -0000      1.1.2.5
  @@ -9,7 +9,7 @@
   // Version 3.0 developed by Mihai Bazon.
   //   http://dynarch.com/mishoo
   //
  -// $Id: htmlarea.js,v 1.1.2.4 2004/10/26 16:55:03 knguyen Exp $
  +// $Id: htmlarea.js,v 1.1.2.5 2004/11/10 19:07:19 knguyen Exp $
   
   if (typeof _editor_url == "string") {
        // Leave exactly one backslash at the end of _editor_url
  @@ -1623,21 +1623,23 @@
            case "cut":
            case "copy":
            case "paste":
  -             try {
  +             /* 
  +                      Curiously, if we don't catch the exception, we can 
perform CUT/COPY/PAST with shortcuts :
  +                      CTRL+X,CTRL+C,CTRL+V 
  +             */
  +             //try {
                        if (this.config.killWordOnPaste)
                                this._wordClean();
                        this._doc.execCommand(cmdID, UI, param);
  -                     // Jahia cleaning a bit more
  -                     this._doc.body.innerHTML = this.getHTML();
  -                     this._doc.body.innerHTML = this.getHTML();
  -             } catch (e) {
  +                     //} catch (e) {
  +                     /*
                        if (HTMLArea.is_gecko) {
                                if (confirm("Unprivileged scripts cannot access 
Cut/Copy/Paste programatically " +
                                            "for security reasons.  Click OK to 
see a technical note at mozilla.org " +
                                            "which shows you how to allow a 
script to access the clipboard."))
                                        
window.open("http://mozilla.org/editor/midasdemo/securityprefs.html";);
  -                     }
  -             }
  +                       }*/
  +             //}
                
                break;
            case "lefttoright":
  

Reply via email to