From b2632dec099cb2727933149d2d59cc5e46baa15f Mon Sep 17 00:00:00 2001
From: Unknwon <joe2010xtmf@163.com>
Date: Fri, 10 Oct 2014 21:40:51 -0400
Subject: Page: Compare 2 commits

---
 public/ng/js/gogs.js | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'public/ng/js/gogs.js')

diff --git a/public/ng/js/gogs.js b/public/ng/js/gogs.js
index 4bcdc5c8..538e6c67 100644
--- a/public/ng/js/gogs.js
+++ b/public/ng/js/gogs.js
@@ -299,6 +299,9 @@ function initCore() {
         e.preventDefault();
         $.magnificPopup.close();
     });
+
+    // Collapse.
+    $('.collapse').hide();
 }
 
 function initUserSetting() {
@@ -698,6 +701,37 @@ function initProfile() {
     });
 }
 
+function initTimeSwitch() {
+    // Time switch.
+    $(".time-since[title]").on("click", function () {
+        var $this = $(this);
+
+        var title = $this.attr("title");
+        var text = $this.text();
+
+        $this.text(title);
+        $this.attr("title", text);
+    });
+}
+
+function initDiff() {
+    $('.diff-detail-box>a').click(function () {
+        $($(this).data('target')).slideToggle(100);
+    })
+    
+    var $counter = $('.diff-counter');
+    if ($counter.length < 1) {
+        return;
+    }
+    $counter.each(function (i, item) {
+        var $item = $(item);
+        var addLine = $item.find('span[data-line].add').data("line");
+        var delLine = $item.find('span[data-line].del').data("line");
+        var addPercent = parseFloat(addLine) / (parseFloat(addLine) + parseFloat(delLine)) * 100;
+        $item.find(".bar .add").css("width", addPercent + "%");
+    });
+}
+
 $(document).ready(function () {
     Gogs.AppSubUrl = $('head').data('suburl') || '';
     initCore();
@@ -737,6 +771,10 @@ $(document).ready(function () {
     if ($('#user-profile-page').length) {
         initProfile();
     }
+    if ($('#diff-page').length) {
+        initTimeSwitch();
+        initDiff();
+    }
 
     $('#dashboard-sidebar-menu').tabs();
     $('#pull-issue-preview').markdown_preview(".issue-add-comment");
-- 
cgit v1.2.3


From 0d7b9065c60604a1ac37af595878d86b0c0679ad Mon Sep 17 00:00:00 2001
From: Unknwon <joe2010xtmf@163.com>
Date: Sun, 12 Oct 2014 02:06:46 -0400
Subject: Fix #540

---
 models/org.go        | 19 ++-----------------
 public/ng/js/gogs.js |  2 +-
 2 files changed, 3 insertions(+), 18 deletions(-)

(limited to 'public/ng/js/gogs.js')

diff --git a/models/org.go b/models/org.go
index 1297cb6d..08d276bf 100644
--- a/models/org.go
+++ b/models/org.go
@@ -845,23 +845,8 @@ func IsTeamMember(orgId, teamId, uid int64) bool {
 
 // GetTeamMembers returns all members in given team of organization.
 func GetTeamMembers(orgId, teamId int64) ([]*User, error) {
-	/*tus := make([]*TeamUser, 0, 10)
-
-	err := x.Where("org_id=?", orgId).And("team_id=?", teamId).Find(&tus)
-	if err != nil {
-		return nil, err
-	}
-
-	us := make([]*User, len(tus))
-	for i, tu := range tus {
-		us[i], err = GetUserById(tu.Uid)
-		if err != nil {
-			return nil, err
-		}
-	}*/
-
-	us := make([]*User, 0)
-	err := x.Sql("select * from user join team_user on team_user.team_id = ? and team_user.uid = user.id", teamId).Find(&us)
+	us := make([]*User, 0, 10)
+	err := x.Sql("SELECT * FROM user JOIN team_user ON team_user.team_id = ? AND team_user.uid = user.id", teamId).Find(&us)
 	return us, err
 }
 
diff --git a/public/ng/js/gogs.js b/public/ng/js/gogs.js
index 538e6c67..eba1744b 100644
--- a/public/ng/js/gogs.js
+++ b/public/ng/js/gogs.js
@@ -718,7 +718,7 @@ function initDiff() {
     $('.diff-detail-box>a').click(function () {
         $($(this).data('target')).slideToggle(100);
     })
-    
+
     var $counter = $('.diff-counter');
     if ($counter.length < 1) {
         return;
-- 
cgit v1.2.3