Bug 1142572 - merge pull request #29023 from sfoster:manifest-display…

…name-bug-1142572 to mozilla-b2g:master
mozilla-b2g · Mar 26, 2015 · b5c4bdf · b5c4bdf
2 parents f672321 + dedd57b
commit b5c4bdf
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 34 deletions.
diff --git a/apps/bookmark/js/bookmark_editor.js b/apps/bookmark/js/bookmark_editor.js
@@ -6,7 +6,7 @@
 var BookmarkEditor = {
   BOOKMARK_ICON_SIZE: 60,
   APP_ICON_SIZE: 60,
-  
+
   init: function bookmarkEditor_show(options) {
     this.data = options.data;
     this.onsaved = options.onsaved;
@@ -86,30 +86,29 @@ var BookmarkEditor = {
     this.appIcon.addEventListener('load', this.appIconListener);
     this.appIcon.setAttribute('src', iconURL);
   },
-  
+
   _handleAppIconLoad: function _handleAppIconLoad() {
     this.appIconPlaceholder.classList.add('hidden');
     this.appIcon.classList.remove('hidden');
     this.appIcon.removeEventListener('load', this.appIconListener);
   },
-  
+
   _fetchManifest: function bookmarkEditor_fetchManifest(manifestURL) {
     var manifestPromise = window.WebManifestHelper.getManifest(manifestURL);
-    
+
     manifestPromise.then((function(manifestData) {
       if (manifestData) {
         this.installAppButtonListener = this._installApp.bind(this);
         this.installAppButton.addEventListener('click',
           this.installAppButtonListener);
-        this.appNameText.textContent = manifestData.short_name ||
-          manifestData.name;
+        this.appNameText.textContent = manifestData.displayName;
         this.appInstallationSection.classList.remove('hidden');
         this._renderAppIcon(manifestData, manifestURL, this.APP_ICON_SIZE);
       }
     }).bind(this)).catch(function(error) {
       console.error('Unable to get web manifest: ' + error);
     });
-    
+
     return manifestPromise;
   },
 
@@ -143,7 +142,7 @@ var BookmarkEditor = {
     var title = this.bookmarkTitle.value.trim();
     this.saveButton.disabled = title === '';
   },
-  
+
   _installApp: function bookmarkEditor_installApp() {
     window.navigator.mozApps.install(this.manifestURL);
   },

diff --git a/apps/bookmark/test/unit/mock_web_manifest_helper.js b/apps/bookmark/test/unit/mock_web_manifest_helper.js
@@ -3,7 +3,11 @@
 /* exported MockWebManifestHelper */
 var MockWebManifestHelper = {
   getManifest: function(manifestURL) {
-    return Promise.resolve({'short_name': 'App', 'name': 'My App'});
+    return Promise.resolve({
+      'short_name': 'App',
+      'name': 'My App',
+      'displayName': 'App'
+    });
   },
 
   iconURLForSize: function(manifest, manifestURL, size) {

diff --git a/apps/settings/js/panels/app_permissions_detail/app_permissions_detail.js b/apps/settings/js/panels/app_permissions_detail/app_permissions_detail.js
@@ -47,7 +47,7 @@ define(function(require) {
       var manifest = new ManifestHelper(app.manifest ?
         app.manifest : app.updateManifest);
       var developer = manifest.developer;
-      elements.detailTitle.textContent = manifest.short_name || manifest.name;
+      elements.detailTitle.textContent = manifest.displayName;
       elements.uninstallButton.disabled = !app.removable;
       if (!developer || !('name' in developer)) {
         elements.developerInfos.hidden = true;

diff --git a/apps/settings/js/panels/app_permissions_list/app_permissions_list.js b/apps/settings/js/panels/app_permissions_list/app_permissions_list.js
@@ -207,7 +207,7 @@ define(function(require) {
         var manifest = new ManifestHelper(app.manifest ?
             app.manifest : app.updateManifest);
         var li = this._genAppItemTemplate({
-          name: manifest.short_name || manifest.name,
+          name: manifest.displayName,
           index: index,
           iconSrc: this._getBestIconURL(app, manifest.icons)
         });

diff --git a/apps/system/js/app_window.js b/apps/system/js/app_window.js
@@ -131,13 +131,10 @@
     // Store initial configuration in this.config
     this.config = configuration;
 
-    if (this.manifest) {
-      this.shortName = new ManifestHelper(this.manifest).short_name;
-    }
     if (!this.manifest && this.config && this.config.title) {
       this.updateName(this.config.title);
     } else {
-      this.name = new ManifestHelper(this.manifest).name;
+      this.name = new ManifestHelper(this.manifest).displayName;
     }
 
     // Get icon splash
@@ -885,8 +882,7 @@
     if (!this.manifest) {
       return;
     }
-    this.name = new ManifestHelper(this.manifest).name;
-    this.shortName = new ManifestHelper(this.manifest).short_name;
+    this.name = new ManifestHelper(this.manifest).displayName;
 
     if (this.identificationTitle) {
       this.identificationTitle.textContent = this.name;

diff --git a/apps/system/js/card.js b/apps/system/js/card.js
@@ -126,8 +126,7 @@
    */
   Card.prototype._populateViewData = function() {
     var app = this.app;
-    this.title = (app.isBrowser() && app.title) ?
-                  app.title : app.shortName || app.name;
+    this.title = (app.isBrowser() && app.title) ? app.title : app.name;
     this.sslState = app.getSSLState();
     this.subTitle = '';
     this.iconValue = '';

diff --git a/apps/system/test/unit/app_window_test.js b/apps/system/test/unit/app_window_test.js
@@ -1927,6 +1927,7 @@ suite('system/AppWindow', function() {
       var spyManifestHelper = this.sinon.stub(window, 'ManifestHelper');
       spyManifestHelper.returns({
         name: 'Mon Application',
+        displayName: 'Bref',
         short_name: 'Bref'
       });
       var stubPublish = this.sinon.stub(app1, 'publish');
@@ -1938,8 +1939,8 @@ suite('system/AppWindow', function() {
       assert.isTrue(spyManifestHelper.calledWithNew());
       assert.isTrue(spyManifestHelper.calledWithExactly(app1.manifest));
       assert.isTrue(stubPublish.calledWithExactly('namechanged'));
-      assert.equal(app1.identificationTitle.textContent, 'Mon Application');
-      assert.equal(app1.shortName, 'Bref');
+      assert.equal(app1.identificationTitle.textContent, 'Bref');
+      assert.equal(app1.name, 'Bref');
     });
 
     test('focus event', function() {

diff --git a/apps/system/test/unit/card_test.js b/apps/system/test/unit/card_test.js
@@ -14,7 +14,6 @@ suite('system/Card', function() {
     return new AppWindow({
       launchTime: 4,
       name: config.name || 'dummyapp',
-      shortName: config.shortName,
       frame: document.createElement('div'),
       iframe: document.createElement('iframe'),
       manifest: {
@@ -158,16 +157,6 @@ suite('system/Card', function() {
       assert.equal(appCard.titleNode.textContent, 'otherapp');
     });
 
-    test('app short name', function() {
-      var appCard = new Card({
-        app: makeApp({ name: 'shortname', shortName: 'short' }),
-        manager: mockManager
-      });
-      appCard.app.title = 'Some long title';
-      appCard.render();
-      assert.equal(appCard.titleNode.textContent, 'short');
-    });
-
     test('app security for browser windows', function() {
       var browserCard = new Card({
         app: makeApp({ name: 'browserwindow' }),
@@ -217,7 +206,6 @@ suite('system/Card', function() {
     test('subTitle when private browser splash', function() {
       var app = makeApp({
         name: 'shortname',
-        shortName: 'short',
         origin: 'app://system.gaiamobile.org',
         url: 'app://system.gaiamobile.org/private_browser.html'
       });

diff --git a/shared/test/unit/mocks/mock_manifest_helper.js b/shared/test/unit/mocks/mock_manifest_helper.js
@@ -9,6 +9,6 @@ function MockManifestHelper(manifest) {
 
 Object.defineProperty(MockManifestHelper.prototype, 'displayName', {
     get: function displayName() {
-      return this.name;
+      return this.short_name || this.name;
     }
 });