Merge pull request #11 from jostw/josyeh/Marketplace/master/Bug1233681

Bug 1233681 - [TV][2.5] Update contextmenu id to the top element
mozilla-b2g · Dec 31, 2015 · 779dfc1 · 779dfc1
2 parents 4461a6a + bc47211
commit 779dfc1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/dev.html b/src/dev.html
@@ -27,13 +27,17 @@
     </script>
   </head>
 
-  <body class="home" data-media="">
+  <body class="home" data-media="" contextmenu="contextmenu">
     <noscript><p>Sorry, you need JavaScript to use this site.</p></noscript>
 
     <main>
       <div id="page" class="page" role="main"></div>
     </main>
 
+    <menu type="context" id="contextmenu">
+      <menuitem></menuitem>
+    </menu>
+
     {% if compiled %}
       <script src="/media/js/include.js" defer></script>
     {% else %}

diff --git a/src/media/js/views/homepage.js b/src/media/js/views/homepage.js
@@ -6,6 +6,8 @@ define('views/homepage',
     var gettext = l10n.gettext;
     var appsModel = models('apps');
 
+    var appContextMenu = document.getElementById('contextmenu').children[0];
+
     var $appPreview;
     var $appList;
 
@@ -70,6 +72,9 @@ define('views/homepage',
         var focusedApp = appsModel.lookup(this.dataset.slug);
         var focusedManifestURL = focusedApp.manifest_url;
 
+        // Update context menu's label
+        appContextMenu.label = focusedManifestURL || '';
+
         this.classList.add('focused');
 
         // Update app preview area with current focused app.

diff --git a/src/templates/homepage.html b/src/templates/homepage.html
@@ -4,16 +4,10 @@
   {% defer (url=api('apps'), pluck='objects', as='apps', key='slug') %}
     <ul class="clearfix">
       {% for app in this %}
-        <li class="app-list-app focusable" data-slug="{{ app.slug }}"
-            contextmenu="contextmenu-{{ loop.index }}">
+        <li class="app-list-app focusable" data-slug="{{ app.slug }}">
           <img src="{{ app.icons['128'] }}"
                alt="{{ app.name }}" title="{{ app.name }}">
           <span class="name">{{ app.name }}</span>
-
-          <menu type="context" id="contextmenu-{{ loop.index }}">
-            <menuitem label="{{ app.manifest_url }}"></menuitem>
-          </menu>
-
         </li>
       {% endfor %}
     </ul>