Code refactoring (5) (es5 -> es2015)

dev/View/Popup/Compose.js

@@ -4,6 +4,7 @@ var
 	_ = require('_'),
 	$ = require('$'),
 	ko = require('ko'),
+	key = require('key'),
 	JSON = require('JSON'),
 	Jua = require('Jua'),
 
@@ -928,7 +929,10 @@ ComposePopupView.prototype.setSignatureFromIdentity = function(oIdentity)
 	{
 		var self = this;
 		this.editor(function(oEditor) {
-			var bHtml = false, sSignature = oIdentity.signature();
+			var
+				bHtml = false,
+				sSignature = oIdentity.signature();
+
 			if ('' !== sSignature)
 			{
 				if (':HTML:' === sSignature.substr(0, 6))

dev/View/Popup/Contacts.js

@@ -6,6 +6,8 @@ var
 	ko = require('ko'),
 	key = require('key'),
 
+	Jua = require('Jua'),
+
 	Enums = require('Common/Enums'),
 	Consts = require('Common/Consts'),
 	Globals = require('Common/Globals'),

dev/View/Popup/NewOpenPgpKey.js

@@ -28,6 +28,7 @@ function NewOpenPgpKeyPopupView()
 	this.keyBitLength = ko.observable(Enums.Magics.BitLength2048);
 
 	this.submitRequest = ko.observable(false);
+	this.submitError = ko.observable('');
 
 	this.email.subscribe(function() {
 		this.email.error(false);
@@ -53,6 +54,7 @@ function NewOpenPgpKeyPopupView()
 		}
 
 		this.submitRequest(true);
+		this.submitError('');
 
 		_.delay(function() {
 
@@ -81,14 +83,15 @@ function NewOpenPgpKeyPopupView()
 						Utils.delegateRun(self, 'cancelCommand');
 					}
 
-				}).then(null, function() {
+				}).then(null, function(e) {
 					self.submitRequest(false);
+					self.showError(e);
 				});
 			}
 			catch (e)
 			{
-				Utils.log(e);
 				self.submitRequest(false);
+				self.showError(e);
 			}
 
 		}, Enums.Magics.Time100ms);
@@ -102,6 +105,15 @@ function NewOpenPgpKeyPopupView()
 kn.extendAsViewModel(['View/Popup/NewOpenPgpKey', 'PopupsNewOpenPgpKeyViewModel'], NewOpenPgpKeyPopupView);
 _.extend(NewOpenPgpKeyPopupView.prototype, AbstractView.prototype);
 
+NewOpenPgpKeyPopupView.prototype.showError = function(e)
+{
+	Utils.log(e);
+	if (e && e.message)
+	{
+		this.submitError(e.message);
+	}
+};
+
 NewOpenPgpKeyPopupView.prototype.clearPopup = function()
 {
 	this.name('');
@@ -110,6 +122,8 @@ NewOpenPgpKeyPopupView.prototype.clearPopup = function()
 	this.email('');
 	this.email.error(false);
 	this.keyBitLength(Enums.Magics.BitLength2048);
+
+	this.submitError('');
 };
 
 NewOpenPgpKeyPopupView.prototype.onShow = function()

dev/View/Popup/Plugin.js

@@ -60,15 +60,14 @@ function PluginPopupView()
 		list.Name = this.name();
 
 		_.each(this.configures(), function(oItem) {
-
 			var value = oItem.value();
+
 			if (false === value || true === value)
 			{
 				value = value ? '1' : '0';
 			}
 
 			list['_' + oItem.Name] = value;
-
 		}, this);
 
 		this.saveError('');
@@ -119,6 +118,7 @@ PluginPopupView.prototype.onShow = function(oPlugin)
 		this.readme(oPlugin.Readme);
 
 		var aConfig = oPlugin.Config;
+
 		if (Utils.isNonEmptyArray(aConfig))
 		{
 			this.configures(_.map(aConfig, function(aItem) {
@@ -160,6 +160,7 @@ PluginPopupView.prototype.onBuild = function()
 		{
 			this.tryToClosePopup();
 		}
+
 		return false;
 	}, this));
 };

dev/View/Popup/Template.js

@@ -124,9 +124,10 @@ TemplatePopupView.prototype.populateBodyFromEditor = function()
 
 TemplatePopupView.prototype.editorSetBody = function(sBody)
 {
+	var self = this;
+
 	if (!this.editor && this.signatureDom())
 	{
-		var self = this;
 		this.editor = new HtmlEditor(self.signatureDom(), function() {
 			self.populateBodyFromEditor();
 		}, function() {