GNOME.org
 

[sushi] Use Lang.Class() and cleanup imports

commit f4a292e12374265cd1847490d16bb47acc6015d9
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Jun 26 18:27:18 2015 -0700

    Use Lang.Class() and cleanup imports

 src/js/ui/application.js      |    8 +++-----
 src/js/ui/fallbackRenderer.js |    8 +++-----
 src/js/ui/main.js             |    2 --
 src/js/ui/mainWindow.js       |   28 ++++++++++------------------
 src/js/ui/spinnerBox.js       |    8 +++-----
 src/js/viewers/audio.js       |    8 +++-----
 src/js/viewers/evince.js      |    8 +++-----
 src/js/viewers/font.js        |    8 +++-----
 src/js/viewers/gst.js         |    8 +++-----
 src/js/viewers/html.js        |   11 +++++------
 src/js/viewers/image.js       |    8 +++-----
 src/js/viewers/text.js        |   11 ++++-------
 12 files changed, 43 insertions(+), 73 deletions(-)
---
diff --git a/src/js/ui/application.js b/src/js/ui/application.js
index 037c798..42bcc3c 100644
--- a/src/js/ui/application.js
+++ b/src/js/ui/application.js
@@ -23,13 +23,11 @@
  *
  */
 
-const Lang = imports.lang;
-
-// gi imports
-const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
 
 const MainWindow = imports.ui.mainWindow;
 
diff --git a/src/js/ui/fallbackRenderer.js b/src/js/ui/fallbackRenderer.js
index 57af8ac..d44fdab 100644
--- a/src/js/ui/fallbackRenderer.js
+++ b/src/js/ui/fallbackRenderer.js
@@ -35,11 +35,9 @@ const Lang = imports.lang;
 const Constants = imports.util.constants;
 const Utils = imports.ui.utils;
 
-function FallbackRenderer(args) {
-    this._init(args);
-}
+const FallbackRenderer = new Lang.Class({
+    Name: 'FallbackRenderer',
 
-FallbackRenderer.prototype = {
     _init : function() {
         this._fileLoader = null;
         this._fileLoaderId = 0;
@@ -165,4 +163,4 @@ FallbackRenderer.prototype = {
     getSizeForAllocation : function(allocation) {
         return Utils.getStaticSize(this, this._box);
     }
-}
+});
diff --git a/src/js/ui/main.js b/src/js/ui/main.js
index aa011a2..90f7288 100644
--- a/src/js/ui/main.js
+++ b/src/js/ui/main.js
@@ -24,9 +24,7 @@
  */
 
 const Gettext = imports.gettext;
-
 const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
 
 const Application = imports.ui.application;
 const Path = imports.util.path;
diff --git a/src/js/ui/mainWindow.js b/src/js/ui/mainWindow.js
index 2434450..a251340 100644
--- a/src/js/ui/mainWindow.js
+++ b/src/js/ui/mainWindow.js
@@ -23,35 +23,27 @@
  *
  */
 
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
+const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
 const GdkX11 = imports.gi.GdkX11;
-const GdkPixbuf = imports.gi.GdkPixbuf;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const GtkClutter = imports.gi.GtkClutter;
-const Clutter = imports.gi.Clutter;
-const Pango = imports.gi.Pango;
-
-const Cairo = imports.cairo;
-const Tweener = imports.ui.tweener;
 const Lang = imports.lang;
-
 const Mainloop = imports.mainloop;
+const Pango = imports.gi.Pango;
+const Sushi = imports.gi.Sushi;
 
-const MimeHandler = imports.ui.mimeHandler;
 const Constants = imports.util.constants;
+const MimeHandler = imports.ui.mimeHandler;
 const SpinnerBox = imports.ui.spinnerBox;
+const Tweener = imports.ui.tweener;
 const Utils = imports.ui.utils;
 
-const Sushi = imports.gi.Sushi;
-
-function MainWindow(args) {
-    this._init(args);
-}
+const MainWindow = new Lang.Class({
+    Name: 'MainWindow',
 
-MainWindow.prototype = {
     _init : function(args) {
         args = args || {};
 
@@ -668,4 +660,4 @@ MainWindow.prototype = {
     close : function() {
         this._clearAndQuit();
     }
-}
+});
diff --git a/src/js/ui/spinnerBox.js b/src/js/ui/spinnerBox.js
index a65fa46..d234d6d 100644
--- a/src/js/ui/spinnerBox.js
+++ b/src/js/ui/spinnerBox.js
@@ -35,11 +35,9 @@ const Mainloop = imports.mainloop;
 let SPINNER_SIZE = 48;
 let TIMEOUT = 500;
 
-function SpinnerBox(args) {
-    this._init(args);
-}
+const SpinnerBox = new Lang.Class({
+    Name: 'SpinnerBox',
 
-SpinnerBox.prototype = {
     _init : function(args) {
         this._timeoutId = 0;
 
@@ -109,4 +107,4 @@ SpinnerBox.prototype = {
                            transition: 'easeOutQuad'
                          });
     },
-}
+});
diff --git a/src/js/viewers/audio.js b/src/js/viewers/audio.js
index 6283f22..cf336a4 100644
--- a/src/js/viewers/audio.js
+++ b/src/js/viewers/audio.js
@@ -38,11 +38,9 @@ const MimeHandler = imports.ui.mimeHandler;
 const TotemMimeTypes = imports.util.totemMimeTypes;
 const Utils = imports.ui.utils;
 
-function AudioRenderer(args) {
-    this._init(args);
-}
+const AudioRenderer = new Lang.Class({
+    Name: 'AudioRenderer',
 
-AudioRenderer.prototype = {
     _init : function() {
         this.moveOnClick = true;
         this.canFullScreen = false;
@@ -307,7 +305,7 @@ AudioRenderer.prototype = {
 
         return this._toolbarActor;
     },
-}
+});
 
 let handler = new MimeHandler.MimeHandler();
 let renderer = new AudioRenderer();
diff --git a/src/js/viewers/evince.js b/src/js/viewers/evince.js
index 33443bf..4c2be88 100644
--- a/src/js/viewers/evince.js
+++ b/src/js/viewers/evince.js
@@ -37,11 +37,9 @@ const Constants = imports.util.constants;
 const MimeHandler = imports.ui.mimeHandler;
 const Utils = imports.ui.utils;
 
-function EvinceRenderer(args) {
-    this._init(args);
-}
+const EvinceRenderer = new Lang.Class({
+    Name: 'EvinceRenderer',
 
-EvinceRenderer.prototype = {
     _init : function(args) {
         EvDoc.init();
 
@@ -173,7 +171,7 @@ EvinceRenderer.prototype = {
         this._document = null;
         this._pdfLoader = null;
     }
-}
+});
 
 let handler = new MimeHandler.MimeHandler();
 let renderer = new EvinceRenderer();
diff --git a/src/js/viewers/font.js b/src/js/viewers/font.js
index 64a11cd..0f3426e 100644
--- a/src/js/viewers/font.js
+++ b/src/js/viewers/font.js
@@ -33,11 +33,9 @@ const Gtk = imports.gi.Gtk;
 const GLib = imports.gi.GLib;
 const Sushi = imports.gi.Sushi;
 
-function FontRenderer(args) {
-    this._init(args);
-}
+const FontRenderer = new Lang.Class({
+    Name: 'FontRenderer',
 
-FontRenderer.prototype = {
     _init : function(args) {
         this.moveOnClick = true;
         this.canFullScreen = true;
@@ -77,7 +75,7 @@ FontRenderer.prototype = {
 
         return size;
     }
-}
+});
 
 let handler = new MimeHandler.MimeHandler();
 let renderer = new FontRenderer();
diff --git a/src/js/viewers/gst.js b/src/js/viewers/gst.js
index 8d94df4..3560277 100644
--- a/src/js/viewers/gst.js
+++ b/src/js/viewers/gst.js
@@ -38,11 +38,9 @@ const MimeHandler = imports.ui.mimeHandler;
 const TotemMimeTypes = imports.util.totemMimeTypes;
 const Utils = imports.ui.utils;
 
-function GstRenderer(args) {
-    this._init(args);
-}
+const GstRenderer = new Lang.Class({
+    Name: 'GstRenderer',
 
-GstRenderer.prototype = {
     _init : function(args) {
         this.moveOnClick = true;
         this.canFullScreen = true;
@@ -208,7 +206,7 @@ GstRenderer.prototype = {
 
         this._mainWindow.refreshSize();
     },
-}
+});
 
 let handler = new MimeHandler.MimeHandler();
 let renderer = new GstRenderer();
diff --git a/src/js/viewers/html.js b/src/js/viewers/html.js
index ae6bb6c..5135e2b 100644
--- a/src/js/viewers/html.js
+++ b/src/js/viewers/html.js
@@ -26,17 +26,16 @@
 const GtkClutter = imports.gi.GtkClutter;
 const Gtk = imports.gi.Gtk;
 const GLib = imports.gi.GLib;
-const WebKit = imports.gi.WebKit2;
+const Lang = imports.lang;
 const Sushi = imports.gi.Sushi;
+const WebKit = imports.gi.WebKit2;
 
 const MimeHandler = imports.ui.mimeHandler;
 const Utils = imports.ui.utils;
 
-function HTMLRenderer(args) {
-    this._init(args);
-}
+const HTMLRenderer = new Lang.Class({
+    Name: 'HTMLRenderer',
 
-HTMLRenderer.prototype = {
     _init : function(args) {
         this.moveOnClick = false;
         this.canFullScreen = true;
@@ -90,7 +89,7 @@ HTMLRenderer.prototype = {
 
         return this._toolbarActor;
     }
-};
+});
 
 let handler = new MimeHandler.MimeHandler();
 let renderer = new HTMLRenderer();
diff --git a/src/js/viewers/image.js b/src/js/viewers/image.js
index 29da911..383f0c2 100644
--- a/src/js/viewers/image.js
+++ b/src/js/viewers/image.js
@@ -35,11 +35,9 @@ const Lang = imports.lang;
 const MimeHandler = imports.ui.mimeHandler;
 const Utils = imports.ui.utils;
 
-function ImageRenderer(args) {
-    this._init(args);
-}
+const ImageRenderer = new Lang.Class({
+    Name: 'ImageRenderer',
 
-ImageRenderer.prototype = {
     _init : function(args) {
         this.moveOnClick = true;
         this.canFullScreen = true;
@@ -112,7 +110,7 @@ ImageRenderer.prototype = {
 
         return this._toolbarActor;
     },
-}
+});
 
 let handler = new MimeHandler.MimeHandler();
 let renderer = new ImageRenderer();
diff --git a/src/js/viewers/text.js b/src/js/viewers/text.js
index 2b89065..291d51b 100644
--- a/src/js/viewers/text.js
+++ b/src/js/viewers/text.js
@@ -28,18 +28,15 @@ const Gtk = imports.gi.Gtk;
 const GLib = imports.gi.GLib;
 const GtkSource = imports.gi.GtkSource;
 const Gio = imports.gi.Gio;
+const Lang = imports.lang;
 const Sushi = imports.gi.Sushi;
 
 const MimeHandler = imports.ui.mimeHandler;
 const Utils = imports.ui.utils;
 
-const Lang = imports.lang;
-
-function TextRenderer(args) {
-    this._init(args);
-}
+const TextRenderer = new Lang.Class({
+    Name: 'TextRenderer',
 
-TextRenderer.prototype = {
     _init : function(args) {
         this.moveOnClick = false;
         this.canFullScreen = true;
@@ -122,7 +119,7 @@ TextRenderer.prototype = {
 
         return this._toolbarActor;
     }
-}
+});
 
 let handler = new MimeHandler.MimeHandler();
 let renderer = new TextRenderer();
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]