From 9be0b58276a949a2b075caa11cfc87ac487c3f96 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 11 May 2017 16:29:35 +0100 Subject: [PATCH 01/12] The model now return errors instead of dealing with it --- remoteappmanager/static/js/home/models.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js index c59bb0f26..e0696714b 100644 --- a/remoteappmanager/static/js/home/models.js +++ b/remoteappmanager/static/js/home/models.js @@ -1,9 +1,8 @@ define([ "jquery", "home/configurables", - "jsapi/v1/resources", - "dialogs" -], function ($, configurables, resources, dialogs) { + "jsapi/v1/resources" +], function ($, configurables, resources) { "use strict"; var Status = { @@ -154,18 +153,18 @@ define([ configurablesData[tag] = configurable.asConfigDict(); }); - resources.Container.create({ + return resources.Container.create({ mapping_id: currentApp.appData.mapping_id, configurables: configurablesData }).done(function() { this.updateIdx(selectedIndex) .fail(function(error) { currentApp.status = Status.STOPPED; - dialogs.webapi_error_dialog(error); + return error; }); }.bind(this)).fail(function(error) { currentApp.status = Status.STOPPED; - dialogs.webapi_error_dialog(error); + return error; }); }; @@ -175,17 +174,17 @@ define([ var url_id = appStopping.appData.container.url_id; - resources.Container.delete(url_id) + return resources.Container.delete(url_id) .done(function() { this.updateIdx(index) .fail(function(error) { appStopping.status = Status.STOPPED; - dialogs.webapi_error_dialog(error); + return error; }); }.bind(this)) .fail(function(error) { appStopping.status = Status.STOPPED; - dialogs.webapi_error_dialog(error); + return error; }); }; From bf22336d76874405016fea565d27f09e5ddb9d9e Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 11 May 2017 17:22:14 +0100 Subject: [PATCH 02/12] Add dialog --- remoteappmanager/static/js/home/controller.js | 3 ++- .../static/js/home/views/application_view.js | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/remoteappmanager/static/js/home/controller.js b/remoteappmanager/static/js/home/controller.js index eef36c39b..d5d9227ec 100644 --- a/remoteappmanager/static/js/home/controller.js +++ b/remoteappmanager/static/js/home/controller.js @@ -5,7 +5,8 @@ require([ "home/views/application_view", "components/vue/dist/vue", "gamodule", - "vue/filters" + "vue/filters", + "admin/vue-components/toolkit/toolkit" ], function( models, applicationListView, diff --git a/remoteappmanager/static/js/home/views/application_view.js b/remoteappmanager/static/js/home/views/application_view.js index 21f85cb28..248d41bc2 100644 --- a/remoteappmanager/static/js/home/views/application_view.js +++ b/remoteappmanager/static/js/home/views/application_view.js @@ -1,7 +1,7 @@ define([ "urlutils", "utils", - '../../components/vue/dist/vue' + "../../components/vue/dist/vue" ], function (urlUtils, utils, Vue) { "use strict"; @@ -11,6 +11,12 @@ define([ '
' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + ' ' + '
' + @@ -78,6 +84,10 @@ define([ ' ' + '
', + data: function() { + return { showErrorDialog: false }; + }, + computed: { currentApp: function() { return this.model.appList[this.model.selectedIndex] || null; @@ -102,7 +112,10 @@ define([ methods: { startApplication: function() { this.$emit('startApplication', this.currentApp); - this.model.startApplication(); + this.model.startApplication().fail(function(error) { + console.log(error); + this.showErrorDialog = true; + }.bind(this)); }, getIframeSize: function() { return utils.maxIframeSize(); From 78704f0a7fd31249a218b97b44ce902c25abccdb Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 12 May 2017 09:51:55 +0100 Subject: [PATCH 03/12] Change confirm dialog so that it doesn't show cancel button if not callback --- .../static/js/admin/vue-components/toolkit/ConfirmDialog.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/remoteappmanager/static/js/admin/vue-components/toolkit/ConfirmDialog.js b/remoteappmanager/static/js/admin/vue-components/toolkit/ConfirmDialog.js index 5145dc177..b7ca6686b 100644 --- a/remoteappmanager/static/js/admin/vue-components/toolkit/ConfirmDialog.js +++ b/remoteappmanager/static/js/admin/vue-components/toolkit/ConfirmDialog.js @@ -1,7 +1,7 @@ define([ ], function() { "use strict"; - + return { props: { title: { @@ -10,7 +10,7 @@ define([ }, closeCallback: { type: Function, - default: function() {} + default: undefined }, okCallback: { type: Function, @@ -24,7 +24,7 @@ define([ '

{{ title }}

' + '
' + '
' + - ' ' + + ' ' + ' ' + '
' + ' ' + From 66a6022118204ef46950e9bf1b0b33139524ab76 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 12 May 2017 12:31:07 +0100 Subject: [PATCH 04/12] Fixed css of the confirm dialog --- .../static/css/remoteappmanager.css | 66 ++----------------- .../vue-components/toolkit/ConfirmDialog.js | 20 +++--- 2 files changed, 17 insertions(+), 69 deletions(-) diff --git a/remoteappmanager/static/css/remoteappmanager.css b/remoteappmanager/static/css/remoteappmanager.css index 344cd3d80..f08aef6d6 100644 --- a/remoteappmanager/static/css/remoteappmanager.css +++ b/remoteappmanager/static/css/remoteappmanager.css @@ -188,68 +188,16 @@ li a .stop-button:hover { padding: 0px; } -.modal-mask { - position: fixed; - z-index: 9998; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: rgba(0, 0, 0, .5); - display: table; - transition: opacity .3s ease; +/* Transition for the modal dialog */ +.modal-fade-enter-active, .modal-fade-leave-active { + transition: opacity .2s } - -.modal-wrapper { - display: table-cell; - vertical-align: middle; -} - -.modal-container { - width: 300px; - margin: 0px auto; - padding: 20px 30px; - background-color: #fff; - border-radius: 2px; - box-shadow: 0 2px 8px rgba(0, 0, 0, .33); - transition: all .3s ease; - font-family: Helvetica, Arial, sans-serif; -} - -.modal-header h3 { - margin-top: 0; - color: #42b983; -} - -.modal-body { - margin: 20px 0; -} - -.modal-default-button { - float: right; -} - -/* - * The following styles are auto-applied to elements with - * transition="modal" when their visibility is toggled - * by Vue.js. - * - * You can easily play with the modal transition by editing - * these styles. - */ - -.modal-enter { - opacity: 0; -} - -.modal-leave-active { - opacity: 0; +.modal-fade-enter, .modal-fade-leave-to { + opacity: 0 } -.modal-enter .modal-container, -.modal-leave-active .modal-container { - -webkit-transform: scale(1.1); - transform: scale(1.1); +.modal-display { + display: block; } .required-field > label::after { diff --git a/remoteappmanager/static/js/admin/vue-components/toolkit/ConfirmDialog.js b/remoteappmanager/static/js/admin/vue-components/toolkit/ConfirmDialog.js index b7ca6686b..066e48a47 100644 --- a/remoteappmanager/static/js/admin/vue-components/toolkit/ConfirmDialog.js +++ b/remoteappmanager/static/js/admin/vue-components/toolkit/ConfirmDialog.js @@ -17,19 +17,19 @@ define([ default: function() {} } }, - template: '' + - '
' + - '
' + - '
' + - '

{{ title }}

' + - '
' + - '
' + - ' ' + - ' ' + + template: '' + + '
' + + '
' + + '
' + + '

{{ title }}

' + + '
' + + '
' + + ' ' + + ' ' + + '
' + '
' + '
' + '
' + - '
' + '' }; }); From a1e7c441cfec7cef4228aaeae49a6c26db8e07e1 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 12 May 2017 12:36:58 +0100 Subject: [PATCH 05/12] Display error dialog when starting fails --- .../static/js/home/views/application_view.js | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/remoteappmanager/static/js/home/views/application_view.js b/remoteappmanager/static/js/home/views/application_view.js index 248d41bc2..8df8c39b7 100644 --- a/remoteappmanager/static/js/home/views/application_view.js +++ b/remoteappmanager/static/js/home/views/application_view.js @@ -12,10 +12,14 @@ define([ ' v-if="currentApp !== null"' + ' :class="{ content: true, \'no-padding\': currentApp.isRunning() }">' + ' ' + - ' ' + - ' ' + - ' ' + - ' ' + + ' ' + + '
' + + ' Code: {{startingError.code}}' + + ' {{startingError.message}}' + + '
' + + ' ' + ' ' + ' ' + @@ -85,7 +89,10 @@ define([ '', data: function() { - return { showErrorDialog: false }; + return { + showErrorDialog: false, + startingError: {} + }; }, computed: { @@ -111,12 +118,17 @@ define([ methods: { startApplication: function() { + var startingAppName = this.$options.filters.appName(this.currentApp.appData.image); this.$emit('startApplication', this.currentApp); this.model.startApplication().fail(function(error) { - console.log(error); + this.startingError = error; + this.startingError.appName = startingAppName; this.showErrorDialog = true; }.bind(this)); }, + getErrorTitle: function() { + return 'Error when starting ' + this.startingError.appName; + }, getIframeSize: function() { return utils.maxIframeSize(); }, From d0e3282add47f61307bd80f3f9ed8375729f46af Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 12 May 2017 12:38:07 +0100 Subject: [PATCH 06/12] Remove old dialogs --- remoteappmanager/static/js/dialogs.js | 48 --------------------------- 1 file changed, 48 deletions(-) delete mode 100644 remoteappmanager/static/js/dialogs.js diff --git a/remoteappmanager/static/js/dialogs.js b/remoteappmanager/static/js/dialogs.js deleted file mode 100644 index db77ef327..000000000 --- a/remoteappmanager/static/js/dialogs.js +++ /dev/null @@ -1,48 +0,0 @@ -define([ - 'jquery' -], function ($) { - "use strict"; - - var webapi_error_dialog = function (error) { - // Shows the error dialog with a webapi error. - // The webapi error is an object with the following props: - // - status : HTTP error status - // - message: user-readable message from the server via the - // response payload. may be undefined. - - var msg = error.status_text; - if (!msg) { - msg = "Unknown error"; - } - var dialog = $("#error-dialog"); - dialog.find(".error-msg").text(error.status + " - "+msg); - dialog.modal(); - }; - - var config_dialog = function(dialog_element, title, body, ok_callback, close_callback) { - var modal = $(dialog_element); - - // Remove possible already existing handlers - modal.find('.modal-footer .primary').off("click"); - modal.find('.modal-close').off("click"); - - if (title !== null) { - modal.find('.modal-title').text(title); - } - if (body !== null) { - modal.find('.modal-body').text(body); - } - if (ok_callback !== null) { - modal.find('.modal-footer .primary').click(ok_callback); - } - if (close_callback !== null) { - modal.find('.modal-close').click(close_callback); - } - }; - - return { - webapi_error_dialog : webapi_error_dialog, - config_dialog : config_dialog - }; - -}); From 010078184e3dc7f9ecefe7e768e4b52c8715667f Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 12 May 2017 12:47:24 +0100 Subject: [PATCH 07/12] Fix jstests --- jstests/tests/vue/components/test_ConfirmDialog.js | 9 +++++++-- remoteappmanager/static/js/home/controller.js | 3 +-- .../static/js/home/views/application_view.js | 8 ++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/jstests/tests/vue/components/test_ConfirmDialog.js b/jstests/tests/vue/components/test_ConfirmDialog.js index dccdcf8b5..1dcb0ec6f 100644 --- a/jstests/tests/vue/components/test_ConfirmDialog.js +++ b/jstests/tests/vue/components/test_ConfirmDialog.js @@ -4,11 +4,16 @@ define([ "jstests/helpers" ], function (Vue, ConfirmDialog, helpers) { "use strict"; - + QUnit.module("ConfirmDialog"); QUnit.test("rendering", function (assert) { assert.equal(helpers.getRenderedText(ConfirmDialog, { - title: "This is the title" + title: "This is the title", + closeCallback: function() {} }), "This is the title Cancel Ok"); + + assert.equal(helpers.getRenderedText(ConfirmDialog, { + title: "This is the title" + }), "This is the title Ok"); }); }); diff --git a/remoteappmanager/static/js/home/controller.js b/remoteappmanager/static/js/home/controller.js index d5d9227ec..eef36c39b 100644 --- a/remoteappmanager/static/js/home/controller.js +++ b/remoteappmanager/static/js/home/controller.js @@ -5,8 +5,7 @@ require([ "home/views/application_view", "components/vue/dist/vue", "gamodule", - "vue/filters", - "admin/vue-components/toolkit/toolkit" + "vue/filters" ], function( models, applicationListView, diff --git a/remoteappmanager/static/js/home/views/application_view.js b/remoteappmanager/static/js/home/views/application_view.js index 8df8c39b7..b4f812ed3 100644 --- a/remoteappmanager/static/js/home/views/application_view.js +++ b/remoteappmanager/static/js/home/views/application_view.js @@ -1,7 +1,8 @@ define([ "urlutils", "utils", - "../../components/vue/dist/vue" + "../../components/vue/dist/vue", + "admin/vue-components/toolkit/toolkit" ], function (urlUtils, utils, Vue) { "use strict"; @@ -14,7 +15,7 @@ define([ ' ' + ' ' + + ' :okCallback="closeDialog">' + '
' + ' Code: {{startingError.code}}' + ' {{startingError.message}}' + @@ -129,6 +130,9 @@ define([ getErrorTitle: function() { return 'Error when starting ' + this.startingError.appName; }, + closeDialog: function() { + this.showErrorDialog = false; + }, getIframeSize: function() { return utils.maxIframeSize(); }, From 13bb7fd8b27b99371c9fba192593c4f09247d53d Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 12 May 2017 13:26:10 +0100 Subject: [PATCH 08/12] Add error dialog when stopping fails --- .../js/home/views/application_list_view.js | 35 +++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index 1f04bfcc8..94ad0ce46 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -5,7 +5,17 @@ define([ var ApplicationListView = Vue.extend({ template: - '
' + + '
' + + ' ' + + ' ' + + '
' + + ' Code: {{stoppingError.code}}' + + ' {{stoppingError.message}}' + + '
' + + ' ' + + '' + '
' + ' ' + @@ -44,7 +54,7 @@ define([ ' ' + @@ -57,7 +67,11 @@ define([ '', data: function() { - return { 'searchInput': '' }; + return { + 'searchInput': '', + showErrorDialog: false, + stoppingError: {} + }; }, computed: { @@ -70,6 +84,21 @@ define([ }, methods: { + stopApplication: function(index) { + var stoppingAppName = this.$options.filters.appName( + this.model.appList[index].appData.image); + this.model.stopApplication(index).fail(function(error) { + this.stoppingError = error; + this.stoppingError.appName = stoppingAppName; + this.showErrorDialog = true; + }.bind(this)); + }, + getErrorTitle: function() { + return 'Error when stopping ' + this.stoppingError.appName; + }, + closeDialog: function() { + this.showErrorDialog = false; + }, indexOf: function(app) { return this.model.appList.indexOf(app); } From 808f5b8e92d252a57c8fbb8f8fe2a8bf2e9a3f1e Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 12 May 2017 13:31:21 +0100 Subject: [PATCH 09/12] Fix import --- remoteappmanager/static/js/home/views/application_list_view.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index 94ad0ce46..5768f5be4 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -1,5 +1,6 @@ define([ - '../../components/vue/dist/vue', + "../../components/vue/dist/vue", + "admin/vue-components/toolkit/toolkit" ], function (Vue) { 'use strict'; From 334f1ddc746e76a10a4b75fa35454ab6a7d61d36 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 12 May 2017 14:31:26 +0100 Subject: [PATCH 10/12] Removed useless method --- .../static/js/home/views/application_list_view.js | 5 +---- remoteappmanager/static/js/home/views/application_view.js | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index 5768f5be4..402962caf 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -9,7 +9,7 @@ define([ '
' + ' ' + ' ' + '
' + ' Code: {{stoppingError.code}}' + @@ -94,9 +94,6 @@ define([ this.showErrorDialog = true; }.bind(this)); }, - getErrorTitle: function() { - return 'Error when stopping ' + this.stoppingError.appName; - }, closeDialog: function() { this.showErrorDialog = false; }, diff --git a/remoteappmanager/static/js/home/views/application_view.js b/remoteappmanager/static/js/home/views/application_view.js index b4f812ed3..6d88d2495 100644 --- a/remoteappmanager/static/js/home/views/application_view.js +++ b/remoteappmanager/static/js/home/views/application_view.js @@ -14,7 +14,7 @@ define([ ' :class="{ content: true, \'no-padding\': currentApp.isRunning() }">' + ' ' + ' ' + '
' + ' Code: {{startingError.code}}' + @@ -127,9 +127,6 @@ define([ this.showErrorDialog = true; }.bind(this)); }, - getErrorTitle: function() { - return 'Error when starting ' + this.startingError.appName; - }, closeDialog: function() { this.showErrorDialog = false; }, From ea7d11015685f7768709b5ee67d47861667c96d7 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 12 May 2017 14:45:37 +0100 Subject: [PATCH 11/12] Changes dialog model --- .../static/js/home/views/application_list_view.js | 12 ++++++------ .../static/js/home/views/application_view.js | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js index 402962caf..c76611aa8 100644 --- a/remoteappmanager/static/js/home/views/application_list_view.js +++ b/remoteappmanager/static/js/home/views/application_list_view.js @@ -8,7 +8,7 @@ define([ template: '
' + ' ' + - ' ' + '
' + @@ -70,8 +70,7 @@ define([ data: function() { return { 'searchInput': '', - showErrorDialog: false, - stoppingError: {} + stoppingError: { show: false, appName: '', code: '', message: '' } }; }, @@ -89,13 +88,14 @@ define([ var stoppingAppName = this.$options.filters.appName( this.model.appList[index].appData.image); this.model.stopApplication(index).fail(function(error) { - this.stoppingError = error; + this.stoppingError.code = error.code; + this.stoppingError.message = error.message; this.stoppingError.appName = stoppingAppName; - this.showErrorDialog = true; + this.stoppingError.show = true; }.bind(this)); }, closeDialog: function() { - this.showErrorDialog = false; + this.stoppingError.show = false; }, indexOf: function(app) { return this.model.appList.indexOf(app); diff --git a/remoteappmanager/static/js/home/views/application_view.js b/remoteappmanager/static/js/home/views/application_view.js index 6d88d2495..44704b24e 100644 --- a/remoteappmanager/static/js/home/views/application_view.js +++ b/remoteappmanager/static/js/home/views/application_view.js @@ -13,7 +13,7 @@ define([ ' v-if="currentApp !== null"' + ' :class="{ content: true, \'no-padding\': currentApp.isRunning() }">' + ' ' + - ' ' + '
' + @@ -91,8 +91,7 @@ define([ data: function() { return { - showErrorDialog: false, - startingError: {} + startingError: { show: false, appName: '', code: '', message: '' } }; }, @@ -122,13 +121,14 @@ define([ var startingAppName = this.$options.filters.appName(this.currentApp.appData.image); this.$emit('startApplication', this.currentApp); this.model.startApplication().fail(function(error) { - this.startingError = error; + this.startingError.code = error.code; + this.startingError.message = error.message; this.startingError.appName = startingAppName; - this.showErrorDialog = true; + this.startingError.show = true; }.bind(this)); }, closeDialog: function() { - this.showErrorDialog = false; + this.startingError.show = false; }, getIframeSize: function() { return utils.maxIframeSize(); From c90095dc718e53ef7612c4564401eebe9a84a1c1 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 12 May 2017 14:59:58 +0100 Subject: [PATCH 12/12] Fix promise issues in the model And send the startApplication event to GA only if the start was a success --- remoteappmanager/static/js/home/models.js | 28 +++++++++++++------ .../static/js/home/views/application_view.js | 10 +++++-- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/remoteappmanager/static/js/home/models.js b/remoteappmanager/static/js/home/models.js index e0696714b..f0f5ec319 100644 --- a/remoteappmanager/static/js/home/models.js +++ b/remoteappmanager/static/js/home/models.js @@ -153,19 +153,26 @@ define([ configurablesData[tag] = configurable.asConfigDict(); }); - return resources.Container.create({ + var startPromise = $.Deferred(); + + resources.Container.create({ mapping_id: currentApp.appData.mapping_id, configurables: configurablesData - }).done(function() { + }) + .done(function() { this.updateIdx(selectedIndex) + .done(startPromise.resolve) .fail(function(error) { currentApp.status = Status.STOPPED; - return error; + startPromise.reject(error); }); - }.bind(this)).fail(function(error) { + }.bind(this)) + .fail(function(error) { currentApp.status = Status.STOPPED; - return error; + startPromise.reject(error); }); + + return startPromise; }; ApplicationListModel.prototype.stopApplication = function(index) { @@ -174,18 +181,23 @@ define([ var url_id = appStopping.appData.container.url_id; - return resources.Container.delete(url_id) + var stopPromise = $.Deferred(); + + resources.Container.delete(url_id) .done(function() { this.updateIdx(index) + .done(stopPromise.resolve) .fail(function(error) { appStopping.status = Status.STOPPED; - return error; + stopPromise.reject(error); }); }.bind(this)) .fail(function(error) { appStopping.status = Status.STOPPED; - return error; + stopPromise.reject(error); }); + + return stopPromise; }; return { diff --git a/remoteappmanager/static/js/home/views/application_view.js b/remoteappmanager/static/js/home/views/application_view.js index 44704b24e..6bec0550f 100644 --- a/remoteappmanager/static/js/home/views/application_view.js +++ b/remoteappmanager/static/js/home/views/application_view.js @@ -118,9 +118,13 @@ define([ methods: { startApplication: function() { - var startingAppName = this.$options.filters.appName(this.currentApp.appData.image); - this.$emit('startApplication', this.currentApp); - this.model.startApplication().fail(function(error) { + var startingApp = this.currentApp; + var startingAppName = this.$options.filters.appName(startingApp.appData.image); + this.model.startApplication() + .done(function() { + this.$emit('startApplication', startingApp); + }.bind(this)) + .fail(function(error) { this.startingError.code = error.code; this.startingError.message = error.message; this.startingError.appName = startingAppName;