~canonical-sysadmins/wordpress/4.7.2

« back to all changes in this revision

Viewing changes to wp-includes/js/tinymce/plugins/fullscreen/plugin.js

  • Committer: Barry Price
  • Date: 2016-04-27 04:42:45 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: barry.price@canonical.com-20160427044245-ob1jzpeq2ex7jv07
Merge WP 4.5.1 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
104
104
        }
105
105
 
106
106
        editor.on('init', function() {
107
 
                editor.addShortcut('Meta+Alt+F', '', toggleFullscreen);
 
107
                editor.addShortcut('Ctrl+Shift+F', '', toggleFullscreen);
108
108
        });
109
109
 
110
110
        editor.on('remove', function() {