fnpjs: better exceptions logging in console handler

[fnpeditor.git] / src / editor / modules / mainBar / mainBar.js

diff --git a/src/editor/modules/mainBar/mainBar.js b/src/editor/modules/mainBar/mainBar.js
index e2e09c3..0563b7c 100644 (file)
--- a/src/editor/modules/mainBar/mainBar.js
+++ b/src/editor/modules/mainBar/mainBar.js
@@ -7,9 +7,20 @@ define([
 
 return function(sandbox) {
 
 
 return function(sandbox) {
 

-    var view = $(_.template(template)());
+    /* globals gettext*/
+
+    var config = sandbox.getConfig(),
+        userName = config.user && config.user.name,
+        view = $(_.template(template)({
+            userName: userName || gettext('anonymous')
+        }));
+

     view.find('[data-cmd]').click(function(e) {
         e.preventDefault();
     view.find('[data-cmd]').click(function(e) {
         e.preventDefault();

+        var target = $(e.target);
+        if(target.hasClass('disabled')) {
+            return;
+        }

         sandbox.publish('cmd.' + $(e.target).attr('data-cmd'));
     });
 
         sandbox.publish('cmd.' + $(e.target).attr('data-cmd'));
     });
 


@@ -17,7 +28,18 @@ return function(sandbox) {
         start: function() { sandbox.publish('ready'); },
         getView: function() {return view;},
         setCommandEnabled: function(cmd, enabled) {
         start: function() { sandbox.publish('ready'); },
         getView: function() {return view;},
         setCommandEnabled: function(cmd, enabled) {

-            view.find('[data-cmd='+cmd+']').toggleClass('disabled', !enabled);
+            var trigger = view.find('[data-cmd='+cmd+']'),
+                disabledText = trigger.attr('data-disabled-text'),
+                originalContent = trigger.data('originalContent');
+            trigger.toggleClass('disabled', !enabled);
+            if(enabled && originalContent) {
+                trigger.html(originalContent);
+                trigger.removeData('originalContent');
+            }
+            if(!enabled && disabledText) {
+                trigger.data('originalContent', trigger.html());
+                trigger.text(disabledText);
+            }

         },
         setVersion: function(version) {
             view.find('.version').text(version);
         },
         setVersion: function(version) {
             view.find('.version').text(version);