Merge pull request #5 from tuchong/bugfix

Bugfix

Author: guo-yu

src/javascript/controllers/home.js

@@ -98,6 +98,7 @@
 
       // Load cover image
       loadCover(targetIndex, { 
+        showLoading: true,
         setupChildrenSwiper: true,
         loadFirstChild: true
       });
@@ -120,10 +121,10 @@
         slides = new Swiper('.swiper-container-collection', {
           onSlideChangeStart: function() {
             loadCover(slides.activeIndex, { 
+              showLoading: true,
               setupChildrenSwiper: true,
               loadFirstChild: true
             });
-            loadCover(slides.activeIndex + 1);
           }
         });
       }, 10);
@@ -136,13 +137,13 @@
 
       // If this collection have on one picture
       if (scope.collections[index].images.length === 1) 
-        return loadImage(index);
+        return loadImage(index, opts);
 
-      loadChildImage(index, 0);
+      loadChildImage(index, 0, opts);
 
       // Load its first child if required
       if (opts && opts.loadFirstChild)
-        loadChildImage(index, 1);
+        loadChildImage(index, 1, opts);
 
       if (!opts || !opts.setupChildrenSwiper)
         return;
@@ -169,13 +170,13 @@
       childrenSlides[index] = new Swiper('#children-' + index, {
         direction: 'vertical',
         onSlideChangeStart: function() {
-          loadChildImage(index, childrenSlides[index].activeIndex + 1);
+          loadChildImage(index, childrenSlides[index].activeIndex);
         }
       });
     }
 
     // Update slides async
-    function loadImage(index) {
+    function loadImage(index, opts) {
       if (backgrounds[index])
         return scope.$apply();
 
@@ -184,11 +185,12 @@
         function(localImage) {
           backgrounds[index] = localImage;
           scope.$apply();
-        }
+        },
+        (opts && opts.showLoading) || true
       );
     }
 
-    function loadChildImage(parentIndex, index) {
+    function loadChildImage(parentIndex, index, opts) {
       if (Array.isArray(childrens[parentIndex]) && childrens[parentIndex][index])
         return scope.$apply();
 
@@ -206,7 +208,9 @@
         function(localImage) {
           childrens[parentIndex][index] = localImage;
           scope.$apply();
-        }
+        },
+        // ALWAYS show loading
+        (opts && opts.showLoading) || true
       );
     }
 

src/javascript/services/imageloader.js

@@ -16,8 +16,9 @@
   function imageLoader($ionicLoading, $timeout) {
     this.load = load;
 
-    function load(uri, callback) {
-      $ionicLoading.show();
+    function load(uri, callback, showloading) {
+      if (showloading)
+        $ionicLoading.show();
 
       var img = new BlobImage(ismobile ? uri : proxy(uri));
       img.element.onload = success;

src/less/app.less

@@ -62,6 +62,11 @@
       font-size: 16px;
       font-weight: bold;
       margin-bottom: 13px;
+
+      a {
+        text-decoration: none;
+        color: #fff;
+      }
     }
 
     .excerpt {