MOBILE-1701 imscp: Treat categories in TOC

Author: dpalou

www/addons/mod/imscp/controllers/index.js

@@ -102,6 +102,11 @@ angular.module('mm.addons.mod_imscp')
     };
 
     $scope.loadItem = function(itemId) {
+        if (!itemId) {
+            // Not valid, probably a category.
+            return;
+        }
+
         $scope.popover.hide();
         loadItem(itemId);
     };
@@ -120,10 +125,6 @@ angular.module('mm.addons.mod_imscp')
             scope: $scope
         }).then(function(popover) {
             $scope.popover = popover;
-
-            $scope.openToc = function($event) {
-                popover.show($event);
-            };
         });
     });
 

www/addons/mod/imscp/services/imscp.js

@@ -78,16 +78,16 @@ angular.module('mm.addons.mod_imscp')
      * @protected
      */
     self.getPreviousItem = function(items, itemId) {
-        var previous = '';
-
-        for (var i = 0, len = items.length; i < len; i++) {
-            if (items[i].href == itemId) {
-                break;
+        var position = getItemPosition(items, itemId);
+        if (position != -1) {
+            for (var i = position - 1; i >= 0; i--) {
+                if (items[i] && items[i].href) {
+                    return items[i].href;
+                }
             }
-            previous = items[i].href;
         }
 
-        return previous;
+        return '';
     };
 
     /**
@@ -102,19 +102,33 @@ angular.module('mm.addons.mod_imscp')
      * @protected
      */
     self.getNextItem = function(items, itemId) {
-        var next = '';
-
-        for (var i = 0, len = items.length; i < len; i++) {
-            if (items[i].href == itemId) {
-                if (typeof items[i + 1] != 'undefined') {
-                    next = items[i + 1].href;
-                    break;
+        var position = getItemPosition(items, itemId);
+        if (position != -1) {
+            for (var i = position + 1, len = items.length; i < len; i++) {
+                if (items[i] && items[i].href) {
+                    return items[i].href;
                 }
             }
         }
-        return next;
+
+        return '';
     };
 
+    /**
+     * Get the position of a item.
+     *
+     * @param  {Object[]} items The items list.
+     * @param  {String} itemId  The item to search
+     * @return {Number}         The item position.
+     */
+    function getItemPosition(items, itemId) {
+        for (var i = 0, len = items.length; i < len; i++) {
+            if (items[i].href == itemId) {
+                return i;
+            }
+        }
+        return -1;
+    }
 
     /**
      * Check if we should ommit the file download.

www/addons/mod/imscp/templates/index.html

@@ -1,7 +1,7 @@
 <ion-view>
     <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
     <ion-nav-buttons side="secondary">
-        <button class="button button-icon ion-bookmark" ng-click="openToc($event)">
+        <button class="button button-icon ion-bookmark" ng-click="popover.show($event)" ng-if="items.length > 1">
         </button>
         <mm-context-menu>
             <mm-context-menu-item priority="900" ng-if="externalUrl" href="{{externalUrl}}" content="{{ 'mm.core.openinbrowser' | translate }}" icon-action="ion-share"></mm-context-menu-item>

www/addons/mod/imscp/templates/toc.html

@@ -3,7 +3,7 @@
         <nav>
             <ul class="list">
                 <li ng-repeat="item in items">
-                    <a class="item" ng-click="loadItem(item.href);">
+                    <a class="item" ng-click="loadItem(item.href)" ng-class='{"mm-bold": !item.href}'>
                         <span class="padding-left" ng-repeat="i in getNumberForPadding(item.level)"></span>{{item.title}}
                     </a>
                 </li>

www/core/scss/styles.scss

@@ -462,6 +462,10 @@ mm-timer {
   font-family: Andale Mono,Monaco,Courier New,DejaVu Sans Mono,monospace;
 }
 
+.mm-bold {
+  font-weight: bold;
+}
+
 // Context Menu
 
 .popover.mm-context-menu {