#2836 developing of headerMenu extension - settings updates

twosigma · Nov 30, 2015 · 349898b · 349898b
1 parent 2fc96f8
commit 349898b
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 14 deletions.
diff --git a/core/src/main/web/app/styles/dropdowns.scss b/core/src/main/web/app/styles/dropdowns.scss
@@ -94,7 +94,6 @@
 
   .dropdown-menu {
     position: absolute;
-    display:  block;
   }
 }
 
diff --git a/core/src/main/web/outputdisplay/bko-tabledisplay/bko-tabledisplay.js b/core/src/main/web/outputdisplay/bko-tabledisplay/bko-tabledisplay.js
@@ -859,24 +859,46 @@
               },
               {
                 title: 'Visible',
-                action: null
+                isChecked: function() {},
+                action: function(e) {
+                  e.preventDefault;
+
+                }
               },
               {
                 title: 'Alignment',
                 action: null,
-                items: []
+                //move to plugin
+                items: [
+                  {
+                    title: 'Left',
+                    isChecked: function() {},
+                    action: function() {}
+                  },
+                  {
+                    title: 'Center',
+                    isChecked: function() {},
+                    action: function() {}
+                  },
+                  {
+                    title: 'Right',
+                    isChecked: function() {},
+                    action: function() {}
+                  }
+                ]
               },
               {
                 title: 'Sorting',
                 action: null,
+                //move to plugin
                 items: [
                   {
-                    name: 'Ascending',
+                    title: 'Ascending',
                     isChecked: function() {},
                     action: function() {}
                   },
                   {
-                    name: 'Descending',
+                    title: 'Descending',
                     isChecked: function() {},
                     action: function() {}
                   }

diff --git a/core/src/main/web/vendor/datatables-headermenu/js/bko-datatables-headermenu.js b/core/src/main/web/vendor/datatables-headermenu/js/bko-datatables-headermenu.js
@@ -129,7 +129,8 @@ HeaderMenu.prototype = {
     var menuItems = el.data('menu');
 
     if ($.isArray(menuItems)) {
-      var $menu = $("<ul/>", { 'class': 'dropdown-menu' });
+      var $menu = $("<ul/>", { 'class': 'dropdown-menu' })
+        .attr('eat-click', '');
       var node = this.dom.container;
 
       that._buildMenuItems(menuItems, $menu);
@@ -138,6 +139,7 @@ HeaderMenu.prototype = {
           top: el.height() + 10,
           left: el.offset().left - 51
         })
+        .css('display', 'block')
         .appendTo(node);
       that.dom.menu = $menu;
     }
@@ -153,12 +155,11 @@ HeaderMenu.prototype = {
       return;
     }
 
-    var hasSubitems = $.isArray(oItems.items) && oItems.items.length;
-
     for (var i = 0, ien = oItems.length; i < ien; i++) {
       var oItem = oItems[i];
+      var hasSubitems = $.isArray(oItem.items) && oItem.items.length;
 
-      var $item = $('<li/>', {'class': hasSubitems ? 'dropdown-submenu drop-left' : ''})
+      var $item = $('<li/>', {'class': hasSubitems ? 'dropdown-submenu' : ''})
         .append(
           $('<a/>')
             .attr('href', '#')
@@ -167,15 +168,23 @@ HeaderMenu.prototype = {
             .attr('eat-click', '')
             .text(oItem.title)
         );
+      //also append
+      //<i class="glyphicon glyphicon-ok"></i>
 
       if (hasSubitems) {
-        var $subContainer = $('<ul/>', { 'class': 'dropdown-menu bko-header-menu' });
+        var $subContainer = $('<ul/>', { 'class': 'dropdown-menu' });
         $subContainer.appendTo($item);
         this._buildMenuItems(oItem.items, $subContainer);
       }
 
       $item.appendTo(container);
     }
+  },
+
+  _toggleVisibility: function(el) {
+
+    //var column = this.dt.column( $(el).attr('data-column') );
+    //column.visible( ! column.visible() );
   }
 };
 
@@ -185,12 +194,15 @@ HeaderMenu.defaults = {
       tag: 'ul',
       class: 'dropdown-menu',
       attrs: {
-        'role': 'menu',
-        'submenu-classes': 'drop-right',
-        'aria-labelledby': 'dLabel'
+        'role': 'menu'
       }
     }
-  }
+  },
+  toAdd: [
+    {
+      parent: 'Format'
+    }
+  ]
 };
 
 $.fn.dataTable.HeaderMenu = HeaderMenu;