Merge pull request #30 from pluswave/PR-1

更新版本，适应IOS9

Author: lanceli

app/js/filters/topic.js

@@ -19,7 +19,7 @@ angular.module('cnodejs.filters')
         content
         .replace(userLinkRegex, 'href="#/user/$1"')
         .replace(noProtocolSrcRegex, 'src="https://$1"')
-        .replace(externalLinkRegex, "onClick=\"window.open('$1', '_blank', 'location=yes')\"")
+        .replace(externalLinkRegex, "onClick=\"cordova.InAppBrowser.open('$1', '_blank', 'location=yes')\"")
       );
     }
     return content;

app/templates/settings.html

@@ -36,13 +36,13 @@
           Email
         </span>
       </ion-item>
-      <ion-item onclick="window.open('itms-apps://itunes.apple.com/app/id954734793', '_system')" ng-if="platform.isIOS()">
+      <ion-item onclick="cordova.InAppBrowser.open('itms-apps://itunes.apple.com/app/id954734793', '_system')" ng-if="platform.isIOS()">
         评分鼓励
       </ion-item>
-      <ion-item onclick="window.open('http://blog.lanceli.com/about', '_blank', 'location=yes')">
+      <ion-item onclick="cordova.InAppBrowser.open('http://blog.lanceli.com/about', '_blank', 'location=yes')">
         关于作者
       </ion-item>
-      <ion-item onclick="window.open('https://cnodejs.org/about', '_blank', 'location=yes')">
+      <ion-item onclick="cordova.InAppBrowser.open('https://cnodejs.org/about', '_blank', 'location=yes')">
         关于CNode社区
       </ion-item>
     </ion-list>

app/templates/topic.html

@@ -1,6 +1,6 @@
 <ion-view view-title="详情">
   <ion-content class="has-header">
-    <ion-refresher pulling-text="下拉刷新..." on-refresh="doRefresh()" refreshing-icon="ion-loading-c">
+    <ion-refresher pulling-text="下拉刷新..." on-refresh="doRefresh()" >
     </ion-refresher>
     <div class="row topic">
       <div class="col col90">

app/templates/topics.html

@@ -4,7 +4,7 @@
   </ion-nav-buttons>
   <ion-content class="has-header">
 
-    <ion-refresher ng-if="topics.length > 0 || loadError" pulling-text="下拉刷新..." on-refresh="doRefresh()" refreshing-icon="ion-loading-c">
+    <ion-refresher ng-if="topics.length > 0 || loadError" pulling-text="下拉刷新..." on-refresh="doRefresh()">
     </ion-refresher>
     <ion-list class="topics">
       <ion-item class="item-avatar"
@@ -28,7 +28,7 @@ <h2>{{topic.title}}</h2>
       Loading icon of infinte-scroll not showing with collection-repeat
       https://github.com/driftyco/ionic/issues/2376
     -->
-    <ion-infinite-scroll on-infinite="loadMore()" distance="10%" icon="ion-loading-c" ng-if="hasNextPage && !loadError">
+    <ion-infinite-scroll on-infinite="loadMore()" distance="10%" ng-if="hasNextPage && !loadError">
     </ion-infinite-scroll>
   </ion-content>
 </ion-view>

app/templates/user.html

@@ -3,7 +3,7 @@
     <button ng-if="user.loginname == loginName" class="button button-clear" ng-click="logout()">退出</button>
   </ion-nav-buttons>
   <ion-content class="has-header user">
-    <ion-refresher pulling-text="下拉刷新..." on-refresh="doRefresh()" refreshing-icon="ion-loading-c">
+    <ion-refresher pulling-text="下拉刷新..." on-refresh="doRefresh()">
     </ion-refresher>
     <ion-list>
       <ion-item class="item-divider item-gap">

bower.json

@@ -2,7 +2,7 @@
   "name": "cnodejs",
   "version": "0.0.0",
   "dependencies": {
-    "ionic": "driftyco/ionic-bower#v1.0.0-beta.14",
+    "ionic": "driftyco/ionic-bower#v1.1.1",
     "angular-moment": "~0.8.2",
     "angular-resource": "~1.3.1"
   },

package.json

@@ -50,17 +50,18 @@
   },
   "cordovaPlugins": [
     "https://github.com/driftyco/ionic-plugins-keyboard.git",
-    "org.apache.cordova.statusbar",
-    "org.apache.cordova.console",
-    "https://github.com/wildabeast/BarcodeScanner.git",
+    "cordova-plugin-statusbar",
+    "cordova-plugin-console",
     "https://github.com/VersoSolutions/CordovaClipboard",
-    "org.apache.cordova.splashscreen",
-    "org.apache.cordova.inappbrowser",
+    "cordova-plugin-splashscreen",
+    "cordova-plugin-inappbrowser",
     "https://github.com/katzer/cordova-plugin-badge.git",
-    "org.apache.cordova.dialogs",
+    "cordova-plugin-dialogs",
     "https://github.com/katzer/cordova-plugin-email-composer.git",
     "https://github.com/danwilson/google-analytics-plugin.git",
     "https://github.com/lanceli/jpush-phonegap-plugin",
-    "org.apache.cordova.device"
-  ]
+    "cordova-plugin-device",
+    "phonegap-plugin-barcodescanner"
+  ],
+  "cordovaPlatforms": []
 }