Merge pull request #27467 from fabi1cazenave/uplift-transparencyControl

bug 1118003: uplift to v2.2, r=etienne

apps/privacy-panel/index.html

@@ -25,6 +25,8 @@
     <meta name="availableLanguages" content="ar, en-US, fr, zh-TW">
     <link rel="localization" href="locales/countries.{locale}.properties">
     <link rel="localization" href="locales/privacypanel.{locale}.properties">
+    <link rel="localization" href="locales/permissions.{locale}.properties">
+    <link rel="localization" href="shared/locales/permissions/permissions.{locale}.properties">
 
     <!-- Templates: Location Accuracy -->
     <link rel="import" href="/templates/ala/main.html">
@@ -39,6 +41,13 @@
     <link rel="import" href="/templates/rpp/screenlock.html">
     <link rel="import" href="/templates/rpp/passcode.html">
 
+    <!-- Templates: Transparency Control -->
+    <link rel="import" href="/templates/tc/main.html">
+    <link rel="import" href="/templates/tc/applications.html">
+    <link rel="import" href="/templates/tc/app_details.html">
+    <link rel="import" href="/templates/tc/permissions.html">
+    <link rel="import" href="/templates/tc/perm_details.html">
+
     <!-- Templates: Guided Tour -->
     <link rel="import" href="/templates/gt/main.html">
     <link rel="import" href="/templates/gt/ala_explain.html">
@@ -81,18 +90,23 @@ <h1 data-l10n-id="privacy-panel">Privacy Panel</h1>
           </a>
         </li>
         <li>
-          <a id="menu-item-rpp" class="menu-item pp-link" data-icon="messages" href="#rpp-main">
+          <a id="menu-item-rpp" class="menu-item pp-link" data-icon="lock" href="#rpp-main">
             <span data-l10n-id="remote-privacy-protection">Remote Privacy Protection</span>
           </a>
         </li>
+        <li>
+          <a id="menu-item-tc" class="menu-item pp-link" data-icon="tick-circle" href="#tc-main">
+            <span data-l10n-id="transparency-control">Transparency Control</span>
+          </a>
+        </li>
         <li>
           <a id="menu-item-gt" class="menu-item pp-link" data-icon="flag" href="#gt-main">
             <span data-l10n-id="guided-tour">Guided Tour</span>
           </a>
         </li>
       </ul>
     </section>
-    
+
     <!-- Sections: Location Accuracy -->
     <section is="ala-main" role="region" id="ala-main" data-section="ala"></section>
     <section is="ala-exceptions" role="region" id="ala-exceptions" data-section="ala"></section>
@@ -106,6 +120,13 @@ <h1 data-l10n-id="privacy-panel">Privacy Panel</h1>
     <section is="rpp-screenlock" role="region" id="rpp-screenlock" data-section="rpp"></section>
     <section is="rpp-passcode" role="region" id="rpp-passcode" data-section="rpp"></section>
 
+    <!-- Sections: Transparency Control -->
+    <section role="region" data-section="tc" is="tc-main"         id="tc-main"></section>
+    <section role="region" data-section="tc" is="tc-applications" id="tc-applications"></section>
+    <section role="region" data-section="tc" is="tc-appDetails"   id="tc-appDetails"></section>
+    <section role="region" data-section="tc" is="tc-permissions"  id="tc-permissions"></section>
+    <section role="region" data-section="tc" is="tc-permDetails"  id="tc-permDetails"></section>
+
     <!-- Sections: Guided Tour -->
     <section is="gt-main" role="region" id="gt-main" data-section="gt"></section>
     <section is="gt-ala-explain" role="region" id="gt-ala-explain" data-section="gt"></section>
@@ -121,6 +142,8 @@ <h1 data-l10n-id="privacy-panel">Privacy Panel</h1>
     <!-- Sections: About -->
     <section is="about" role="region" id="about" data-section="about"></section>
 
+    <!-- Require /js/app.js and all its dependencies -->
     <script data-main="js/app" src="js/vendor/alameda.js"></script>
+
   </body>
 </html>

apps/privacy-panel/js/about/main.js

@@ -14,19 +14,15 @@ function(panels) {
   var About = {
 
     init: function() {
-      this.panel = document.getElementById('about');
-      this.version = this.panel.querySelector('#privacy-panel-version');
-      this.build = this.panel.querySelector('#privacy-panel-build');
-
-      panels.loadJSON('resources/about.json', function(data) {
-        this.regionsAndCities = data;
-
-        this.version.textContent = data.version;
-        this.build.textContent = data.build;
-      }.bind(this));
+      var version = document.getElementById('privacy-panel-version');
+      var build = document.getElementById('privacy-panel-build');
+      panels.loadJSON('resources/about.json', data => {
+        version.textContent = data.version;
+        build.textContent = data.build;
+      });
     }
+
   };
 
   return About;
-
 });

apps/privacy-panel/js/ala/exception.js

@@ -1,19 +1,18 @@
 /**
  * ALA exception panel.
- * 
+ *
  * @module ALAException
  * @return {Object}
  */
 define([
   'panels',
   'ala/blur_slider',
-  'ala/app_list',
   'ala/exceptions',
   'shared/settings_listener',
   'shared/settings_helper'
 ],
 
-function(panels, BlurSlider, appList, alaExceptions, SettingsListener,
+function(panels, BlurSlider, alaExceptions, SettingsListener,
   SettingsHelper) {
   'use strict';
 
@@ -28,7 +27,7 @@ function(panels, BlurSlider, appList, alaExceptions, SettingsListener,
 
     /**
      * Initialize ALA exception panel.
-     * 
+     *
      * @method init
      * @constructor
      */

apps/privacy-panel/js/ala/exceptions.js

@@ -1,18 +1,17 @@
 /**
  * ALA exceptions panel.
- * 
+ *
  * @module ExceptionsPanel
  * @return {Object}
  */
 define([
   'panels',
   'ala/blur_slider',
-  'ala/app_list',
   'shared/settings_listener',
   'shared/settings_helper'
 ],
 
-function(panels, BlurSlider, appList, SettingsListener, SettingsHelper) {
+function(panels, BlurSlider, SettingsListener, SettingsHelper) {
   'use strict';
 
   function ExceptionsPanel() {
@@ -24,7 +23,7 @@ function(panels, BlurSlider, appList, SettingsListener, SettingsHelper) {
 
     /**
      * Initialize ALA exceptions panel.
-     * 
+     *
      * @method init
      * @constructor
      */
@@ -61,23 +60,16 @@ function(panels, BlurSlider, appList, SettingsListener, SettingsHelper) {
       }
 
       // render app list
-      var manifest, icon, appSettings, type, li;
-
       this.apps.forEach(function(item, index) {
 
         // remove Privacy Panel application from list
         if (item.origin.indexOf('privacy-panel') !== -1) {
           return;
         }
 
-        manifest = item.manifest || item.updateManifest;
-        icon = appList.icon(item);
-
-        type = undefined;
-        appSettings = this.exceptionsList[item.origin];
-
+        var type;
+        var appSettings = this.exceptionsList[item.origin];
         if (appSettings) {
-          type = appSettings.type;
           switch (appSettings.type) {
             case 'user-defined':
               type = 'User defined';
@@ -92,15 +84,16 @@ function(panels, BlurSlider, appList, SettingsListener, SettingsHelper) {
               type = 'No location';
               break;
             default:
+              type = appSettings.type;
               break;
           }
         }
 
-        li = this.renderAppItem({
+        var li = this.renderAppItem({
           origin: item.origin,
-          name: manifest.name,
+          name: item.name,
           index: index,
-          iconSrc: icon,
+          iconSrc: item.iconURL,
           type: type
         });
 

apps/privacy-panel/js/ala/main.js

@@ -1,21 +1,21 @@
 /**
  * ALA main panel.
- * 
+ *
  * @module AlaPanel
  * @return {Object}
  */
 define([
   'panels',
+  'app_list',
   'ala/blur_slider',
-  'ala/app_list',
   'ala/exception',
   'ala/exceptions',
   'ala/define_custom_location',
   'shared/settings_listener',
   'shared/settings_helper'
 ],
 
-function(panels, BlurSlider, appList, alaException, alaExceptions, alaDCL,
+function(panels, appList, BlurSlider, alaException, alaExceptions, alaDCL,
   SettingsListener, SettingsHelper) {
   'use strict';
 
@@ -51,11 +51,9 @@ function(panels, BlurSlider, appList, alaException, alaExceptions, alaDCL,
       this._prepareDCLData();
 
       // prepare app list that uses geolocation
-      appList.get('geolocation', function(apps) {
-
-        // init alaExceptions module
-        alaExceptions.init(apps);
-      }.bind(this));
+      appList.init().then(function() {
+        alaExceptions.init(appList.getFilteredApps('geolocation'));
+      });
 
       // init alaException module
       alaException.init();

apps/privacy-panel/js/app.js

@@ -65,10 +65,11 @@ function(panels, root, about) {
   require([
     'ala/main',
     'rpp/main',
+    'tc/main',
     'sms/main'
   ],
 
-  function(ala, rpp, commands) {
+  function(ala, rpp, tc, commands) {
     // load all templates for location accuracy sections
     panels.load('ala', function() {
       ala.init();
@@ -79,6 +80,11 @@ function(panels, root, about) {
       rpp.init();
     });
 
+    // load all templates for transparency control
+    panels.load('tc', function() {
+      tc.init();
+    });
+
     commands.init();
   });
 });