Work on bugs

andrewbrg · andrewbrg · commit 2f27cf0b4e59 · 2018-07-22T12:52:12.000+02:00
diff --git a/src/js/app.js b/src/js/app.js
@@ -2,7 +2,7 @@
 
     var runtime = function (appWindow, launchData, isRestart) {
         appWindow.contentWindow.launchData = launchData;
-        appWindow.contentWindow.__MGA__bRestart = isRestart;
+        appWindow.contentWindow.__MGA__bRestart = isRestart
     };
 
     chrome.app.runtime.onLaunched.addListener(function (launchData) {
@@ -17,7 +17,6 @@
             },
             function (appWindow) {
                 runtime(appWindow, launchData, false);
-
             }
         );
     });
diff --git a/src/js/events.js b/src/js/events.js
@@ -4,19 +4,24 @@ $(document).ready(function () {
     /// Globals and initializations
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    var Editors       = new EditorsHandler();
-    var Modals        = new ModalsHandler();
-    var IdeSettings   = new IdeSettingsHandler();
-    var Sidebar       = new SidebarHandler();
+    var Editors = new EditorsHandler();
+    var Modals = new ModalsHandler();
+    var IdeSettings = new IdeSettingsHandler();
+    var Sidebar = new SidebarHandler();
     var Notifications = new NotificationsHandler();
-    var Files         = new FilesHandler();
+    var Files = new FilesHandler();
 
     Notifications.init();
     Files.init(Notifications);
     Editors.init(IdeSettings, Notifications, Files);
     Sidebar.init(Notifications, Editors, Files);
     IdeSettings.init(Editors).then(Editors.startup());
 
+    chrome.app.runtime.onLaunched.addListener(function (launchData) {
+        Editors.handleLaunchData(launchData.items);
+        console.log('asdasd');
+    });
+
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
@@ -32,7 +37,7 @@ $(document).ready(function () {
     // Maintain correct record of the current and previous idx
     $(document).on('shown.bs.tab', '*[data-toggle="tab"]', function (e) {
         Editors.previousIdx = parseInt($(e.relatedTarget).attr('data-idx'));
-        Editors.currentIdx  = parseInt($(e.target).attr('data-idx'));
+        Editors.currentIdx = parseInt($(e.target).attr('data-idx'));
     });
 
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -45,7 +50,7 @@ $(document).ready(function () {
     // Push the template into the modal before showing it
     $(document).on('show.bs.modal', '.modal', function (e) {
 
-        var $relTgt  = $(e.relatedTarget);
+        var $relTgt = $(e.relatedTarget);
         var callback = function () {
         };
 
@@ -117,7 +122,7 @@ $(document).ready(function () {
     $(document).on('click', '.action-save', function () {
 
         var attr = $(this).attr('data-idx');
-        var idx  = (typeof attr !== typeof undefined && attr !== false) ? attr : Editors.currentIdx;
+        var idx = (typeof attr !== typeof undefined && attr !== false) ? attr : Editors.currentIdx;
 
         Editors.onSaveFile(idx);
     });
diff --git a/src/js/handlers/editors.js b/src/js/handlers/editors.js
@@ -591,39 +591,46 @@ var EditorsHandler = function () {
 
         // Launch default tab
         this._loadDefaults().then(function () {
+            that.handleLaunchData(window.launchData.items);
+        });
+    };
 
-            var openFiles = function () {
-
-                var deferred = $.Deferred();
-                var promises = [];
-                var launchDataItems = window.launchData.items || [];
+    this.handleLaunchData = function (launchDataItems) {
 
-                launchDataItems.forEach(function (item) {
-                    item.entry.type = typeof(item.type !== typeof undefined) ? item.type : item.entry.type;
-                    that.Files.fileOpen(item.entry).then(function (e, fileEntry) {
-                        promises.push(that.openFileEntryInAceEditor(
-                            (typeof e.target.result === typeof undefined) ? undefined : e.target.result,
-                            fileEntry
-                        ));
-                    });
+        var that = this;
+        var openFiles = function () {
+
+            var deferred = $.Deferred();
+            var promises = [];
+            launchDataItems = typeof launchDataItems === typeof undefined
+                ? launchDataItems
+                : [];
+
+            launchDataItems.forEach(function (item) {
+                item.entry.type = (typeof item.type !== typeof undefined) ? item.type : item.entry.type;
+                that.Files.fileOpen(item.entry).then(function (e, fileEntry) {
+                    promises.push(that.openFileEntryInAceEditor(
+                        (typeof e.target.result === typeof undefined) ? undefined : e.target.result,
+                        fileEntry
+                    ));
                 });
+            });
 
-                $.when.apply($, promises).done(function () {
-                    deferred.resolve();
-                });
+            $.when.apply($, promises).done(function () {
+                deferred.resolve();
+            });
 
-                return deferred.promise();
-            };
+            return deferred.promise();
+        };
 
-            openFiles().then(function () {
-                window.setTimeout(function () {
-                    if (that.getNumTabs() === 0) {
-                        that.onAddNewTab(that.defaultFileExt);
-                    }
-                }, 400)
-            }).fail(function () {
-                that.onAddNewTab(that.defaultFileExt);
-            });
+        openFiles().then(function () {
+            window.setTimeout(function () {
+                if (that.getNumTabs() === 0) {
+                    that.onAddNewTab(that.defaultFileExt);
+                }
+            }, 400)
+        }).fail(function () {
+            that.onAddNewTab(that.defaultFileExt);
         });
     };
 
