[sushi/wip/cosimoc/no-clutter: 47/66] mainWindow: simplify setting renderer



commit 88ecf6e2d93be655ccee1f01ee79e880fda24c21
Author: Cosimo Cecchi <cosimo endlessm com>
Date:   Sun Jun 2 16:37:02 2019 -0700

    mainWindow: simplify setting renderer
    
    Remove this._pendingRenderer, we don't need to keep track of this
    additional state.

 src/js/ui/mainWindow.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/src/js/ui/mainWindow.js b/src/js/ui/mainWindow.js
index a0de409..d4cbf4f 100644
--- a/src/js/ui/mainWindow.js
+++ b/src/js/ui/mainWindow.js
@@ -61,7 +61,6 @@ var MainWindow = new Lang.Class({
 
     _init : function(application) {
         this._isFullScreen = false;
-        this._pendingRenderer = null;
         this._renderer = null;
         this._view = null;
         this._toolbar = null;
@@ -183,18 +182,15 @@ var MainWindow = new Lang.Class({
                             this.setTitle(this._fileInfo.get_display_name());
 
                             /* now prepare the real renderer */
-                            this._pendingRenderer = 
this._mimeHandler.getObject(this._fileInfo.get_content_type());
-                            this._pendingRenderer.prepare(file, this, Lang.bind(this, 
this._onRendererPrepared));
+                            this._renderer = this._mimeHandler.getObject(this._fileInfo.get_content_type());
+                            this._renderer.prepare(file, this, Lang.bind(this, this._onRendererPrepared));
                         } catch(e) {
                             /* FIXME: report the error */
                             logError(e, 'Error calling prepare() on viewer');
                         }}));
     },
 
-    _onRendererPrepared : function() {
-        this._renderer = this._pendingRenderer;
-        this._pendingRenderer = null;
-
+    _onRendererPrepared : function(renderer) {
         /* generate the texture and toolbar for the new renderer */
         this._createView();
         this._createToolbar();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]