Merge pull request #412 from mattermost/sidebar-patch

Fixing a few refactoring errors.

web/react/components/user_settings_modal.jsx

@@ -26,10 +26,10 @@ module.exports = React.createClass({
     },
     render: function() {
         var tabs = [];
-        tabs.push({name: "general", ui_name: "General", icon: "glyphicon glyphicon-cog"});
+        tabs.push({name: "general", uiName: "General", icon: "glyphicon glyphicon-cog"});
-        tabs.push({name: "security", ui_name: "Security", icon: "glyphicon glyphicon-lock"});
+        tabs.push({name: "security", uiName: "Security", icon: "glyphicon glyphicon-lock"});
-        tabs.push({name: "notifications", ui_name: "Notifications", icon: "glyphicon glyphicon-exclamation-sign"});
+        tabs.push({name: "notifications", uiName: "Notifications", icon: "glyphicon glyphicon-exclamation-sign"});
-        tabs.push({name: "appearance", ui_name: "Appearance", icon: "glyphicon glyphicon-wrench"});
+        tabs.push({name: "appearance", uiName: "Appearance", icon: "glyphicon glyphicon-wrench"});
 
         return (
             <div className="modal fade" ref="modal" id="user_settings" role="dialog" tabIndex="-1" aria-hidden="true">

web/react/utils/utils.jsx

@@ -631,9 +631,9 @@ module.exports.changeCss = function(className, classValue) {
     // we need invisible container to store additional css definitions
     var cssMainContainer = $('#css-modifier-container');
     if (cssMainContainer.length === 0) {
-        var cssMainContainer2 = $('<div id="css-modifier-container"></div>');
+        cssMainContainer = $('<div id="css-modifier-container"></div>');
-        cssMainContainer2.hide();
+        cssMainContainer.hide();
-        cssMainContainer2.appendTo($('body'));
+        cssMainContainer.appendTo($('body'));
     }
 
     // and we need one div for each class