[extensions-web] common.js: removed duplicate code
- From: Yuri Konotopov <ykonotopov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [extensions-web] common.js: removed duplicate code
- Date: Sun, 12 Feb 2017 08:55:38 +0000 (UTC)
commit 4a6725b77cc13e587de4329f2d3bae6c7a2a3a02
Author: Yuri Konotopov <ykonotopov gnome org>
Date: Sun Feb 12 12:39:30 2017 +0400
common.js: removed duplicate code
sweettooth/static/js/versions/common/common.js | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/sweettooth/static/js/versions/common/common.js b/sweettooth/static/js/versions/common/common.js
index 492999e..06f5c98 100644
--- a/sweettooth/static/js/versions/common/common.js
+++ b/sweettooth/static/js/versions/common/common.js
@@ -16,14 +16,14 @@ define(['jquery', 'dbus!API'], function ($, API) {
return (new $.Deferred()).resolve(result);
}
- function _makePromise(result) {
+ function _makePromise(result, resolveValue) {
// Check if result is promise already
if (isPromise(result))
{
return result;
}
- return _makeRawPromise(JSON.parse(result));
+ return _makeRawPromise(typeof(resolveValue) == 'undefined' ? JSON.parse(result) :
resolveValue);
}
function isPromise(value) {
@@ -61,25 +61,11 @@ define(['jquery', 'dbus!API'], function ($, API) {
},
InstallExtensionOne: function (uuid) {
- var result = API.installExtension(uuid);
-
- if (isPromise(result))
- {
- return result;
- }
-
- return _makeRawPromise('succeeded');
+ return _makePromise(API.installExtension(uuid), 'succeeded');
},
InstallExtensionTwo: function (uuid) {
- var result = API.installExtension(uuid, "");
-
- if (isPromise(result))
- {
- return result;
- }
-
- return _makeRawPromise('succeeded');
+ return _makePromise(API.installExtension(uuid, ""), 'succeeded');
},
InstallExtensionAsync: function (uuid) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]