updated libraries, squashed the problem of not getting bar handles on click, optimized montage view

1 files changed, 9 insertions, 4 deletions

diff --git a/www/lib/ng-mfb/src/mfb-directive.js b/www/lib/ng-mfb/src/mfb-directive.js
index d4cf214f..68a3c350 100644
--- a/www/lib/ng-mfb/src/mfb-directive.js
+++ b/www/lib/ng-mfb/src/mfb-directive.js
@@ -27,8 +27,8 @@
     '    <a ng-click="clicked()" ng-mouseenter="hovered()" ng-mouseleave="hovered()"' +
     '       style="background: transparent; box-shadow: none;"' +
     '       ng-attr-data-mfb-label="{{label}}" class="mfb-component__button--main">' +
-    '     <md-button class="md-fab md-primary" aria-label={{label}}>' +
-    '       <md-icon style="position:initial;" md-svg-icon="{{resting}}"' +
+    '     <md-button class="md-fab md-primary" aria-label={{label}} style="position:relative;">' +
+    '       <md-icon style="left: 0;" md-svg-icon="{{resting}}"' +
     '         class="mfb-component__main-icon--resting"></md-icon>' +
     '       <md-icon style="position:initial;" md-svg-icon="{{active}}"' +
     '         class="mfb-component__main-icon--active"></md-icon>' +
@@ -73,9 +73,9 @@
         label: '@',
         resting: '@restingIcon',
         active: '@activeIcon',
-
+        mainAction: '&',
         menuState: '=?',
-        togglingMethod: '@',
+        togglingMethod: '@'
       },
       templateUrl: function(elem, attrs) {
         return attrs.templateUrl || 'ng-mfb-menu-default.tpl.html';
@@ -124,6 +124,11 @@
         }
 
         scope.clicked = function() {
+          // If there is a main action, let's fire it
+          if (scope.mainAction) {
+            scope.mainAction();
+          }
+
           if(!_isHoverActive()){
             flipState();
           }