增加ngTouchHref；增加scroller

yunchuan10 · Aug 6, 2014 · 9e6e19e · 9e6e19e
1 parent d69da97
commit 9e6e19e
Show file tree

Hide file tree

Showing 30 changed files with 607 additions and 166 deletions.
diff --git a/app/scripts/app.coffee b/app/scripts/app.coffee
@@ -5,6 +5,9 @@ Mifan = angular.module "mifan", [
   "ngResource"
   "ngSanitize"
   "ngRoute"
+  "ngTouch"
+  "ngTouchHref"
+  "binnng.scroller"
 ]
 
 Mifan.config ($routeProvider, $locationProvider) ->

diff --git a/app/scripts/app.js b/app/scripts/app.js
diff --git a/app/scripts/controllers.js b/app/scripts/controllers.js
diff --git a/app/scripts/controllers/head.coffee b/app/scripts/controllers/head.coffee
@@ -1,25 +1,38 @@
 "use strict"
 Mifan.controller "headCtrl", ($scope) ->
+
   $scope.dropdownOpen = no
 
   $scope.toggleDropdown = -> $scope.dropdownOpen = not $scope.dropdownOpen;
 
   $scope.support = ->
     alert 1
 
+  $scope.navs = [
+    {page: "home", text: "首页"}
+    {page: "msg", text: "消息"}
+    {page: "me", text: "个人主页"}
+    {page: "friend", text: "朋友"}
+    {page: "hot", text: "排行"}
+    {page: "feedback", text: "反馈"}
+  ]
+
+
+
+
   # 导航三角形
-  $scope.arrowNav = {}
+  # $scope.arrowNav = {}
 
-  $scope.$watch "page", -> 
+  # $scope.$watch "page", -> 
 
-    switch $scope.page
-      when "home"
-        $scope.arrowNav = left: 23, hide: no
-      when "msg"
-        $scope.arrowNav = left: 90, hide: no
-      when "me"
-        $scope.arrowNav = left: 176, hide: no
-      when "friend"
-        $scope.arrowNav = left: 260, hide: no
-      else
-        $scope.arrowNav = left: 0, hide: yes
+  #   switch $scope.page
+  #     when "home"
+  #       $scope.arrowNav = left: 23, hide: no
+  #     when "msg"
+  #       $scope.arrowNav = left: 90, hide: no
+  #     when "me"
+  #       $scope.arrowNav = left: 176, hide: no
+  #     when "friend"
+  #       $scope.arrowNav = left: 260, hide: no
+  #     else
+  #       $scope.arrowNav = left: 0, hide: yes
diff --git a/app/scripts/controllers/head.js b/app/scripts/controllers/head.js
diff --git a/app/scripts/controllers/home_news.coffee b/app/scripts/controllers/home_news.coffee
@@ -2,31 +2,45 @@
 Mifan.controller "homeNews", ($scope) ->
 	# ajax取到数据进行缓存，用户手动刷新
 	$scope.content = "最新动态"
-	console.log "最新动态"
 
 	$scope.newsCollect = [
 		{
-			a: 1
-		},
-		{
-			a: 2
-		},
-		{
-			a: 2
-		},
-		{
-			a: 2
-		},
-		{
-			a: 2
-		},
-		{
-			a: 2
-		},
+			ques:
+				id: 1
+				username: "依然大头"
+				face: "http://mifan.us/cache/user/0/0/48/7dfecd76fb_48_48.png"
+				text: "女朋友要过生日了，买个什么礼物呢？ 具体一些哈~~大谢！"
+
+			ans: 
+				id: 2
+				username: "老婆婆"
+				face: "http://mifan.us/cache/user/0/0/48/6c9e391e64_48_48.jpg"
+				text: "买一个上市公司送她，让她做老板。"
+		}
 		{
-			a: 2
-		},
+			ques:
+				id: 1
+				username: "依然大头"
+				face: "http://mifan.us/cache/user/0/0/48/7dfecd76fb_48_48.png"
+				text: "女朋友要过生日了，买个什么礼物呢？ 具体一些哈~~大谢！"
+
+			ans: 
+				id: 2
+				username: "老婆婆"
+				face: "http://mifan.us/cache/user/0/0/48/6c9e391e64_48_48.jpg"
+				text: "买一个上市公司送她，让她做老板。"
+		}
 		{
-			a: 2
+			ques:
+				id: 1
+				username: "依然大头"
+				face: "http://mifan.us/cache/user/0/0/48/7dfecd76fb_48_48.png"
+				text: "女朋友要过生日了，买个什么礼物呢？ 具体一些哈~~大谢！"
+
+			ans: 
+				id: 2
+				username: "老婆婆"
+				face: "http://mifan.us/cache/user/0/0/48/6c9e391e64_48_48.jpg"
+				text: "买一个上市公司送她，让她做老板。"
 		}
 	]