Changeset 13273

Timestamp:

04/05/08 12:07:33 (8 months ago)

Author:

liucougar

Message:

fixes #3598: just show a dialog to notify user that he can only paste using keyboard shortcut

Location:

dijit/trunk

Files:

• Editor.js (modified) (2 diffs)
• _editor/nls/commands.js (modified) (1 diff)
• _editor/plugins/EnterKeyHandling.js (modified) (1 diff)
• _editor/RichText.js (modified) (1 diff)

dijit/trunk/Editor.js

@@ -146 +146 @@
                                 return this[cmd]();
                         }else{
+                                if(this.customUndo){
+                                        this.endEditing();
+                                        this._beginEditing();
+                                }
                                 try{
-                                        if(this.customUndo){
-                                                this.endEditing();
-                                                this._beginEditing();
-                                        }
                                         var r = this.inherited('execCommand',arguments);
-                                        if(this.customUndo){
-                                                this._endEditing();
-                                        }
-                                        return r;
+                    if(dojo.isSafari && cmd=='paste' && !r){ //see #4598: safari does not support invoking paste from js
+                        var su = dojo.string.substitute, _isM = navigator.userAgent.indexOf("Macintosh") != -1;
+                        alert(su(this.commands.pasteShortcutSafari,[su(this.commands[_isM ? 'appleKey' : 'ctrlKey'], ['V'])]));
+                    }
                                 }catch(e){
                                         if(dojo.isMoz && /copy|cut|paste/.test(cmd)){
@@ -165 +165 @@
                                                         [this.commands[cmd], sub(this.commands[isMac ? 'appleKey' : 'ctrlKey'], [accel[cmd]])]));
                                         }
-                                        return false;
-                                }
+                                        r = false;
+                                }
+                                if(this.customUndo){
+                                        this._endEditing();
+                                }
+                                return r;
                         }
                 },

dijit/trunk/_editor/nls/commands.js

@@ -41 +41 @@
         'systemShortcutFF': 'The "${0}" action is only available in Mozilla Firefox using a keyboard shortcut. Use ${1}.',
         'ctrlKey':'ctrl+${0}',
-        'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+        'appleKey':'\u2318${0}', // "command" or open-apple key on Macintosh
+        'pasteShortcutSafari':'The "paste" action is only available in Safari using a keyboard shortcut. Use ${0}.'
 })

dijit/trunk/_editor/plugins/EnterKeyHandling.js

@@ -146 +146 @@
 
                 //text node directly under body, let's wrap them in a node
-                if(!block.blockNode){
-                        this.editor.document.execCommand('formatblock', false, this.blockNodeForEnter);
+                if(!block.blockNode || block.blockNode===this.editor.editNode){
+                        dijit._editor.RichText.prototype.execCommand.call(this.editor, 'formatblock',this.blockNodeForEnter);
                         //get the newly created block node
                         // FIXME

dijit/trunk/_editor/RichText.js

@@ -450 +450 @@
                 if(!this.iframe){
                         var ifr = this.iframe = dojo.doc.createElement("iframe");
-                        ifr.id=this.id;
+                        ifr.id=this.id+"_iframe";
                         // this.iframe.src = "about:blank";
                         // dojo.doc.body.appendChild(this.iframe);