Merge remote-tracking branch 'origin/master'
This commit is contained in:
Liang Ding
commit
d8f3cf7cad
|
|
@ -39,7 +39,7 @@ const (
|
|||
PathListSeparator = string(os.PathListSeparator)
|
||||
|
||||
// WideVersion holds the current wide version.
|
||||
WideVersion = "1.1.0"
|
||||
WideVersion = "1.2.0"
|
||||
// CodeMirrorVer holds the current editor version.
|
||||
CodeMirrorVer = "4.10"
|
||||
|
||||
|
|
|
|||
|
|
@ -19,10 +19,14 @@
|
|||
}
|
||||
|
||||
#dialogAbout {
|
||||
margin: 35px 100px 0 100px;
|
||||
margin: 35px 20px;
|
||||
line-height: 28px;
|
||||
}
|
||||
|
||||
#dialogAbout .item {
|
||||
margin: 0 10px;
|
||||
}
|
||||
|
||||
#dialogAbout a {
|
||||
color: #4183c4;
|
||||
text-decoration: none;
|
||||
|
|
@ -49,12 +53,6 @@
|
|||
|
||||
}
|
||||
|
||||
#dialogAbout .thx {
|
||||
border-left: 1px solid #919191;
|
||||
padding-left: 24px;
|
||||
}
|
||||
|
||||
#dialogAbout .thx,
|
||||
#dialogAbout .thx ul {
|
||||
margin-left: 50px;
|
||||
}
|
||||
|
|
@ -69,5 +67,6 @@
|
|||
font-size: 12px;
|
||||
line-height: normal;
|
||||
height: 85px;
|
||||
overflow: auto;
|
||||
overflow-x: hidden;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
|
@ -13,6 +13,10 @@
|
|||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
body {
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.header {
|
||||
margin: 0;
|
||||
padding: 5px;
|
||||
|
|
@ -88,3 +92,8 @@
|
|||
.btn {
|
||||
padding: 1px 5px;
|
||||
}
|
||||
|
||||
#disqus_thread {
|
||||
border-top: 1px solid #919191;
|
||||
padding: 0 30px;
|
||||
}
|
||||
|
|
@ -13,6 +13,10 @@
|
|||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
body {
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.header {
|
||||
margin: 0;
|
||||
padding: 10px;
|
||||
|
|
@ -84,3 +88,8 @@
|
|||
white-space: pre-wrap;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
#disqus_thread {
|
||||
border-top: 1px solid #919191;
|
||||
padding: 0 30px;
|
||||
}
|
||||
|
|
@ -309,7 +309,6 @@
|
|||
padding-left: 5px;
|
||||
height: 19px;
|
||||
line-height: 18px;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
z-index: 11;
|
||||
width: 100%;
|
||||
|
|
|
|||
|
|
@ -161,7 +161,8 @@
|
|||
});
|
||||
|
||||
$(window).resize(function () {
|
||||
$(".dialog-background").height($("body").height());
|
||||
var height = $("body").height() > $(window).height() ? $("body").height() : $(window).height();
|
||||
$(".dialog-background").height(height);
|
||||
});
|
||||
|
||||
if (typeof settings.afterInit === "function") {
|
||||
|
|
|
|||
|
|
@ -58,8 +58,6 @@ var menu = {
|
|||
$("#dialogAbout").load(config.context + '/about', function () {
|
||||
$("#dialogAbout").dialog({
|
||||
"modal": true,
|
||||
"height": 460,
|
||||
"width": 800,
|
||||
"title": config.label.about,
|
||||
"hideFooter": true,
|
||||
"afterOpen": function () {
|
||||
|
|
|
|||
|
|
@ -18,11 +18,14 @@ var playground = {
|
|||
editor: undefined,
|
||||
pid: undefined,
|
||||
_resize: function () {
|
||||
if (config.disqus) {
|
||||
return false;
|
||||
}
|
||||
if (config.embed) {
|
||||
$("#editorDiv").parent().height($(window).height() - 35 - $(".footer").height());
|
||||
$("#editorDiv").parent().height($(window).height() - 33 - $(".footer").height());
|
||||
playground.editor.setSize("auto", ($("#editorDiv").parent().height() * 0.7) + "px");
|
||||
} else {
|
||||
$("#editor, #output").height($(window).height() - 58 - $(".footer").height());
|
||||
$("#editor, #output").height($(window).height() - 60 - $(".footer").height());
|
||||
playground.editor.setSize("auto", $("#editor").height() + "px");
|
||||
}
|
||||
},
|
||||
|
|
@ -188,6 +191,12 @@ var playground = {
|
|||
playground._resize();
|
||||
});
|
||||
|
||||
if (config.embed) {
|
||||
playground.editor.setSize("auto", ($("#editorDiv").parent().height() * 0.7) + "px");
|
||||
} else {
|
||||
playground.editor.setSize("auto", $("#editor").height() + "px");
|
||||
}
|
||||
|
||||
var hovered = false;
|
||||
$(".menu .ico-share").hover(function () {
|
||||
$(".menu .share-panel").show();
|
||||
|
|
@ -323,6 +332,21 @@ var playground = {
|
|||
}
|
||||
});
|
||||
},
|
||||
disqus: function () {
|
||||
var url = window.location.href;
|
||||
if (url.indexOf("?") >= 0) {
|
||||
if (url.indexOf("disqus=") >= 0) {
|
||||
url = url.replace("disqus=false", "disqus=true");
|
||||
console.log(url);
|
||||
} else {
|
||||
url += "&disqus=true";
|
||||
}
|
||||
} else {
|
||||
url += "?disqus=true";
|
||||
}
|
||||
|
||||
window.location.href = url;
|
||||
},
|
||||
stop: function () {
|
||||
if (!playground.editor) {
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<div class="item">
|
||||
<div class="fn-clear">
|
||||
<img class="logo" src="{{.conf.StaticServer}}/static/images/wide-logo.png" alt="wide logi"/>
|
||||
<div class="fn-left">
|
||||
|
|
@ -5,14 +6,14 @@
|
|||
<h3>Coding with Go on the Wide way.</h3>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<label>{{.i18n.current_ver}}{{.i18n.colon}}</label>
|
||||
<span class="version">{{.ver}}</span>,
|
||||
<span class="upgrade">{{.i18n.check_version}}....</span>
|
||||
</div>
|
||||
|
||||
<div class="space"></div>
|
||||
|
||||
<div class="fn-clear">
|
||||
<div class="fn-left">
|
||||
<div class="item">
|
||||
<label>{{.i18n.project_address}}{{.i18n.colon}}</label>
|
||||
<a href="https://github.com/b3log/wide" target="_blank">github.com/b3log/wide</a><br/>
|
||||
|
||||
|
|
@ -25,26 +26,24 @@
|
|||
<label>{{.i18n.donate}}{{.i18n.colon}}</label>
|
||||
<a href="http://b3log.org/donate.html" target="_blank">b3log.org/donate.html</a>
|
||||
</div>
|
||||
<div class="fn-left thx">
|
||||
|
||||
<div class="thx item">
|
||||
<label>{{.i18n.credits}}{{.i18n.colon}}</label>
|
||||
<ul>
|
||||
<li>
|
||||
<a href="http://golang.org" target="_blank">golang</a>
|
||||
<a href="https://github.com/marijnh/CodeMirror" target="_blank">CodeMirror</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://github.com/zTree/zTree_v3" target="_blank">zTree</a>
|
||||
<a href="https://github.com/visualfc/liteide" target="_blank">LiteIDE</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://github.com/nsf/gocode" target="_blank">gocode</a>
|
||||
<a href="https://github.com/gorilla" target="_blank">Gorilla</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="space"></div>
|
||||
<div>
|
||||
|
||||
<div class="item">
|
||||
<label>{{.i18n.license}}{{.i18n.colon}}</label>
|
||||
<pre class="license">
|
||||
Apache License
|
||||
|
|
@ -250,4 +249,3 @@
|
|||
limitations under the License.
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<link rel="stylesheet" href="{{.conf.StaticServer}}/static/css/themes/default.css?{{.conf.StaticResourceVersion}}">
|
||||
<link rel="stylesheet" href="{{.conf.StaticServer}}/static/css/sign.css?{{.conf.StaticResourceVersion}}">
|
||||
<link rel="stylesheet" href="{{.conf.StaticServer}}/static/css/side.css?{{.conf.StaticResourceVersion}}">
|
||||
{{if .embed}}<link rel="stylesheet" href="{{.conf.StaticServer}}/static/css/playground-embed.css?{{.conf.StaticResourceVersion}}">{{else}}<link rel="stylesheet" href="{{.conf.StaticServer}}/static/css/playground.css?{{.conf.StaticResourceVersion}}">{{end}}
|
||||
<link rel="stylesheet" href="{{.conf.StaticServer}}/static/css/playground{{if .embed}}-embed{{end}}.css?{{.conf.StaticResourceVersion}}">
|
||||
|
||||
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
|
||||
</head>
|
||||
|
|
@ -40,6 +40,9 @@
|
|||
<li>
|
||||
<button class="btn btn-red" id="stop" onclick="playground.stop();">{{.i18n.stop}}</button>
|
||||
</li>
|
||||
<li>
|
||||
<button class="btn-white btn" id="disqus" onclick="playground.disqus();">Disqus</button>
|
||||
</li>
|
||||
<li>
|
||||
<button class="btn-white btn" id="share" onclick="playground.share();">{{.i18n.share}}</button>
|
||||
</li>
|
||||
|
|
@ -61,7 +64,7 @@
|
|||
</div>
|
||||
<div class="fn-clear">
|
||||
<div id="editorDiv" class="fn-none">
|
||||
<textarea id='editor'>{{.code}}</textarea>
|
||||
<textarea rows="20" id='editor'>{{.code}}</textarea>
|
||||
</div>
|
||||
<textarea id="output" rows="20" readonly="readonly" ></textarea>
|
||||
</div>
|
||||
|
|
@ -70,7 +73,7 @@
|
|||
<script type="text/javascript">
|
||||
var disqus_shortname = 'wide-playground';
|
||||
var disqus_identifier = {{.fileName}};
|
||||
var disqus_url = window.location.protocol + "//" + {{.conf.Server}} + {{.conf.Context}} + "/playground/" + {{.fileName}}
|
||||
var disqus_url = window.location.protocol + "//" + {{.conf.Server}} + {{.conf.Context}} + "/playground/" + {{.fileName}};
|
||||
(function() {
|
||||
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
|
||||
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
|
||||
|
|
@ -94,7 +97,8 @@
|
|||
"channel": "{{.conf.Channel}}",
|
||||
"wideSessionId": "{{.session.ID}}",
|
||||
"label": {{.i18n}},
|
||||
"embed": {{.embed}}
|
||||
"embed": {{.embed}},
|
||||
"disqus": {{.disqus}}
|
||||
};
|
||||
function newWideRequest() {
|
||||
var ret = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue