Unknown 10 年之前
父节点
当前提交
fb0972afad
共有 5 个文件被更改,包括 12 次插入7 次删除
  1. 1 1
      gogs.go
  2. 2 2
      public/js/app.js
  3. 6 1
      routers/repo/release.go
  4. 1 1
      templates/VERSION
  5. 2 2
      templates/release/new.tmpl

+ 1 - 1
gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.4.3.0610 Alpha"
+const APP_VER = "0.4.3.0612 Alpha"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

+ 2 - 2
public/js/app.js

@@ -705,8 +705,8 @@ function initRelease() {
     (function () {
         $('[data-ajax-name=release-preview]').on("click", function () {
             var $this = $(this);
-            $this.toggleAjax(function (json) {
-                $($this.data("preview")).html(json.ok ? json.content : "no content");
+            $this.toggleAjax(function (resp) {
+                $($this.data("preview")).html(resp);
             }, function () {
                 $($this.data("preview")).html("no content");
             })

+ 6 - 1
routers/repo/release.go

@@ -23,7 +23,12 @@ func (rs *ReleaseSorter) Len() int {
 }
 
 func (rs *ReleaseSorter) Less(i, j int) bool {
-	return rs.rels[i].NumCommits > rs.rels[j].NumCommits
+	diffNum := rs.rels[i].NumCommits - rs.rels[j].NumCommits
+	if diffNum != 0 {
+		return diffNum > 0
+	}
+
+	return rs.rels[i].Created.Second() > rs.rels[j].Created.Second()
 }
 
 func (rs *ReleaseSorter) Swap(i, j int) {

+ 1 - 1
templates/VERSION

@@ -1 +1 @@
-0.4.3.0610 Alpha
+0.4.3.0612 Alpha

+ 2 - 2
templates/release/new.tmpl

@@ -41,12 +41,12 @@
                 </div>
                 <ul class="nav nav-tabs" data-init="tabs">
                     <li class="release-write active"><a href="#release-textarea" data-toggle="tab">Write</a></li>
-                    <li class="release-preview"><a href="#release-preview" data-toggle="tab" data-ajax="/api/v1/markdown?repo=repo_id&amp;release=new" data-ajax-name="release-preview" data-ajax-method="post" data-preview="#release-preview">Preview</a></li>
+                    <li class="release-preview"><a href="#release-preview" data-toggle="tab" data-ajax="/api/v1/markdown" data-ajax-name="release-preview" data-ajax-context="{{.RepoLink}}" data-ajax-method="post" data-preview="#release-preview">Preview</a></li>
                 </ul>
                 <div class="tab-content">
                     <div class="tab-pane active" id="release-textarea">
                         <div class="form-group">
-                            <textarea class="form-control" name="content" id="release-new-content" rows="10" placeholder="Write some content" data-ajax-rel="release-preview" data-ajax-val="val" data-ajax-field="content">{{.content}}</textarea>
+                            <textarea class="form-control" name="content" id="release-new-content" rows="10" placeholder="Write some content" data-ajax-rel="release-preview" data-ajax-val="val" data-ajax-field="text">{{.content}}</textarea>
                         </div>
                     </div>
                     <div class="tab-pane release-preview-content" id="release-preview">loading...</div>