Revert "Merge pull request #18565 from cctuan/973454-2"

This reverts commit 1656486, reversing changes made to 0814a85.
mozilla-b2g · Apr 24, 2014 · 972ea2e · 972ea2e
1 parent c8a41ca
commit 972ea2e
Show file tree

Hide file tree

Showing 18 changed files with 446 additions and 1,122 deletions.
diff --git a/apps/settings/build/settings.build.jslike b/apps/settings/build/settings.build.jslike
@@ -4,9 +4,7 @@
   mainConfigFile: '../js/config/require.js',
   dir: '../../../build_stage/settings',
   paths: {
-    'prim': 'empty:',
-    'shared/settings_listener': 'empty:',
-    'shared/manifest_helper': 'empty:',
+    prim: 'empty:'
   },
 
   findNestedDependencies: true,

diff --git a/apps/settings/elements/app_permissions.html b/apps/settings/elements/app_permissions.html
@@ -9,12 +9,11 @@ <h1 data-l10n-id="appPermissions-header">
     </header>
 
     <div>
-      <ul class="app-list"></ul>
+      <ul></ul>
 
       <ul>
         <li>
           <button id="clear-bookmarks-app"
-                  class="clear-bookmarks-app"
                   style="visibility: hidden"
                   data-l10n-id="clearBookmarkAppsData">
             Clear bookmarks data
@@ -36,7 +35,8 @@ <h1 data-l10n-id="confirmClearBookmarkAppsDataTitle">Clear private data from boo
       </menu>
     </form>
 
-    <panel data-path="panels/app_permissions_list/panel"></panel>
+    <script type="application/javascript" src="shared/js/manifest_helper.js"></script>
+    <script src="js/apps.js"></script>
 
   </template>
 </element>
diff --git a/apps/settings/elements/app_permissions_details.html b/apps/settings/elements/app_permissions_details.html
@@ -2,22 +2,22 @@
   <template>
 
     <header>
-      <a class="app-permissions-back"><span class="icon icon-back">back</span></a>
+      <a href="#appPermissions"><span class="icon icon-back">back</span></a>
       <h1> </h1>
     </header>
 
     <div>
-      <header id="developer-header" class="developer-header">
+      <header id="developer-header">
         <h2 data-l10n-id="author">Author</h2>
       </header>
       <ul>
-        <li id="developer-infos" class="developer-infos">
+        <li id="developer-infos">
           <small><a target="_blank" href="http://github.com/mozilla-b2g/gaia/" data-href="http://github.com/mozilla-b2g/gaia/">http://github.com/mozilla-b2g/gaia/</a></small>
           <a target="_blank" data-href="http://github.com/mozilla-b2g/gaia/"> The Gaia Team </a>
         </li>
       </ul>
 
-      <header id="permissionsListHeader" class="permissionsListHeader">
+      <header id="permissionsListHeader">
         <h2 data-l10n-id="permissions">Permissions</h2>
       </header>
       <ul>
@@ -26,10 +26,8 @@ <h2 data-l10n-id="permissions">Permissions</h2>
       <header>
         <h2 data-l10n-id="uninstallApp">Uninstall App</h2>
       </header>
-      <button id="uninstall-app" data-l10n-id="uninstallApp" class="uninstall-app danger">Uninstall App</button>
+      <button id="uninstall-app" data-l10n-id="uninstallApp" class="danger">Uninstall App</button>
     </div>
 
-    <panel data-path="panels/app_permissions_detail/panel"></panel>
-
   </template>
 </element>