改进 - 移除 editor fullscreen

getshell0762 · Sep 20, 2016 · c28cf7a · c28cf7a
1 parent 7dfb2a5
commit c28cf7a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 36 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -46,7 +46,6 @@ gulp.task('cc', function () {
 
     var jsCodemirror = ['./src/main/webapp/js/lib/editor/diff_match_patch.js',
         './src/main/webapp/js/lib/editor/codemirror.js',
-        './src/main/webapp/js/lib/editor/fullscreen.js',
         './src/main/webapp/js/lib/editor/placeholder.js',
         './src/main/webapp/js/lib/editor/merge.js',
         './src/main/webapp/js/overwrite/codemirror/addon/hint/show-hint.js',

diff --git a/src/main/webapp/js/add-article.js b/src/main/webapp/js/add-article.js
@@ -19,7 +19,7 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 2.16.10.8, Sep 17, 2016
+ * @version 2.16.10.9, Sep 20, 2016
  */
 
 /**
@@ -140,10 +140,7 @@ var AddArticle = {
                     "Ctrl-/": "autocompleteEmoji",
                     "Cmd-/": "autocompleteEmoji",
                     "Alt-S": "startAudioRecord",
-                    "Alt-R": "endAudioRecord",
-                    "Esc": function (cm) {
-                         cm.setOption("fullScreen", !cm.getOption("fullScreen"));
-                    }
+                    "Alt-R": "endAudioRecord"
                 },
                 toolbar: [
                     {name: 'bold'},
@@ -159,8 +156,7 @@ var AddArticle = {
                     {name: 'redo'},
                     {name: 'undo'},
                     '|',
-                    {name: 'preview'},
-                    {name: 'fullscreen'}
+                    {name: 'preview'}
                 ],
                 status: false
             });
@@ -315,18 +311,14 @@ var AddArticle = {
                     {name: 'redo'},
                     {name: 'undo'},
                     '|',
-                    {name: 'preview'},
-                    {name: 'fullscreen'}
+                    {name: 'preview'}
                 ],
                 extraKeys: {
                     "Alt-/": "autocompleteUserName",
                     "Ctrl-/": "autocompleteEmoji",
                     "Cmd-/": "autocompleteEmoji",
                     "Alt-S": "startAudioRecord",
-                    "Alt-R": "endAudioRecord",
-                    "Esc": function (cm) {
-                         cm.setOption("fullScreen", !cm.getOption("fullScreen"));
-                    }   
+                    "Alt-R": "endAudioRecord"
                 },
                 status: false
             });

diff --git a/src/main/webapp/js/article.js b/src/main/webapp/js/article.js
@@ -297,18 +297,14 @@ var Comment = {
                     {name: 'redo'},
                     {name: 'undo'},
                     '|',
-                    {name: 'preview'},
-                    {name: 'fullscreen'}
+                    {name: 'preview'}
                 ],
                 extraKeys: {
                     "Alt-/": "autocompleteUserName",
                     "Cmd-/": "autocompleteEmoji",
                     "Ctrl-/": "autocompleteEmoji",
                     "Alt-S": "startAudioRecord",
-                    "Alt-R": "endAudioRecord",
-                    "Esc": function (cm) {
-                        cm.setOption("fullScreen", !cm.getOption("fullScreen"));
-                    }
+                    "Alt-R": "endAudioRecord"
                 },
                 status: false
             });

diff --git a/src/main/webapp/js/chat-room.js b/src/main/webapp/js/chat-room.js
@@ -18,7 +18,7 @@
  * @fileoverview 聊天室
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 1.1.0.1, Sep 17, 2016
+ * @version 1.1.0.2, Sep 20, 2016
  */
 
 /**
@@ -72,18 +72,14 @@ var ChatRoom = {
                     {name: 'redo'},
                     {name: 'undo'},
                     '|',
-                    {name: 'preview'},
-                    {name: 'fullscreen'}
+                    {name: 'preview'}
                 ],
                 extraKeys: {
                     "Alt-/": "autocompleteUserName",
                     "Cmd-/": "autocompleteEmoji",
                     "Ctrl-/": "autocompleteEmoji",
                     "Alt-S": "startAudioRecord",
-                    "Alt-R": "endAudioRecord",
-                    "Esc": function (cm) {
-                         cm.setOption("fullScreen", !cm.getOption("fullScreen"));
-                    }
+                    "Alt-R": "endAudioRecord"
                 },
                 status: false
             });

diff --git a/src/main/webapp/js/lib/compress/article-libs.min.js b/src/main/webapp/js/lib/compress/article-libs.min.js
diff --git a/src/main/webapp/js/lib/editor/codemirror.min.js b/src/main/webapp/js/lib/editor/codemirror.min.js