Merge branch 'master' of https://github.com/b3log/wide

README.md

@@ -1,4 +1,4 @@
-# Wide
+# Wide [![Build Status](https://drone.io/github.com/b3log/wide/status.png)](https://drone.io/github.com/b3log/wide/latest)
 
 ## Intro
 

conf/wide.json

@@ -15,13 +15,23 @@
             "Password": "admin",
             "Workspace": "{pwd}/data/user_workspaces/admin",
             "LatestSessionContent": {
-                "FileTree": [
+                "fileTree": [
-                    "D:\\GoGoGo\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest",
+                    "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest",
-                    "D:\\GoGoGo\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\hello",
+                    "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\123",
-                    "D:\\GoGoGo\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\time"
+                    "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\hello",
+                    "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\time",
+                    "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\time\\pkg",
+                    "D:\\go\\src\\pkg\\archive",
+                    "D:\\go\\src\\pkg\\archive\\tar",
+                    "D:\\go\\src\\pkg\\archive\\tar\\testdata"
                 ],
-                "Files": [],
+                "files": [
-                "CurrentFile": ""
+                    "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\1123",
+                    "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\123\\q.exe",
+                    "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\hello\\2.json",
+                    "D:\\go\\src\\pkg\\archive\\tar\\testdata\\small.txt"
+                ],
+                "currentFile": "D:\\go\\src\\pkg\\archive\\tar\\testdata\\small.txt"
             }
         }
     ]

i18n/zh_CN.json

@@ -34,5 +34,7 @@
     "notification_3": "没有检查到 ide_stub，这将会导致 [跳转到声明]、[查找使用] 失效",
     "goto_line": "跳转到行",
     "goto": "跳转",
-    "input_no_empty": "输入不能为空"
+    "input_no_empty": "输入不能为空",
+    "tip": "提示",
+    "confirm": "确定"
 }

static/css/base.css

@@ -74,6 +74,19 @@ ul {
 .icon-buildrun:before {
     content: "\e607";
 }
+
+.ico-close {
+    color: #666;
+}
+
+.ico-close:hover {
+    color: #333;
+}
+
+.ico-close:before {
+    content: "\e60a";
+    cursor: pointer;
+}
 /* end reset & function */
 
 /* start frame */
@@ -133,20 +146,6 @@ ul {
 .tabs > div.current {
     background-color: #F7F7F7;
 }
-
-.tabs .ico-close {
-    color: #666;
-}
-
-.tabs .ico-close:hover {
-    color: #333;
-}
-
-.tabs .ico-close:before {
-    content: "\e60a";
-    cursor: pointer;
-
-}
 /* end tabs */
 
 /* start framework */

static/css/dialog.css

@@ -43,16 +43,9 @@
 }
 
 .dialog-close-icon {
-    background-position: -15px 0;
-    cursor: pointer;
     float: right;
-    height: 18px;
+    margin: 3px;
-    margin: 5px 3px 0 0;
+    text-decoration: none;
-    width: 18px;
-}
-
-.dialog-close-icon:hover {
-    background-position: -15px -18px;
 }
 
 .dialog-main {
@@ -71,7 +64,8 @@
 }
 
 #dialogRemoveConfirm,
-.dialog-prompt {
+.dialog-prompt,
+#dialogAlert {
     padding: 10px 20px 0;
     overflow: hidden;
 }

static/js/dialog.js

@@ -99,13 +99,16 @@
                     headerHTML = "<div class='"
                     + styleClass.headerBg + "'><div class='"
                     + styleClass.title + "'>"
-                    + settings.title + "</div><a href='javascript:void(0);' class='"
+                    + settings.title + "</div><a href='javascript:void(0);' class='ico-close font-ico "
                     + styleClass.closeIcon + "'></a></div>";
 
             // Sets footerHTML.
             if (!settings.hideFooter) {
+                if (!settings.hiddenOk) {
                     footerHTML = "<button>" + settings.okText +
-                        "</button><button>"
+                            "</button>";
+                }
+                footerHTML += "<button>"
                         + settings.cancelText + "</button>";
             }
 
@@ -244,7 +247,7 @@
                     settings = inst.settings;
             $.dialog._close(id, settings);
         },
-        _openDialog: function(target) {
+        _openDialog: function (target, msg) {
             var inst = this._getInst(target);
             var id = inst.id,
                     settings = inst.settings;
@@ -259,7 +262,7 @@
             $("#" + id + "Dialog .dialog-footer button:eq(0)").focus();
 
             if (typeof settings.afterOpen === "function") {
-                settings.afterOpen();
+                settings.afterOpen(msg);
             }
         },
         _updateDialog: function (target, data) {
@@ -273,7 +276,7 @@
                 $dialog.css({
                     "top": data.position.top,
                     "left": data.position.left
-                })
+                });
             }
 
             if (data.width) {

static/js/editor.js

@@ -161,7 +161,7 @@ var editors = {
                         dataType: "json",
                         success: function (data) {
                             if (!data.succ) {
-                                alert(data.msg);
+                                $("#dialogAlert").dialog("open", data.msg);
 
                                 return false;
                             }

static/js/tree.js

@@ -161,7 +161,7 @@ var tree = {
                 dataType: "json",
                 success: function (data) {
                     if (!data.succ) {
-                        alert(data.msg);
+                        $("#dialogAlert").dialog("open", data.msg);
 
                         return false;
                     }

static/js/wide.js

@@ -67,6 +67,17 @@ var wide = {
     curEditor: undefined,
     bottomWindowTab: undefined,
     _initDialog: function() {
+        $("#dialogAlert").dialog({
+            "height": 26,
+            "width": 260,
+            "title": config.label.tip,
+            "hiddenOk": true,
+            "cancelText": config.label.confirm,
+            "afterOpen": function(msg) {
+                $("#dialogAlert").html(msg);
+            }
+        });
+        
         $("#dialogRemoveConfirm").dialog({
             "height": 26,
             "width": 260,
@@ -115,7 +126,6 @@ var wide = {
             }
         });
 
-
         $(".dialog-prompt > input").keydown(function(event) {
             $(".dialog-prompt > .tip").text('');
             

view/index.html

@@ -172,6 +172,7 @@
         <div id="dialogRemoveConfirm">
             {{.i18n.isDelete}} <b></b>?
         </div>
+        <div id="dialogAlert"></div>
         <div id="dialogNewFilePrompt" class="dialog-prompt">
             <input/><span class="tip"></span>
         </div>
@@ -193,6 +194,8 @@
                             "create": "{{.i18n.create}}",
                             "create_file": "{{.i18n.create_file}}",
                             "create_dir": "{{.i18n.create_dir}}",
+                            "tip": "{{.i18n.tip}}",
+                            "confirm": "{{.i18n.confirm}}"
                     },
                             "channel": {
                             "editor": '{{.conf.EditorChannel}}',