Merge remote-tracking branch 'refs/remotes/origin/1.5.3-dev'

.gitignore

@@ -10,4 +10,5 @@
 
 /node_modules
 /nbproject
-/workspaces
+/workspaces
+.idea

conf/users/admin.json

@@ -15,8 +15,8 @@
     "Theme": "default",
     "Keymap": "wide",
     "Created": 1414080000000000000,
-    "Updated": 1477750918395543731,
+    "Updated": 1492963306222604966,
-    "Lived": 1477756867409471881,
+    "Lived": 1492963306222604966,
     "Editor": {
         "FontFamily": "Consolas, 'Courier New', monospace",
         "FontSize": "13px",
@@ -26,9 +26,16 @@
     },
     "LatestSessionContent": {
         "fileTree": [
+            "/Users/Vanessa/Work/Code/GoGoGo/src",
+            "/Users/Vanessa/Work/Code/GoGoGo/src/github.com",
+            "/Users/Vanessa/Work/Code/GoGoGo/src/github.com/b3log",
+            "/Users/Vanessa/Work/Code/GoGoGo/src/github.com/b3log/wide",
+            "/Users/Vanessa/Work/Code/GoGoGo/src/github.com/b3log/wide/.idea",
+            "/Users/Vanessa/Work/Code/GoGoGo/src/github.com/b3log/wide/static",
+            "/Users/Vanessa/Work/Code/GoGoGo/src/github.com/b3log/wide/static/css",
+            "/Users/Vanessa/Work/Code/GoGoGo/src/github.com/b3log/wide/static/js"
         ],
-        "files": [
+        "files": [],
-        ],
         "currentFile": "",
         "layout": {
             "side": {

main.go

@@ -23,8 +23,10 @@ import (
 	"net/http"
 	_ "net/http/pprof"
 	"os"
+	"os/signal"
 	"runtime"
 	"strings"
+	"syscall"
 	"time"
 
 	"github.com/b3log/wide/conf"
@@ -72,14 +74,11 @@ func init() {
 	}
 
 	i18n.Load()
-
 	event.Load()
-
 	conf.Load(*confPath, *confIP, *confPort, *confServer, *confLogLevel, *confStaticServer, *confContext, *confChannel,
 		*confPlayground, *confDocker, *confUsersWorkspaces)
 
 	conf.FixedTimeCheckEnv()
-
 	session.FixedTimeSave()
 	session.FixedTimeRelease()
 
@@ -96,6 +95,7 @@ func main() {
 	runtime.GOMAXPROCS(conf.Wide.MaxProcs)
 
 	initMime()
+	handleSignal()
 
 	// IDE
 	http.HandleFunc(conf.Wide.Context+"/", handlerGzWrapper(indexHandler))
@@ -242,7 +242,6 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 	logger.Debugf("User [%s] has [%d] sessions", username, len(wideSessions))
 
 	t, err := template.ParseFiles("views/index.html")
-
 	if nil != err {
 		logger.Error(err)
 		http.Error(w, err.Error(), 500)
@@ -253,6 +252,22 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 	t.Execute(w, model)
 }
 
+// handleSignal handles system signal for graceful shutdown.
+func handleSignal() {
+	go func() {
+		c := make(chan os.Signal)
+
+		signal.Notify(c, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM)
+		s := <-c
+		logger.Tracef("Got signal [%s]", s)
+
+		session.SaveOnlineUsers()
+		logger.Tracef("Saved all online user, exit")
+
+		os.Exit(0)
+	}()
+}
+
 // serveSingle registers the handler function for the given pattern and filename.
 func serveSingle(pattern string, filename string) {
 	http.HandleFunc(pattern, func(w http.ResponseWriter, r *http.Request) {

package.json

@@ -1,33 +1,33 @@
 {
-    "name": "wide",
+  "name": "wide",
-    "version": "1.4.0",
+  "version": "1.4.0",
-    "description": "A Web-based IDE for Teams using Go programming language/Golang.",
+  "description": "A Web-based IDE for Teams using Go programming language/Golang.",
-    "homepage": "https://wide.b3log.org",
+  "homepage": "https://wide.b3log.org",
-    "repository": {
+  "repository": {
-        "type": "git",
+    "type": "git",
-        "url": "git://github.com/b3log/wide.git"
+    "url": "git://github.com/b3log/wide.git"
+  },
+  "bugs": {
+    "url": "https://github.com/b3log/wide/issues"
+  },
+  "license": "Apache License",
+  "private": true,
+  "author": "Daniel <dl882509@gmail.com> (http://88250.b3log.org) & Vanessa <lly219@gmail.com> (http://vanessa.b3log.org)",
+  "maintainers": [
+    {
+      "name": "Daniel",
+      "email": "dl88250@gmail.com"
     },
-    "bugs": {
+    {
-        "url": "https://github.com/b3log/wide/issues"
+      "name": "Vanessa",
-    },
+      "email": "lly219@gmail.com"
-    "license": "Apache License",
-    "private": true,
-    "author": "Daniel <dl882509@gmail.com> (http://88250.b3log.org) & Vanessa <lly219@gmail.com> (http://vanessa.b3log.org)",
-    "maintainers": [
-        {
-            "name": "Daniel",
-            "email": "dl88250@gmail.com"
-        },
-        {
-            "name": "Vanessa",
-            "email": "lly219@gmail.com"
-        }
-    ],
-    "devDependencies": {
-        "gulp": "3.9.0",
-        "gulp-concat": "2.6.0",
-        "gulp-minify-css": "1.2.2",
-        "gulp-uglify": "1.5.1",
-        "gulp-sourcemaps": "1.6.0"
     }
+  ],
+  "devDependencies": {
+    "gulp": "^3.9.1",
+    "gulp-concat": "^2.6.1",
+    "gulp-minify-css": "^1.2.4",
+    "gulp-sourcemaps": "^2.6.0",
+    "gulp-uglify": "^2.1.2"
+  }
 }

session/users.go

@@ -70,11 +70,11 @@ func PreferenceHandler(w http.ResponseWriter, r *http.Request) {
 		tmpLinux := user.GoBuildArgsForLinux
 		tmpWindows := user.GoBuildArgsForWindows
 		tmpDarwin := user.GoBuildArgsForDarwin
-		
+
 		user.GoBuildArgsForLinux = strings.Replace(user.GoBuildArgsForLinux, `"`, `"`, -1)
 		user.GoBuildArgsForWindows = strings.Replace(user.GoBuildArgsForWindows, `"`, `"`, -1)
 		user.GoBuildArgsForDarwin = strings.Replace(user.GoBuildArgsForDarwin, `"`, `"`, -1)
-		
+
 		model := map[string]interface{}{"conf": conf.Wide, "i18n": i18n.GetAll(user.Locale), "user": user,
 			"ver": conf.WideVersion, "goos": runtime.GOOS, "goarch": runtime.GOARCH, "gover": runtime.Version(),
 			"locales": i18n.GetLocalesNames(), "gofmts": util.Go.GetGoFormats(),
@@ -85,7 +85,7 @@ func PreferenceHandler(w http.ResponseWriter, r *http.Request) {
 		if nil != err {
 			logger.Error(err)
 			http.Error(w, err.Error(), 500)
-			
+
 			user.GoBuildArgsForLinux = tmpLinux
 			user.GoBuildArgsForWindows = tmpWindows
 			user.GoBuildArgsForDarwin = tmpDarwin
@@ -93,7 +93,7 @@ func PreferenceHandler(w http.ResponseWriter, r *http.Request) {
 		}
 
 		t.Execute(w, model)
-		
+
 		user.GoBuildArgsForLinux = tmpLinux
 		user.GoBuildArgsForWindows = tmpWindows
 		user.GoBuildArgsForDarwin = tmpDarwin
@@ -308,13 +308,7 @@ func FixedTimeSave() {
 		defer util.Recover()
 
 		for _ = range time.Tick(time.Minute) {
-			users := getOnlineUsers()
+			SaveOnlineUsers()
-
-			for _, u := range users {
-				if u.Save() {
-					logger.Tracef("Saved online user [%s]'s configurations", u.Name)
-				}
-			}
 		}
 	}()
 }
@@ -335,6 +329,16 @@ func CanAccess(username, path string) bool {
 	return false
 }
 
+// SaveOnlineUsers saves online users' configurations at once.
+func SaveOnlineUsers() {
+	users := getOnlineUsers()
+	for _, u := range users {
+		if u.Save() {
+			logger.Tracef("Saved online user [%s]'s configurations", u.Name)
+		}
+	}
+}
+
 func getOnlineUsers() []*conf.User {
 	ret := []*conf.User{}
 

static/css/playground.css

@@ -14,23 +14,6 @@
  * limitations under the License.
  */
 
-@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2014-2016, b3log.org & hacpai.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 body{ 
     overflow: auto;
 }
@@ -139,6 +122,12 @@ body{
     color: #666;
 }
 
+#goNews li a.fn-right {
+    padding: 0;
+    border: 0;
+    color: #4285f4;
+}
+
 #goNews li a:hover {
     text-decoration: none;
     background-color: #f9f9f9;

static/css/start.css

@@ -39,7 +39,6 @@
     margin-bottom: 10px;
     padding: 5px 10px;
     color: #FFF;
-    text-shadow: 0 1px rgba(0, 0, 0, 0.4);
 }
 
 #startPage .details {

static/css/wide.min.css

@@ -2,5 +2,5 @@
 body,ul{margin:0}body,button,input{font-family:Helvetica}.list li,body{overflow:hidden}::-webkit-scrollbar{background:0 0;width:16px;height:16px}::-webkit-scrollbar-corner{display:none;background-color:transparent}::-webkit-scrollbar-thumb{border:0 solid transparent;border-right-width:4px;border-left-width:4px;border-radius:9px;box-shadow:inset 0 0 0 1px rgba(128,128,128,.2),inset 0 0 0 4px rgba(128,128,128,.2)}::-webkit-scrollbar-thumb:horizontal{border-bottom-width:4px;border-top-width:4px}body{font-size:13px;color:#000}ul{padding:0;list-style:none}*{box-sizing:border-box}a{color:#4183c4;text-decoration:none}a:hover{text-decoration:underline}img{vertical-align:middle}.fn-left{float:left}.fn-right{float:right}.fn-clear:after,.fn-clear:before{display:table;content:""}.fn-clear:after{clear:both}.fn-none{display:none}.ft-small{color:#999;font-size:12px}.ft-red{color:#9d0000}.list li{cursor:pointer;line-height:20px;padding:0 3px;word-wrap:normal;word-break:normal;white-space:nowrap;text-overflow:ellipsis}.list li.selected,.list li:hover{background-color:#3875d7;color:#FFF}.list li.selected .ft-small,.list li:hover .ft-small{color:#FFF}@font-face{font-family:icomoon;src:url(fonts/icomoon.eot?35cb2z);src:url(fonts/icomoon.eot?#iefix35cb2z) format('embedded-opentype'),url(fonts/icomoon.woff?35cb2z) format('woff'),url(fonts/icomoon.ttf?35cb2z) format('truetype'),url(fonts/icomoon.svg?35cb2z#icomoon) format('svg');font-weight:400;font-style:normal}.font-ico,[class^=ico-]{font-family:icomoon;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;cursor:pointer;font-size:13px;line-height:20px}.ico-book:before{content:"\e623"}.ico-price:before{content:"\e616"}.ico-start:before{content:"\e9d7"}.ico-share:before{content:"\e61f"}.ico-github:before{content:"\f00a"}.ico-git:before{content:"\e624"}.ico-tencent:before{content:"\e622"}.ico-weibo:before{content:"\e621"}.ico-googleplus:before{content:"\e61a"}.ico-twitter:before{content:"\e61c"}.ico-email:before{content:"\e619"}.ico-facebook:before{content:"\e61b"}.ico-moveup:before{content:"\f148"}.ico-movedown:before{content:"\f149"}.ico-keyboard:before{content:"\f11c"}.ico-findfiles:before{content:"\e603"}.ico-find:before{content:"\e602"}.ico-editor:before{content:"\e604"}.ico-tree:before{content:"\e600"}.ico-build:before{content:"\e601"}.ico-notification:before{content:"\e607"}.ico-report:before{content:"\e605"}.ico-comment:before{content:"\e620"}.ico-goline:before{content:"\e61e"}.ico-info:before{content:"\e61d"}.ico-signup:before{content:"\e606"}.ico-signout:before{content:"\e618"}.ico-redo:before{content:"\e615"}.ico-undo:before{content:"\e60e"}.ico-about:before{content:"\e60d"}.ico-import:before{content:"\f0ee"}.ico-export:before{content:"\f0ed"}.ico-refresh:before{content:"\f021"}.ico-remove:before{content:"\e60b"}.ico-save:before{content:"\f0c7"}.ico-max:before{content:"\e609"}.ico-format:before{content:"\e612"}.ico-buildrun:before{content:"\e60c"}.ico-stop:before{content:"\e60f"}.ico-restore:before{content:"\e613"}.toolbars .ico-restore:before{content:"\e60a"}.ico-min:before{content:"\e614";position:absolute;right:5px}.ico-close:before{content:"\e611"}
 .frame li,.tabs>div{padding:0 5px;cursor:pointer}.footer .cursor,.frame li,.menu>ul>li>span,.notification-count,.tabs>div{cursor:pointer}.ico,.menu .split,.menu>ul>li,.tabs>div{float:left}.frame{position:absolute;width:320px;z-index:21;display:none}.frame li{line-height:25px}.frame li.disabled,.frame li.disabled .font-ico,.frame li.disabled:hover .font-ico{color:#999}.frame a{color:#000;text-decoration:none}.frame a:hover,.frame li:hover a{color:#FFF}.frame .space{display:inline-block;width:20px;height:15px}.frame .font-ico{margin-right:5px;width:15px;display:inline-block;text-align:center}.tabs{height:21px;overflow:hidden;width:100%}.tabs>div{line-height:20px;height:20px}.tabs>div>span.changed{font-weight:700}.tabs-panel{overflow:auto;flex:1;height:100%}.edit-exprinfo,.edit-panel{position:absolute;overflow:hidden}.menu{display:block!important}.menu>ul>li>span{font-size:12px;line-height:21px;padding:4px 7px}.menu .split{border-left:1px solid #919191;height:21px;margin:0 5px 0 0}.menu img.gravatar{float:left;margin:2px 8px;height:17px;width:17px;border-radius:9px}#buildRun{color:#6DB14C;font-size:19px}#buildRun.ico-stop{color:#9d0000;font-size:16px}.share-panel{position:absolute;z-index:20;width:226px;padding:5px 0;right:0;top:21px}.share-panel .font-ico{font-size:20px;transition:all .2s ease-out 0s;margin:0 5px;width:24px}.share-panel .font-ico:hover{transform:rotate(360deg)}.edit-panel{left:20%;width:60%;height:70%;flex-flow:column;display:flex}.toolbars{position:absolute;right:5px;top:1px}.ico{background-image:url(../images/ico-file.png);height:16px;margin:2px 0 0 -2px;width:16px}.edit-exprinfo{z-index:10;list-style:none;margin:0;padding:2px;-webkit-box-shadow:2px 3px 5px rgba(0,0,0,.2);-moz-box-shadow:2px 3px 5px rgba(0,0,0,.2);box-shadow:2px 3px 5px rgba(0,0,0,.2);border-radius:3px;border:1px solid silver;background:#fff;font-size:90%;max-height:20em;overflow-y:auto}.CodeMirror,.CodeMirror-hints{font-family:Consolas,'Courier New',monospace}.CodeMirror-hints .ico{margin:-1px 2px 0 -1px}.CodeMirror-focused .cm-matchhighlight{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);background-position:bottom;background-repeat:repeat-x}.CodeMirror-hint{padding-right:18px;max-width:none}.CodeMirror-hint:hover{background:#08f;color:#fff}.CodeMirror div.CodeMirror-cursor{border-left:2px solid #333}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:transparent}.bottom-window-group{background-color:#fff;flex-flow:column}.bottom-window-group .output{font-family:Consolas,Courier New,monospace;padding:0 5px;line-height:16px;font-size:12px;overflow-x:scroll;outline:0}.bottom-window-group .output pre{margin:0;font-family:Consolas,'Courier New',monospace}.bottom-window-group .output .start-build,.bottom-window-group .output .start-get,.bottom-window-group .output .start-install,.bottom-window-group .output .start-test,.start-vet{color:#999}.bottom-window-group .output .build-succ,.bottom-window-group .output .get-succ,.bottom-window-group .output .install-succ,.bottom-window-group .output .test-succ,.vet-succ{color:#090}.bottom-window-group .output .build-error,.bottom-window-group .output .get-error,.bottom-window-group .output .install-error,.bottom-window-group .output .test-error,.vet-error{color:#9d0000}.bottom-window-group .output .stderr{color:gray;font-style:italic}.bottom-window-group .output .path{text-decoration:underline;cursor:pointer}.bottom-window-group table{width:100%}.bottom-window-group td{border-bottom:1px solid #919191;font-size:12px;line-height:19px}.bottom-window-group .notification{outline:0}.bottom-window-group .notification .severity,.bottom-window-group .notification .type{width:50px;padding:0 5px}.bottom-window-group .search{display:flex;flex-flow:column;outline:0}.footer{box-shadow:0 1px 0 0 rgba(255,255,255,.06) inset;padding-left:5px;line-height:18px;display:block!important}.notification-count{float:right;display:none;background-color:#9d0000;color:#FFF;margin:1px 5px;padding:0 2px;border-radius:3px;line-height:16px}
 .side{width:20%;position:absolute;height:100%;z-index:8;flex-flow:column;display:flex}.side-max{width:100%;z-index:11}.side-right .tabs-panel>div{overflow:auto}.side-right{flex-flow:column}#outline .ico{margin:1px 5px 0}.ico-func{background-position:-123px -21px}.ico-interface{background-position:-143px -21px}.ico-const{background-position:-103px -21px}.ico-var{background-position:-63px -21px}.ico-struct{background-position:-83px -21px}.ico-type{background-position:-163px -21px}.ico-package{background-position:-183px -21px}.ztree{width:100%;padding:0;outline:0;border:0}.ztree li a.curSelectedNode{background-color:#3875d7;border-width:0;color:#fff;height:18px;opacity:1}.ztree li a:hover{text-decoration:none}.ztree li>a>span.button,.ztree li>a>span.button.ico-ztree-dir,.ztree li>a>span.button.ico-ztree-dir-api,.ztree li>a>span.button.ico-ztree-dir-workspace{margin-right:2px}.ztree li>a>span.button{background-image:url(../images/ico-file.png);margin-right:0}.ico-ztree-dir{background-position:-2px -23px}.ico-ztree-dir-api{background-position:-22px -23px}.ico-ztree-dir-workspace{background-position:-42px -23px}.ico-ztree-html{background-position:-4px -2px}.ico-ztree-go{background-position:-22px -2px}.ico-ztree-css{background-position:-42px -2px}.ico-ztree-img{background-position:-63px -2px}.ico-ztree-other{background-position:-83px -2px}.ico-ztree-text{background-position:-103px -2px}.ico-ztree-sql{background-position:-123px -2px}.ico-ztree-pro{background-position:-142px -2px}.ico-ztree-md{background-position:-162px -2px}.ico-ztree-js{background-position:-182px -2px}.ico-ztree-xml{background-position:-202px -2px}
-#startPage{padding:50px 70px;line-height:28px;white-space:normal;word-wrap:break-word;overflow:auto}#startPage a{color:#4183c4;text-decoration:none}#startPage a:hover{text-decoration:underline}#startPage .title{background-color:#BBB;border-bottom-width:0!important;border-radius:3px 3px 0 0;font-size:15px;margin-bottom:10px;padding:5px 10px;color:#FFF;text-shadow:0 1px rgba(0,0,0,.4)}#startPage .details li.border,#startPage .news li{border-bottom:1px solid #919191}#startPage .details{width:30%;float:left}#startPage .details label{color:#666}#startPage .details li.border{padding-bottom:5px;margin-bottom:5px}#startPage .details li.border.workspace{line-height:18px;padding-bottom:10px!important;word-wrap:break-word;white-space:normal;word-break:break-all}#startPage .news{width:60%;float:right;border-left:1px solid #f1f1f1;margin-left:10%;padding-left:10%;white-space:nowrap;overflow:hidden}#startPage .date{color:#bbb;font-size:13px;word-wrap:normal;white-space:nowrap}
+#startPage{padding:50px 70px;line-height:28px;white-space:normal;word-wrap:break-word;overflow:auto}#startPage a{color:#4183c4;text-decoration:none}#startPage a:hover{text-decoration:underline}#startPage .title{background-color:#BBB;border-bottom-width:0!important;border-radius:3px 3px 0 0;font-size:15px;margin-bottom:10px;padding:5px 10px;color:#FFF}#startPage .details li.border,#startPage .news li{border-bottom:1px solid #919191}#startPage .details{width:30%;float:left}#startPage .details label{color:#666}#startPage .details li.border{padding-bottom:5px;margin-bottom:5px}#startPage .details li.border.workspace{line-height:18px;padding-bottom:10px!important;word-wrap:break-word;white-space:normal;word-break:break-all}#startPage .news{width:60%;float:right;border-left:1px solid #f1f1f1;margin-left:10%;padding-left:10%;white-space:nowrap;overflow:hidden}#startPage .date{color:#bbb;font-size:13px;word-wrap:normal;white-space:nowrap}
 #dialogAboutDialog .dialog-main{background-color:#FFF}#dialogAbout{margin:35px 20px;line-height:28px}#dialogAbout .item{margin:0 10px}#dialogAbout a{color:#4183c4;text-decoration:none}#dialogAbout a:hover{text-decoration:underline}#dialogAbout label{color:#666}#dialogAbout img{width:100px;float:left;margin-right:60px}#dialogAbout .space{margin-bottom:6px;border-bottom:1px solid #919191;padding-bottom:6px}#dialogAbout .thx ul{margin-left:50px}#dialogAbout .thx a{width:80px;display:inline-block}#dialogAbout .license{color:#999;font-size:12px;line-height:normal;height:85px;overflow-x:hidden;word-wrap:break-word}

static/js/editors.js

@@ -264,7 +264,8 @@ var editors = {
                             length = 9;
                         }
 
-                        var listHTML = "<ul><li class='title'>" + config.label.community + "</li>";
+                        var listHTML = "<ul><li class='title'>" + config.label.community +
+                            "<a href='https://hacpai.com/article/1437497122181' target='_blank' class='fn-right'>边看边练</li>";
                         for (var i = 0; i < length; i++) {
                             var article = articles[i];
                             listHTML += "<li>"

static/js/playground.js

@@ -330,7 +330,8 @@ var playground = {
 
                 var length = articles.length;
 
-                var listHTML = "<ul><li class='title'>" + config.label.community + "</li>";
+                var listHTML = "<ul><li class='title'>" + config.label.community +
+                    "<a href='https://hacpai.com/article/1437497122181' target='_blank' class='fn-right'>边看边练</li>";
                 for (var i = 0; i < length; i++) {
                     var article = articles[i];
                     listHTML += "<li>"