Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.6.1
[ckeditor.git]
/
_source
/
plugins
/
clipboard
/
plugin.js
diff --git
a/_source/plugins/clipboard/plugin.js
b/_source/plugins/clipboard/plugin.js
index
ebfb1f8
..
3c53ab1
100644
(file)
--- a/
_source/plugins/clipboard/plugin.js
+++ b/
_source/plugins/clipboard/plugin.js
@@
-283,7
+283,9
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
// keyboard paste or execCommand ) (#4874).
\r
CKEDITOR.env.ie && ( depressBeforeEvent = 1 );
\r
\r
// keyboard paste or execCommand ) (#4874).
\r
CKEDITOR.env.ie && ( depressBeforeEvent = 1 );
\r
\r
- var retval = editor.document.$.queryCommandEnabled( command ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED;
\r
+ var retval = CKEDITOR.TRISTATE_OFF;
\r
+ try { retval = editor.document.$.queryCommandEnabled( command ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED; }catch( er ){}
\r
+
\r
depressBeforeEvent = 0;
\r
return retval;
\r
}
\r
depressBeforeEvent = 0;
\r
return retval;
\r
}
\r
@@
-396,6
+398,13
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
} );
\r
});
\r
\r
} );
\r
});
\r
\r
+ // Dismiss the (wrong) 'beforepaste' event fired on context menu open. (#7953)
\r
+ body.on( 'contextmenu', function()
\r
+ {
\r
+ depressBeforeEvent = 1;
\r
+ setTimeout( function() { depressBeforeEvent = 0; }, 10 );
\r
+ });
\r
+
\r
body.on( 'beforecut', function() { !depressBeforeEvent && fixCut( editor ); } );
\r
\r
body.on( 'mouseup', function(){ setTimeout( function(){ setToolbarStates.call( editor ); }, 0 ); }, editor );
\r
body.on( 'beforecut', function() { !depressBeforeEvent && fixCut( editor ); } );
\r
\r
body.on( 'mouseup', function(){ setTimeout( function(){ setToolbarStates.call( editor ); }, 0 ); }, editor );
\r