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

4 files changed, 9 insertions, 106 deletions

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/page/user_settings_box.js b/web-ui/app/js/page/user_settings_box.js
deleted file mode 100644
index 299f6237..00000000
--- a/web-ui/app/js/page/user_settings_box.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2014 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',
-    'features',
-    'views/templates',
-    'page/events',
-    'helpers/monitored_ajax'
-  ], function (defineComponent, features, templates, events, monitoredAjax) {
-
-  'use strict';
-
-  return defineComponent(function () {
-    this.defaultAttrs({
-      close: '#user-settings-close'
-    });
-
-    this.render = function () {
-      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 });
-      };
-
-      monitoredAjax(this, '/user-settings', {
-        type: 'GET',
-        contentType: 'application/json; charset=utf-8'
-      }).done(success.bind(this)).fail(failure.bind(this));
-    };
-
-    this.toggleHidden = function() {
-      if (this.$node.hasClass('hidden')) {
-        this.$node.removeClass('hidden');
-      } else {
-        this.$node.addClass('hidden');
-      }
-    };
-
-    this.after('initialize', function () {
-      this.render();
-      this.on(document, events.ui.userSettingsBox.toggle, this.toggleHidden);
-    });
-  });
-});
diff --git a/web-ui/app/js/page/user_settings_icon.js b/web-ui/app/js/page/user_settings_icon.js
deleted file mode 100644
index 2d79c2d0..00000000
--- a/web-ui/app/js/page/user_settings_icon.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2014 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', 'views/templates', 'page/events'], function (defineComponent, templates, events) {
-  'use strict';
-
-  return defineComponent(function () {
-
-    this.render = function () {
-      this.$node.html(templates.page.userSettingsIcon());
-    };
-
-    this.toggleUserSettingsBox = function() {
-      this.trigger(document, events.ui.userSettingsBox.toggle);
-    };
-
-    this.after('initialize', function () {
-      this.render();
-      this.on('click', this.toggleUserSettingsBox);
-    });
-  });
-});