Merge pull request #2 from tuchong/v0.4.0

v0.4.0 Feature Branch

README.md

@@ -17,12 +17,6 @@ $ bower install
 $ npm run dev
 ```
 
-确保在 Web 控制台启用 debug 模式：
-
-```bash
-$ debug.enable('tuchong-daily,tuchong-daily:*')
-```
-
 ### 应用调试
 
 #### 安装插件

bin/build-js.sh

@@ -2,12 +2,10 @@
 
 node_modules/.bin/uglifyjs \
   src/javascript/app.js \
-  src/javascript/ui.js \
   src/javascript/services/store.js \
   src/javascript/services/share.js \
   src/javascript/services/imageloader.js \
   src/javascript/controllers/home.js \
-  src/javascript/controllers/collection.js \
   --mangle \
   --compress \
   -o www/dist/javascript/tuchong.min.js \

bin/watch.sh

@@ -4,4 +4,4 @@ node_modules/.bin/rewatch \
   src/less/*.less \
   src/javascript/*.js \
   src/javascript/**/*.js \
-  -c 'npm run build-less && npm run build-js'
+  -c 'npm run build-js'

bower.json

@@ -3,9 +3,17 @@
   "private": true,
   "devDependencies": {
     "avoscloud": "~0.1.2",
-    "ionic": "driftyco/ionic-bower#1.0.0-beta.13",
-    "debug": "[email protected]:visionmedia/debug.git",
+    "ionic": "driftyco/ionic-bower#master",
     "angular-resource": "~1.3.2",
-    "ngCordova": "~0.1.7-alpha"
+    "ngCordova": "~0.1.7-alpha",
+    "mindb": "~0.0.4",
+    "blobimage": "~1.0.1",
+    "swiper": "~3.0.1"
+  },
+  "resolutions": {
+    "angular": "1.3.6",
+    "angular-animate": "1.3.6",
+    "angular-sanitize": "1.3.6",
+    "angular-ui-router": "0.2.13"
   }
 }

config-sample.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.tuchong.daily" version="0.2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.tuchong.daily" version="0.4.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>图虫日报</name>
   <description>
     图虫每日精选 - 图虫网是中国最专业的web2.0摄影社区，下属纪实、风光、人像、生态、黑白、器材、佳能、尼康、宾得等几十个专业摄影社区。海量的照片、相册和图博全部由摄影师共同管理和维护。

src/javascript/app.js

@@ -1,11 +1,7 @@
-;(function(angular, debug) {
+;(function(window) {
   'use strict';
-  var log;
 
-  if (!angular)
-    throw new Error('Angular.js is required');
-  if (debug)
-    log = debug('tuchong-daily:app');
+  var angular = window.angular;
 
   angular
     .module('tuchong-daily', [
@@ -18,6 +14,7 @@
     .constant('API_SERVER', appConfigs.API_SERVER)
     .constant('API_TOKEN_KEY', 'tuchong-daily-token')
     .constant('TC_SERVER', 'http://tuchong.com/api/')
+    .constant('$ionicLoadingConfig', { template: '<ion-spinner icon="lines"></ion-spinner>' })
     .config([
       '$httpProvider',
       '$stateProvider', 
@@ -35,33 +32,17 @@
       '$timeout',
       'avoscloud',
       '$cordovaDialogs',
-      '$ionicSlideBoxDelegate',
-      '$rootScope',
       '$state',
       init
     ]);
 
-  function init($ionicPlatform, $cordovaDevice, $cordovaNetwork, $cordovaPush, $timeout, avoscloud, $cordovaDialogs, $ionicSlideBoxDelegate, $rootScope, $state) {
-    // Clear reading history
-    if (localStorage.lastSlideIndexHome) 
-      localStorage.removeItem('lastSlideIndexHome');
-
-    // Listen to page changing event,
-    // And jump to lastSlideIndex
-    $rootScope.$on('$stateChangeSuccess', stateChangeSuccess);
-
-    // When Push Received,
-    // Jump to single collection page
-    $rootScope.$on('pushNotificationReceived', pushNotificationReceived);
-
+  function init($ionicPlatform, $cordovaDevice, $cordovaNetwork, $cordovaPush, $timeout, avoscloud, $cordovaDialogs, $state) {
     $ionicPlatform.ready(function() {
       var device = $cordovaDevice.getDevice();
       var newtork = $cordovaNetwork.getNetwork();
 
-      if (log) {
-        log(device);
-        log(newtork);
-      }
+      console.log(device);
+      console.log(newtork);
 
       if (newtork !== 'wifi' && newtork !== 'Connection.WIFI') {
         $cordovaDialogs.alert(
@@ -72,20 +53,20 @@
       }
 
       authPushService(device, function(installation){
-        if (log) log(installation);
+        console.log(installation);
 
         avoscloud
           .installations
           .post(installation, syncInstallationSuccess, syncError);
 
         // When sync device infomation success
         function syncInstallationSuccess(result) {
-          if (log) log(result);
+          console.log(result);
         }
 
         // Ignore the error for tmp.
         function syncError(err) {
-          if (log) log(err);
+          console.log(err);
         }
       });
     });
@@ -100,7 +81,6 @@
       $cordovaPush
         .register(options)
         .then(function(token) {
-        if (log) log('Push service signup success, token: %s', token);
 
         var installation = {};
 
@@ -124,59 +104,13 @@
 
       // Ignore the error for tmp.
       function pushSignupError(err) {
-        if (log) log(err);
-
         $cordovaDialogs.alert(
-          // '(¬_¬)ﾉ 请手动在 设置 > 通知 启用推送' + err.toString(), // message
           err,
           '获取推送权限失败...', // title,
           '知道了' // button
         )
       }
     }
-
-    function pushNotificationReceived(event, notification) {
-      if (notification.collectionId) {
-        $state.go('collection', {
-          id: notification.collectionId
-        });
-        return;
-      }
-
-      $cordovaDialogs.alert(
-        notification.alert, // message
-        '收到通知', // title,
-        '知道了' // button
-      )
-    }
-
-    // When stats changes success, Go to the latest slide index
-    function stateChangeSuccess(e, toState, toParams, fromState, fromParams) {
-      if (log) log('%s => %s', fromState.name || 'init', toState.name);
-
-      var isGoBackHome = toState.name === 'home' && fromState.name;
-      var isGoToCollection = fromState.name === 'home' && toState.name === 'collection';
-      var isBackToCollection = fromState.name === 'collection-single' && toState.name === 'collection';
-
-      if (!isGoBackHome && !isGoToCollection && !isBackToCollection) return;
-      if (isGoToCollection) return;
-
-      var gotoIndex = isGoBackHome ?
-        localStorage.lastSlideIndexHome :
-        localStorage.lastSlideIndexCollection;
-
-      if (!gotoIndex)
-        gotoIndex = 0;
-
-      gotoIndex = parseInt(gotoIndex);
-
-      if (log) log('Going back to %s', gotoIndex);
-
-      // Slide to last visited index.
-      $timeout(function(){
-        $ionicSlideBoxDelegate.slide(gotoIndex);
-      }, 300);
-    }
   }
 
   function config($httpProvider, $stateProvider, $urlRouterProvider, avoscloudProvider, API_TOKEN, API_TOKEN_KEY) {
@@ -195,19 +129,9 @@
         templateUrl: 'templates/home.html',
         controller: 'home'
       })
-      .state('collection', {
-        url: '/collection/:id',
-        templateUrl: 'templates/collection.html',
-        controller: 'collection'
-      })
-      .state('collection-single', {
-        url: '/images?uri',
-        templateUrl: 'templates/single.html',
-        controller: 'collection-single'
-      })
 
     // 404 Router
     $urlRouterProvider.otherwise('/');
   }
 
-})(window.angular, window.debug);
+})(this);