MOBILE-1461 wiki: Add state when moving through groups

Author: crazyserver

www/addons/mod_wiki/controllers/index.js

@@ -22,13 +22,12 @@ angular.module('mm.addons.mod_wiki')
  * @name mmaModWikiIndexCtrl
  */
 .controller('mmaModWikiIndexCtrl', function($q, $scope, $stateParams, $mmCourse, $mmUser, $mmGroups, $ionicPopover, $mmUtil, $state,
-        $mmSite, $mmaModWiki, $ionicScrollDelegate, $ionicTabsDelegate, $ionicHistory, $translate, mmaModWikiSubwikiPagesLoaded) {
+        $mmSite, $mmaModWiki, $ionicTabsDelegate, $ionicHistory, $translate, mmaModWikiSubwikiPagesLoaded) {
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         action = $stateParams.action || 'page',
         currentPage = $stateParams.pageid || false,
         popover, wiki, currentSubwiki, loadedSubwikis,
-        scrollDelegate = $ionicScrollDelegate.$getByHandle('mmaModWikiIndexScroll'),
         tabsDelegate;
 
     $scope.title = $stateParams.pagetitle || module.name;
@@ -56,7 +55,7 @@ angular.module('mm.addons.mod_wiki')
 
     $scope.gotoPage = function(pageId) {
         if (currentPage != pageId) {
-            // Add a new State
+            // Add a new State.
             return fetchPageContents(pageId).then(function(page) {
                 var stateParams = {
                     module: module,
@@ -75,6 +74,29 @@ angular.module('mm.addons.mod_wiki')
         tabsDelegate.select(0);
     };
 
+    $scope.gotoSubwiki = function(subwikiId) {
+
+        // Check if the subwiki is disabled.
+        if (subwikiId > 0) {
+            popover.hide();
+
+            if (subwikiId != currentSubwiki.id) {
+                // Add a new State.
+                var stateParams = {
+                    module: module,
+                    moduleid: module.id,
+                    courseid: courseId,
+                    pageid: null,
+                    pagetitle: null,
+                    wikiid: wiki.id,
+                    subwikiid: subwikiId,
+                    action: tabsDelegate.selectedIndex() == 0 ? 'page' : 'map'
+                };
+                return $state.go('site.mod_wiki', stateParams);
+            }
+        }
+    };
+
     // Convenience function to get wiki data.
     function fetchWikiData(refresh) {
         var id = module.id || $stateParams.wikiid,
@@ -98,8 +120,6 @@ angular.module('mm.addons.mod_wiki')
             }
 
             return promise.then(function(mod) {
-                var groupmode = wiki.groupmode;
-
                 module = mod;
 
                 $scope.title = $scope.title || wiki.title;
@@ -131,7 +151,7 @@ angular.module('mm.addons.mod_wiki')
                         });
                     }).then(function() {
 
-                        if ($scope.subwikiData.count > 1 && !popover) {
+                        if ($scope.subwikiData.count > 1) {
                             // More than one subwiki available.
                             handleSubwikiPopover();
                         }
@@ -165,29 +185,6 @@ angular.module('mm.addons.mod_wiki')
 
     // Convinience function that handles Subwiki Popover.
     function handleSubwikiPopover() {
-
-        // Preparing the popover.
-        $scope.subwikiPicked = function(subwikiId) {
-
-            // Check if the subwiki is disabled.
-            if (subwikiId > 0) {
-                popover.hide();
-
-                if (subwikiId != currentSubwiki.id) {
-
-                    scrollDelegate.scrollTop(false);
-
-                    currentPage = false;
-                    $scope.subwikiData.selected = subwikiId;
-                    $scope.wikiLoaded = false;
-
-                    return fetchWikiPage();
-                }
-                // No changes done.
-                $scope.wikiLoaded = true;
-            }
-        };
-
         $ionicPopover.fromTemplateUrl('addons/mod_wiki/templates/subwiki_picker.html', {
             scope: $scope
         }).then(function(po) {
@@ -206,7 +203,7 @@ angular.module('mm.addons.mod_wiki')
             userGroupsIds = [],
             allParticipants = false,
             myGroups = false,
-            multiLevelList = false;
+            multiLevelList = false,
             currentUserId = $mmSite.getUserId() || false,
             allParticipantsTitle = $translate.instant('mm.core.allparticipants'),
             nonInGroupTitle = $translate.instant('mma.mod_wiki.notingroup'),

www/addons/mod_wiki/controllers/map.js

@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_wiki')
  * @ngdoc controller
  * @name mmaModWikiMapCtrl
  */
-.controller('mmaModWikiMapCtrl', function($scope, $mmEvents, mmaModWikiSubwikiPagesLoaded, $stateParams) {
+.controller('mmaModWikiMapCtrl', function($scope, mmaModWikiSubwikiPagesLoaded) {
     $scope.map = [];
 
     $scope.constructMap = function(subwikiPages) {

www/addons/mod_wiki/scss/styles.scss

@@ -3,6 +3,7 @@ $mma-mod-wiki-newentry-link-color:   red !default;
 $mma-mod-wiki-toc-title-color:   #666 !default;
 $mma-mod-wiki-toc-border-color:   #bbb !default;
 $mma-mod-wiki-toc-background-color:   #eee !default;
+$mma-mod-wiki-subwiki-selected-background-color:   #f7f7f7 !default;
 
 .wiki-toc {
   border: 1px solid $mma-mod-wiki-toc-border-color;
@@ -11,7 +12,6 @@ $mma-mod-wiki-toc-background-color:   #eee !default;
   padding: 8px;
 }
 
-
 .wiki-toc-title {
   color: $mma-mod-wiki-toc-title-color;
   font-size: 1.1em;
@@ -44,4 +44,12 @@ a.wiki_edit_section {
 
 .mma-mod_wiki-subwiki-picker .item-divider {
   font-weight: bold;
+}
+
+.mma-mod_wiki-subwiki-picker .item.item-selected {
+  background-color: $mma-mod-wiki-subwiki-selected-background-color;
+}
+
+.mma-mod_wiki-subwiki-picker .item.item-selected .icon {
+  font-size: 24px;
 }

www/addons/mod_wiki/templates/subwiki_picker.html

@@ -2,11 +2,11 @@
     <ion-content>
         <div class="list">
             <div ng-repeat-start="group in subwikiData.subwikis" ng-if="group.label" class="item item-divider">{{ group.label }}</div>
-            <ion-radio ng-repeat-end ng-class="{'item-disabled': subwiki.id <= 0}" ng-repeat="subwiki in group.subwikis"
-                        ng-model="subwikiData.selected" ng-value="subwiki.id" ng-disabled="subwiki.id <= 0"
-                        ng-click="subwikiPicked(subwiki.id)">
+            <ion-item ng-repeat-end class="item-icon-right" ng-class="{'item-disabled': subwiki.id <= 0, 'item-selected': subwiki.id == subwikiData.selected}" ng-repeat="subwiki in group.subwikis"
+                        ng-disabled="subwiki.id <= 0" ng-click="gotoSubwiki(subwiki.id)">
                 {{ subwiki.name }}
-            </ion-radio>
+                <i class="icon ion-checkmark" ng-if="subwiki.id == subwikiData.selected"></i>
+            </ion-item>
         </div>
     </ion-content>
 </ion-popover-view>