[chrome-gnome-shell] Fixed wrong initialization order.
- From: Yuri Konotopov <ykonotopov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chrome-gnome-shell] Fixed wrong initialization order.
- Date: Sat, 16 Jul 2016 16:16:42 +0000 (UTC)
commit 7386962901278cf959af2c9169f023857c704a11
Author: Yuri Konotopov <ykonotopov gmail com>
Date: Sat Jul 16 18:41:03 2016 +0300
Fixed wrong initialization order.
extension/include/sweettooth-api.js | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/extension/include/sweettooth-api.js b/extension/include/sweettooth-api.js
index 5627046..263666e 100644
--- a/extension/include/sweettooth-api.js
+++ b/extension/include/sweettooth-api.js
@@ -29,8 +29,6 @@ define('gs-chrome', ['jquery'], function($) {
window.SweetTooth = function() {
var apiObject = {
- ready: $.Deferred(),
-
apiVersion: 5,
shellVersion: '-1',
versionValidationEnabled: true,
@@ -65,11 +63,26 @@ define('gs-chrome', ['jquery'], function($) {
uninstallExtension: function(uuid) {
return sendResolveExtensionMessage("uninstallExtension", "success", {uuid:
uuid});
+ },
+
+ initialize: function(done, fail, always) {
+ var ready = $.Deferred();
+ if(done)
+ {
+ ready.done(done);
+ }
+ if(fail)
+ {
+ ready.fail(fail);
+ }
+ if(always)
+ {
+ ready.always(always);
+ }
+ sendResolveExtensionMessage("initialize", "properties", null, ready);
}
};
- sendResolveExtensionMessage("initialize", "properties", null, apiObject.ready);
-
window.addEventListener("message", function(event) {
// We only accept messages from ourselves
if (event.source != window)
@@ -242,8 +255,8 @@ define('versions/common/common', ['jquery', 'dbus!API'], function($, API) {
});
gs_chrome_initialized = true;
-require(['messages', 'gs-chrome'], function(messages){
- SweetTooth.ready.done(function(response) {
+require(['jquery', 'messages', 'gs-chrome'], function($, messages){
+ SweetTooth.initialize(function(response) {
SweetTooth.shellVersion = response.shellVersion;
SweetTooth.versionValidationEnabled = response.versionValidationEnabled;
@@ -256,9 +269,9 @@ require(['messages', 'gs-chrome'], function(messages){
messages.addWarning(GSC.getMessage('warning_versions_mismatch',
GSC.getMessage('version', GS_CHROME_VERSION), response.connectorVersion));
}
- }).fail(function(message) {
+ }, function(message) {
messages.addWarning(message ? message : GSC.getMessage('no_host_connector'));
- }).always(function() {
+ }, function() {
// Start extensions.gnome.org main script
require(['main'], function(){});
});
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]