Fix bugs and update version

ouzhenkun · ouzhenkun · commit c01876bb6247 · 2015-05-24T02:18:11.000+08:00
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "name": "ionic-nodeclub",
   "private": true,
   "dependencies": {
-    "ionic": "driftyco/ionic-bower#1.0.0-rc.4",
+    "ionic": "driftyco/ionic-bower#1.0.0",
     "restangular": "~1.5.1",
     "angular-moment": "~0.9.2",
     "angular-elastic": "~2.4.2",
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="me.zko.ionicnodeclub" version="0.0.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="me.zko.ionicnodeclub" version="0.0.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>Ionic Nodeclub</name>
   <description>
     一个Nodeclub开源社区系统的手机客户端;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic-nodeclub",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "An Ionic project",
   "dependencies": {},
   "devDependencies": {
diff --git a/www/app/configs/constant.coffee b/www/app/configs/constant.coffee
@@ -31,7 +31,7 @@ angular.module('ionic-nodeclub')
   TOPICS_PAGE_LIMIT: 15              # 每次加载topics为30个
   LATEST_REPLIES_DEFAULT_NUM: 30     # 最新回复默认显示30个
   POP_REPLIES_TRIGGER_NUM: 10        # 有10个回复以上才显示最赞回复
-  POP_REPLIES_LIMIT: 5               # 最赞回复默认显示5个
+  POP_REPLIES_LIMIT: 3               # 最赞回复默认显示3个
   TOAST_SHORT_DELAY: 2000            # 短的toast显示时长为2秒
   TOAST_LONG_DELAY: 3500             # 长的toast显示时长为3.5秒
 
diff --git a/www/app/messages/messages.html b/www/app/messages/messages.html
@@ -6,16 +6,13 @@
   </ion-nav-buttons>
   <ion-content overflow-scroll="true">
 
-    <!--<ion-refresher pulling-text="下拉刷新..."-->
-                   <!--pulling-icon="ion-ios-arrow-down"-->
-                   <!--spinner="spiral"-->
-                   <!--on-refresh="doRefresh()">-->
+    <!--<ion-refresher on-refresh="doRefresh()">-->
     <!--</ion-refresher>-->
 
     <!-- 提示信息 -->
     <div class="text-center padding"
          ng-if="loading">
-      <ion-spinner icon="spiral"></ion-spinner>
+      <ion-spinner></ion-spinner>
       <p>加载中...</p>
     </div>
     <div class="padding text-center"
@@ -45,6 +42,5 @@
 
   <!-- 标记为已读的按钮 -->
   <button class="button-float button button-stable icon icon-done-all"
-          ng-if="!hasnot_read_messages.length"
           ng-click="markAsRead()"></button>
 </ion-view>
diff --git a/www/app/replies/replies.controller.coffee b/www/app/replies/replies.controller.coffee
@@ -129,8 +129,11 @@ angular.module('ionic-nodeclub')
       authService.withAuthUser (authUser) ->
         $ionicLoading.show()
         topicService.sendReply($stateParams.topicId, $scope.newReply, authUser)
-          .then $scope.clearNewReply
-          .finally $ionicLoading.hide
+          .then ->
+            $scope.clearNewReply()
+            $scope.doRefresh()
+          .finally ->
+            $ionicLoading.hide()
 
     showSendAction: ->
       $ionicActionSheet.show
diff --git a/www/app/replies/replies.html b/www/app/replies/replies.html
@@ -10,16 +10,13 @@
   </ion-nav-buttons>
   <ion-content delegate-handle="replies-handle"
                overflow-scroll="true">
-    <!--<ion-refresher pulling-text="下拉刷新..."-->
-                   <!--pulling-icon="ion-ios-arrow-down"-->
-                   <!--spinner="spiral"-->
-                   <!--on-refresh="doRefresh()">-->
+    <!--<ion-refresher on-refresh="doRefresh()">-->
     <!--</ion-refresher>-->
 
     <!-- 提示信息 -->
     <div class="text-center padding"
          ng-if="loading">
-      <ion-spinner icon="spiral"></ion-spinner>
+      <ion-spinner></ion-spinner>
       <p>加载中...</p>
     </div>
     <div class="padding text-center"
diff --git a/www/app/settings/settings.html b/www/app/settings/settings.html
@@ -4,29 +4,17 @@
   <ion-content>
     <div class="list">
 
-      <div class="item item-toggle">
+     <ion-toggle class="toggle-positive"
+                 ng-model="settings.popRepliesVisible"
+                 ng-change="updateSettings()">
        是否显示最热回复
-       <label class="toggle toggle-positive">
-         <input type="checkbox"
-                ng-model="settings.popRepliesVisible"
-                ng-change="updateSettings()">
-         <div class="track">
-           <div class="handle"></div>
-         </div>
-       </label>
-      </div>
+     </ion-toggle>
 
-      <div class="item item-toggle">
-       倒序显示最新回复
-       <label class="toggle toggle-positive">
-         <input type="checkbox"
-                ng-model="settings.latestRepliesDesc"
-                ng-change="updateSettings()">
-         <div class="track">
-           <div class="handle"></div>
-         </div>
-       </label>
-      </div>
+     <ion-toggle class="toggle-positive"
+                 ng-model="settings.latestRepliesDesc"
+                 ng-change="updateSettings()">
+        倒序显示最新回复
+     </ion-toggle>
 
       <div class="item"
            ng-if="appVersion">
diff --git a/www/app/topic/topic.controller.coffee b/www/app/topic/topic.controller.coffee
@@ -53,28 +53,28 @@ angular.module('ionic-nodeclub')
     showTopicAction: ->
       $ionicActionSheet.show
         buttons: [
-          text: '话题回复'
+          text: '在浏览器中打开'
         ,
-          text: if !$scope.isCollected then '收藏话题' else '取消收藏'
+          text: '重新加载'
         ,
           text: '关于作者'
         ,
-          text: '刷新一下'
+          text: if !$scope.isCollected then '收藏话题' else '取消收藏'
         ,
-          text: '在浏览器中打开'
+          text: '回复话题'
         ]
         buttonClicked: (index) ->
           switch index
             when 0
-              $state.go 'app.replies', topicId:$stateParams.topicId
+              window.open "#{API.server}/topic/#{$stateParams.topicId}", '_system'
             when 1
-              collectTopic()
+              loadTopic(refresh = true)
             when 2
               $state.go 'app.user', loginname: $scope.topic.author.loginname
             when 3
-              loadTopic(refresh = true)
+              collectTopic()
             else
-              window.open "#{API.server}/topic/#{$stateParams.topicId}", '_system'
+              $state.go 'app.replies', topicId:$stateParams.topicId
           return true
 
   # 我在获取这个主题的内容
diff --git a/www/app/topic/topic.html b/www/app/topic/topic.html
@@ -9,16 +9,13 @@
     </button>
   </ion-nav-buttons>
   <ion-content overflow-scroll="true">
-    <!--<ion-refresher pulling-text="下拉刷新..."-->
-                   <!--pulling-icon="ion-ios-arrow-down"-->
-                   <!--spinner="spiral"-->
-                   <!--on-refresh="doRefresh()">-->
+    <!--<ion-refresher on-refresh="doRefresh()">-->
     <!--</ion-refresher>-->
 
     <!-- 提示信息 -->
     <div class="text-center padding"
          ng-if="loading">
-      <ion-spinner icon="spiral"></ion-spinner>
+      <ion-spinner></ion-spinner>
       <p>加载中...</p>
     </div>
 
diff --git a/www/app/topics/topics.controller.coffee b/www/app/topics/topics.controller.coffee
@@ -5,6 +5,7 @@ angular.module('ionic-nodeclub')
   tabs
   toast
   $scope
+  $state
   $window
   $timeout
   $ionicModal
@@ -94,7 +95,8 @@ angular.module('ionic-nodeclub')
             text: s
         buttonClicked: (index) ->
           localStorage.server = API.allServers[index]
-          $window.location.reload(true)
+          $state.go('app.topics', tab:'all')
+          $window.location.reload(false)
           return true
 
     doRefresh: ->
diff --git a/www/app/topics/topics.html b/www/app/topics/topics.html
@@ -21,10 +21,7 @@
   <!-- TODO overflow-scroll="true" -->
   <ion-content delegate-handle="topics-handle">
     <!-- 下拉刷新 -->
-    <ion-refresher pulling-text="下拉刷新..."
-                   pulling-icon="ion-ios-arrow-down"
-                   spinner="spiral"
-                   on-refresh="doRefresh()">
+    <ion-refresher on-refresh="doRefresh()">
     </ion-refresher>
 
     <!-- 主题列表，user页面也会用到 -->
@@ -33,7 +30,6 @@
     <!-- 滚动加载更多 -->
     <ion-infinite-scroll on-infinite="loadMore()"
                          ng-if="hasMore && !error"
-                         spinner="spiral"
                          distance="10%">
     </ion-infinite-scroll>
 
diff --git a/www/app/user/user.html b/www/app/user/user.html
@@ -11,7 +11,7 @@
     <!-- 提示信息 -->
     <div class="text-center padding"
          ng-if="!user">
-      <ion-spinner icon="spiral"></ion-spinner>
+      <ion-spinner></ion-spinner>
       <p>加载中...</p>
     </div>
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ionic-nodeclub",`
`3`		`- "version": "0.0.4",`
	`3`	`+ "version": "0.0.5",`
`4`	`4`	`"description": "An Ionic project",`
`5`	`5`	`"dependencies": {},`
`6`	`6`	`"devDependencies": {`