Issue #411 - Splitted some js logic [Gil/Jeff]

Separeted the logic to get the user information from the component that
render the popup that shows this information

6 files changed, 105 insertions, 31 deletions

diff --git a/web-ui/app/js/main.js b/web-ui/app/js/main.js
index 5bb1165c..ea68218d 100644
--- a/web-ui/app/js/main.js
+++ b/web-ui/app/js/main.js
@@ -39,7 +39,8 @@ requirejs.config({
     'features': 'js/features/features',
     'i18next': 'bower_components/i18next/i18next.amd',
     'quoted-printable': 'bower_components/quoted-printable',
-    'utf8': 'bower_components/utf8'
+    'utf8': 'bower_components/utf8',
+    'user_settings': 'js/user_settings'
   }
 });
 
diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js
index c8b88a08..3005c027 100644
--- a/web-ui/app/js/page/default.js
+++ b/web-ui/app/js/page/default.js
@@ -42,8 +42,8 @@ define(
     'views/i18n',
     'views/recipientListFormatter',
     'flight/lib/logger',
-    'page/user_settings_icon',
-    'page/user_settings_box',
+    'user_settings/data/user_settings',
+    'user_settings/ui/user_settings_icon',
     'page/logout',
     'page/logout_shortcut',
     'feedback/feedback_trigger',
@@ -79,8 +79,8 @@ define(
     viewI18n,
     recipientListFormatter,
     withLogging,
+    userSettings,
     userSettingsIcon,
-    userSettingsBox,
     logout,
     logoutShortcut,
     feedback,
@@ -117,8 +117,8 @@ define(
       leftPaneDispatcher.attachTo(document);
 
       offCanvas.attachTo(document);
+      userSettings.attachTo(document);
       userSettingsIcon.attachTo('#user-settings-icon');
-      userSettingsBox.attachTo('#user-settings-box');
       logout.attachTo('#logout');
       logoutShortcut.attachTo('#logout-shortcut');
       version.attachTo('.version');
diff --git a/web-ui/app/js/page/events.js b/web-ui/app/js/page/events.js
index 1bed8cd1..4ed25185 100644
--- a/web-ui/app/js/page/events.js
+++ b/web-ui/app/js/page/events.js
@@ -112,6 +112,11 @@ define(function () {
       submit: 'feedback:submit',
       submitted: 'feedback:submitted'
     },
+    userSettings: {
+      here: 'userSettings:here',
+      getInfo: 'userSettings:getInfo',
+      destroyPopup: 'userSettings:destroyPopup'
+    },
     mail: {
       here: 'mail:here',
       want: 'mail:want',
diff --git a/web-ui/app/js/user_settings/data/user_settings.js b/web-ui/app/js/user_settings/data/user_settings.js
new file mode 100644
index 00000000..dac29cec
--- /dev/null
+++ b/web-ui/app/js/user_settings/data/user_settings.js
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2015 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+define(
+  [
+    'flight/lib/component',
+    'helpers/monitored_ajax',
+    'page/events'
+  ],
+  function (defineComponent, monitoredAjax, events) {
+    'use strict';
+
+  return defineComponent(function() {
+    this.defaultAttrs({
+      userSettingsResource: '/user-settings',
+      userSettings: {}
+    });
+
+    this.sendInfo = function() {
+      this.trigger(document, events.userSettings.here, this.attr.userSettings);
+    };
+
+    this.getUserSettings = function() {
+      var getUserSettingsSuccess = function (userSettings) {
+        this.attr.userSettings = userSettings;
+      };
+    
+      monitoredAjax(this, this.attr.userSettingsResource, {
+        type: 'GET',
+        contentType: 'application/json; charset=utf-8'
+      }).done(getUserSettingsSuccess.bind(this));
+    };
+
+    this.after('initialize', function() {
+      this.getUserSettings();
+      this.on(document, events.userSettings.getInfo, this.sendInfo);
+    });
+  });
+});
diff --git a/web-ui/app/js/page/user_settings_box.js b/web-ui/app/js/user_settings/ui/user_settings_box.js
index 299f6237..2bc291f9 100644
--- a/web-ui/app/js/page/user_settings_box.js
+++ b/web-ui/app/js/user_settings/ui/user_settings_box.js
@@ -20,48 +20,48 @@ define(
     'features',
     'views/templates',
     'page/events',
+    'views/i18n',
     'helpers/monitored_ajax'
-  ], function (defineComponent, features, templates, events, monitoredAjax) {
+  ], function (defineComponent, features, templates, events, i18n, monitoredAjax) {
 
   'use strict';
 
   return defineComponent(function () {
+    this.create = function(parentElement) {
+      parentElement;
+
+      var component = new this.consructor();
+      component.initialize(html, recipient);
+      component.attr.recipient = recipient;
+      return component;
+    };
+
     this.defaultAttrs({
       close: '#user-settings-close'
     });
-
-    this.render = function () {
+      
+    this.render = function (event, userSettings) {
       if (features.isLogoutEnabled()) {
         this.$node.addClass('extra-bottom-space');
       }
 
-      var success = function (userSettings) {
-        this.$node.html(templates.page.userSettingsBox(userSettings));
-        this.on(this.attr.close, 'click', this.toggleHidden);
-      };
-
-      var failure = function (resp) {
-        var msg = i18n('Could not get mail address');
-        this.trigger(document, events.ui.userAlerts.displayMessage, { message: msg });
-      };
+      this.$node.addClass('arrow-box');
+      this.$node.html(templates.page.userSettingsBox(userSettings));
 
-      monitoredAjax(this, '/user-settings', {
-        type: 'GET',
-        contentType: 'application/json; charset=utf-8'
-      }).done(success.bind(this)).fail(failure.bind(this));
+      this.on(this.attr.close, 'click', function() {
+        this.trigger(document, events.userSettings.destroyPopup);
+      });
     };
 
-    this.toggleHidden = function() {
-      if (this.$node.hasClass('hidden')) {
-        this.$node.removeClass('hidden');
-      } else {
-        this.$node.addClass('hidden');
-      }
+    this.destroy = function () {
+      this.$node.remove();
+      this.teardown();
     };
 
     this.after('initialize', function () {
-      this.render();
-      this.on(document, events.ui.userSettingsBox.toggle, this.toggleHidden);
+      this.on(document, events.userSettings.here, this.render);
+      this.on(document, events.userSettings.destroyPopup, this.destroy);
+      this.trigger(document, events.userSettings.getInfo);
     });
   });
 });
diff --git a/web-ui/app/js/page/user_settings_icon.js b/web-ui/app/js/user_settings/ui/user_settings_icon.js
index 2d79c2d0..64a42127 100644
--- a/web-ui/app/js/page/user_settings_icon.js
+++ b/web-ui/app/js/user_settings/ui/user_settings_icon.js
@@ -14,17 +14,33 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
  */
-define(['flight/lib/component', 'views/templates', 'page/events'], function (defineComponent, templates, events) {
+define(
+  [
+    'flight/lib/component',
+    'views/templates',
+    'page/events',
+    'user_settings/ui/user_settings_box'
+  ], function (defineComponent, templates, events, userSettingsBox) {
   'use strict';
 
   return defineComponent(function () {
+    this.defaultAttrs({
+      userSettingsBox: $('#user-settings-box')
+    });
 
     this.render = function () {
       this.$node.html(templates.page.userSettingsIcon());
     };
 
     this.toggleUserSettingsBox = function() {
-      this.trigger(document, events.ui.userSettingsBox.toggle);
+      if(this.attr.userSettingsBox.children().length == 0) {
+        var div = $('<div>');
+        $(this.attr.userSettingsBox).append(div);
+        userSettingsBox.attachTo(div);
+        this.attr.userSettingsInfo = userSettingsBox;
+      } else {
+        this.trigger(document, events.userSettings.destroyPopup);
+      }
     };
 
     this.after('initialize', function () {