Merge pull request #373 from dpalou/MOBILE-1370-tmpfix

MOBILE-1370 glossary: Add entryid param to fix state comparison problems

Author: jleyva

www/addons/mod_glossary/main.js

@@ -36,7 +36,8 @@ angular.module('mm.addons.mod_glossary', ['mm.core'])
       url: '/mod_glossary-entry',
       params: {
         cid: null, // Not naming it courseid because it collides with 'site.mod_glossary' param in split-view.
-        entry: null
+        entry: null,
+        entryid: null // Required so Angular ui-router is able to compare states (it doesn't compare object properties).
       },
       views: {
         'site': {

www/addons/mod_glossary/services/handlers.js

@@ -159,6 +159,7 @@ angular.module('mm.addons.mod_glossary')
                                 return promise.then(function(courseId) {
                                     var stateParams = {
                                         entry: entry,
+                                        entryid: entry.id,
                                         cid: courseId
                                     };
                                     $mmContentLinksHelper.goInSite('site.mod_glossary-entry', stateParams, siteId);

www/addons/mod_glossary/templates/index.html

@@ -33,7 +33,7 @@
                             <h2>{{getDivider(entries[$index])}}</h2>
                         </div>
 
-                        <a class="item" mm-split-view-link="site.mod_glossary-entry({entry: {{ entry }}, cid: {{ courseid }}})">
+                        <a class="item" mm-split-view-link="site.mod_glossary-entry({entry: {{ entry }}, cid: {{ courseid }}, entryid: {{ entry.id }}})">
                             <p>{{entry.concept}}</p>
                         </a>
                     </div>