[extensions-web] js: Don't parse the shell version map ourselves for extension installation

[Jasper St. Pierre <jstpierre src gnome org>]

commit ff13d8106d48ce024a3f1a6cf4f3380b342f6ec0
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Mar 29 10:03:52 2012 -0400

    js: Don't parse the shell version map ourselves for extension installation

 sweettooth/static/js/extensions.js             |   19 +---------------
 sweettooth/static/js/versions/1/main.js        |    2 +-
 sweettooth/static/js/versions/2/main.js        |    2 +-
 sweettooth/static/js/versions/3/main.js        |    2 +-
 sweettooth/static/js/versions/4/main.js        |   26 ++++++++++++++++++++++++
 sweettooth/static/js/versions/common/common.js |    8 +++++-
 6 files changed, 37 insertions(+), 22 deletions(-)
---
diff --git a/sweettooth/static/js/extensions.js b/sweettooth/static/js/extensions.js
index 7b1c720..4d4eeec 100644
--- a/sweettooth/static/js/extensions.js
+++ b/sweettooth/static/js/extensions.js
@@ -95,23 +95,8 @@ function($, messages, dbusProxy, extensionUtils) {
     function addExtensionSwitch(uuid, extension, $elem) {
         var $switch = $elem.find('.switch');
         var _state = ExtensionState.UNINSTALLED;
-        var svm = $elem.data('svm');
-
-        var vpk = extensionUtils.grabProperExtensionVersion(svm, dbusProxy.ShellVersion);
-
-        if (vpk === null) {
-            if (svm) {
-                _state = ExtensionState.OUT_OF_DATE;
-            } else {
-                // Allow the local extensions code to work without an svm.
-                _state = extension.state;
-            }
-        } else if (extension && !$.isEmptyObject(extension)) {
-            _state = extension.state;
-        }
 
         $elem.data({'elem': $elem,
-                    'pk': (vpk === null ? 0 : vpk.pk),
                     'state': _state,
                     'uninstalled': false,
                     'undo-uninstall-message': null});
@@ -134,7 +119,7 @@ function($, messages, dbusProxy, extensionUtils) {
                 if (oldState == ExtensionState.UNINSTALLED) {
                     // If the extension is uninstalled and we
                     // flick the switch on, install.
-                    dbusProxy.InstallExtension(uuid, $elem.data('pk').toString());
+                    dbusProxy.InstallExtension(uuid);
                     sendPopularity('enable');
                 } else if (oldState == ExtensionState.DISABLED ||
                            oldState == ExtensionState.INITIALIZED) {
@@ -204,7 +189,7 @@ function($, messages, dbusProxy, extensionUtils) {
                         var uuid = extension.uuid;
 
                         function reinstall() {
-                            dbusProxy.InstallExtension(uuid, $elem.data('pk').toString());
+                            dbusProxy.InstallExtension(uuid);
 
                             // If the user clicks "Install" we need to show that we
                             // installed it by reattaching the element, but we can't do
diff --git a/sweettooth/static/js/versions/1/main.js b/sweettooth/static/js/versions/1/main.js
index 5da7a5d..e08161c 100644
--- a/sweettooth/static/js/versions/1/main.js
+++ b/sweettooth/static/js/versions/1/main.js
@@ -9,7 +9,7 @@ define(['jquery', 'dbus!API', 'versions/common/common'], function($, API, common
         GetErrors: common.GetErrors,
         EnableExtension: common.EnableExtension,
         DisableExtension: common.DisableExtension,
-        InstallExtension: common.InstallExtension,
+        InstallExtension: common.InstallExtensionTwo,
         UninstallExtension: common.UninstallExtension,
         LaunchExtensionPrefs: common.LaunchExtensionPrefsDummy,
 
diff --git a/sweettooth/static/js/versions/2/main.js b/sweettooth/static/js/versions/2/main.js
index 7518cfa..aaccc90 100644
--- a/sweettooth/static/js/versions/2/main.js
+++ b/sweettooth/static/js/versions/2/main.js
@@ -9,7 +9,7 @@ define(['jquery', 'dbus!API', 'versions/common/common'], function($, API, common
         GetErrors: common.GetErrors,
         EnableExtension: common.EnableExtension,
         DisableExtension: common.DisableExtension,
-        InstallExtension: common.InstallExtension,
+        InstallExtension: common.InstallExtensionTwo,
         UninstallExtension: common.UninstallExtension,
         LaunchExtensionPrefs: common.LaunchExtensionPrefsDummy,
 
diff --git a/sweettooth/static/js/versions/3/main.js b/sweettooth/static/js/versions/3/main.js
index 7b99a26..4a1ee0c 100644
--- a/sweettooth/static/js/versions/3/main.js
+++ b/sweettooth/static/js/versions/3/main.js
@@ -9,7 +9,7 @@ define(['jquery', 'dbus!API', 'versions/common/common'], function($, API, common
         GetErrors: common.GetErrors,
         EnableExtension: common.EnableExtension,
         DisableExtension: common.DisableExtension,
-        InstallExtension: common.InstallExtension,
+        InstallExtension: common.InstallExtensionTwo,
         UninstallExtension: common.UninstallExtension,
         LaunchExtensionPrefs: common.LaunchExtensionPrefs,
 
diff --git a/sweettooth/static/js/versions/4/main.js b/sweettooth/static/js/versions/4/main.js
new file mode 100644
index 0000000..1975db4
--- /dev/null
+++ b/sweettooth/static/js/versions/4/main.js
@@ -0,0 +1,26 @@
+"use strict";
+
+define(['jquery', 'dbus!API', 'versions/common/common'], function($, API, common) {
+    var proxy = {
+        IsDummy: false,
+
+        ListExtensions: common.ListExtensions,
+        GetExtensionInfo: common.GetExtensionInfo,
+        GetErrors: common.GetErrors,
+        EnableExtension: common.EnableExtension,
+        DisableExtension: common.DisableExtension,
+        InstallExtension: common.InstallExtensionOne,
+        UninstallExtension: common.UninstallExtension,
+        LaunchExtensionPrefs: common.LaunchExtensionPrefs,
+
+        ShellVersion: API.shellVersion,
+
+        extensionStateChangedHandler: null,
+        shellRestartHandler: null
+    };
+
+    API.onchange = common.API_onchange(proxy);
+    API.onshellrestart = common.API_onshellrestart(proxy);
+
+    return proxy;
+});
diff --git a/sweettooth/static/js/versions/common/common.js b/sweettooth/static/js/versions/common/common.js
index 7e99dc0..3a3c6aa 100644
--- a/sweettooth/static/js/versions/common/common.js
+++ b/sweettooth/static/js/versions/common/common.js
@@ -36,8 +36,12 @@ define(['jquery', 'dbus!API'], function($, API) {
             API.setExtensionEnabled(uuid, false);
         },
 
-        InstallExtension: function(uuid, server_uuid) {
-            API.installExtension(uuid, server_uuid);
+        InstallExtensionOne: function(uuid) {
+            API.installExtension(uuid);
+        },
+
+        InstallExtensionTwo: function(uuid) {
+            API.installExtension(uuid, -1);
         },
 
         UninstallExtension: function(uuid) {