IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some of the javascript syntax in menu.js

Browse Source
This commit is contained in:
Ashesh Vashi 2016-09-06 23:20:22 +05:30
parent aeaa4bcad1
commit 2540e9687f
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
web/pgadmin/browser/static/js/menu.js
View File

@ -193,7 +193,7 @@ function(_, S, pgAdmin, $) {
m = items[idx]; m = items[idx];
$menu.append(m.$el); $menu.append(m.$el);
if (!m.is_disabled) { if (!m.is_disabled) {
submenus[ctx + ctxId] = m.context submenus[ctx + ctxId] = m.context;
} }
ctxId++; ctxId++;
} }
@ -320,9 +320,9 @@ function(_, S, pgAdmin, $) {
// MENU PUBLIC CLASS DEFINITION // MENU PUBLIC CLASS DEFINITION
// ============================== // ==============================
var Menu = function (element, options) { var Menu = function (element, options) {
this.$element = $(element) this.$element = $(element);
this.options = $.extend({}, Menu.DEFAULTS, options) this.options = $.extend({}, Menu.DEFAULTS, options);
this.isLoading = false this.isLoading = false;
} }
Menu.DEFAULTS = {} Menu.DEFAULTS = {}
@ -330,7 +330,7 @@ function(_, S, pgAdmin, $) {
Menu.prototype.toggle = function (ev) { Menu.prototype.toggle = function (ev) {
var $parent = this.$element.closest('.menu-item'); var $parent = this.$element.closest('.menu-item');
if ($parent.hasClass('disabled')) { if ($parent.hasClass('disabled')) {
ev.preventDefault() ev.preventDefault();
return false; return false;
} }
var d = this.$element.data('pgMenu'); var d = this.$element.data('pgMenu');
@ -338,7 +338,7 @@ function(_, S, pgAdmin, $) {
var cb = d.module && d.module['callbacks'] && d.module['callbacks'][d.cb] || d.module && d.module[d.cb]; var cb = d.module && d.module['callbacks'] && d.module['callbacks'][d.cb] || d.module && d.module[d.cb];
if (cb) { if (cb) {
cb.apply(d.module, [d.data, pgAdmin.Browser.tree.selected()]); cb.apply(d.module, [d.data, pgAdmin.Browser.tree.selected()]);
ev.preventDefault() ev.preventDefault();
} else { } else {
pgAdmin.Browser.report_error('Developer Warning: Callback - "' + d.cb + '" not found!'); pgAdmin.Browser.report_error('Developer Warning: Callback - "' + d.cb + '" not found!');
} }
@ -351,20 +351,20 @@ function(_, S, pgAdmin, $) {
function Plugin(option, ev) { function Plugin(option, ev) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this);
var data = $this.data('pg.menu') var data = $this.data('pg.menu');
var options = typeof option == 'object' && option var options = typeof option == 'object' && option;
if (!data) $this.data('pg.menu', (data = new Menu(this, options))) if (!data) $this.data('pg.menu', (data = new Menu(this, options)));
data.toggle(ev) data.toggle(ev);
}) })
} }
var old = $.fn.button var old = $.fn.button;
$.fn.pgmenu = Plugin $.fn.pgmenu = Plugin;
$.fn.pgmenu.Constructor = Menu $.fn.pgmenu.Constructor = Menu;
// BUTTON NO CONFLICT // BUTTON NO CONFLICT
@ -380,14 +380,18 @@ function(_, S, pgAdmin, $) {
$(document) $(document)
.on('click.pg.menu.data-api', '[data-toggle^="pg-menu"]', function (ev) { .on('click.pg.menu.data-api', '[data-toggle^="pg-menu"]', function (ev) {
var $menu = $(ev.target) var $menu = $(ev.target);
if (!$menu.hasClass('menu-link')) if (!$menu.hasClass('menu-link'))
$menu = $menu.closest('.menu-link') $menu = $menu.closest('.menu-link');
Plugin.call($menu, 'toggle', ev) Plugin.call($menu, 'toggle', ev);
}) })
.on('focus.pg.menu.data-api blur.pg.menu.data-api', '[data-toggle^="pg-menu"]', .on(
'focus.pg.menu.data-api blur.pg.menu.data-api',
'[data-toggle^="pg-menu"]',
function (e) { function (e) {
$(e.target).closest('.menu').toggleClass('focus', /^focus(in)?$/.test(e.type)) $(e.target).closest('.menu').toggleClass(
'focus', /^focus(in)?$/.test(e.type)
);
}); });
return pgAdmin.Browser.MenuItem; return pgAdmin.Browser.MenuItem;