[extensions-web/multiversion: 1/7] js: Split out the non-jQuery parts of extensions.js into extensionUtils.js
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [extensions-web/multiversion: 1/7] js: Split out the non-jQuery parts of extensions.js into extensionUtils.js
- Date: Fri, 25 Nov 2011 01:28:16 +0000 (UTC)
commit 0d604461a5f2487dd3a88fab15cfa4ec0d84fee0
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Nov 24 19:12:53 2011 -0500
js: Split out the non-jQuery parts of extensions.js into extensionUtils.js
This will help with testing in the future
sweettooth/static/js/extensionUtils.js | 43 ++++++++++++++++++++++++++++++++
sweettooth/static/js/extensions.js | 38 ++--------------------------
2 files changed, 46 insertions(+), 35 deletions(-)
---
diff --git a/sweettooth/static/js/extensionUtils.js b/sweettooth/static/js/extensionUtils.js
new file mode 100644
index 0000000..9b25403
--- /dev/null
+++ b/sweettooth/static/js/extensionUtils.js
@@ -0,0 +1,43 @@
+"use strict";
+
+define([], function() {
+
+ var module = {};
+
+ // ExtensionState and versionCheck are stolen and should
+ // be kept in sync those from the Shell.
+ // Licensed under GPL2+
+ // See: http://git.gnome.org/browse/gnome-shell/tree/js/ui/extensionSystem.js
+
+ module.ExtensionState = {
+ ENABLED: 1,
+ DISABLED: 2,
+ ERROR: 3,
+ OUT_OF_DATE: 4,
+ DOWNLOADING: 5,
+ INITIALIZED: 6,
+
+ // Not a real state, used when there's no extension
+ // with the associated UUID in the extension map.
+ UNINSTALLED: 99
+ };
+
+ module.versionCheck = function(required, current) {
+ var currentArray = current.split('.');
+ var major = currentArray[0];
+ var minor = currentArray[1];
+ var point = currentArray[2];
+ for (var i = 0; i < required.length; i++) {
+ var requiredArray = required[i].split('.');
+ if (requiredArray[0] == major &&
+ requiredArray[1] == minor &&
+ (requiredArray[2] == point ||
+ (requiredArray[2] == undefined && parseInt(minor) % 2 == 0)))
+ return true;
+ }
+ return false;
+ };
+
+ return module;
+
+});
diff --git a/sweettooth/static/js/extensions.js b/sweettooth/static/js/extensions.js
index ae14d4e..4584a25 100644
--- a/sweettooth/static/js/extensions.js
+++ b/sweettooth/static/js/extensions.js
@@ -1,42 +1,10 @@
"use strict";
-define(['jquery', 'messages', 'dbus!_',
+define(['jquery', 'messages', 'dbus!_', 'extensionUtils',
'switch', 'jquery.tipsy'],
-function($, messages, dbusProxy) {
-
- // ExtensionState and versionCheck are stolen and should
- // be kept in sync those from the Shell.
- // Licensed under GPL2+
- // See: http://git.gnome.org/browse/gnome-shell/tree/js/ui/extensionSystem.js
-
- var ExtensionState = {
- ENABLED: 1,
- DISABLED: 2,
- ERROR: 3,
- OUT_OF_DATE: 4,
- DOWNLOADING: 5,
- INITIALIZED: 6,
-
- // Not a real state, used when there's no extension
- // with the associated UUID in the extension map.
- UNINSTALLED: 99
- };
+function($, messages, dbusProxy, extensionUtils) {
- function versionCheck(required, current) {
- var currentArray = current.split('.');
- var major = currentArray[0];
- var minor = currentArray[1];
- var point = currentArray[2];
- for (var i = 0; i < required.length; i++) {
- var requiredArray = required[i].split('.');
- if (requiredArray[0] == major &&
- requiredArray[1] == minor &&
- (requiredArray[2] == point ||
- (requiredArray[2] == undefined && parseInt(minor) % 2 == 0)))
- return true;
- }
- return false;
- }
+ var ExtensionState = extensionUtils.ExtensionState;
// While technically we shouldn't have mismatched API versions,
// the plugin doesn't check whether the Shell matches, so if someone
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]