Skip to content

Commit

Permalink
reverse versioning
Browse files Browse the repository at this point in the history
  • Loading branch information
onokumus committed Mar 4, 2016
2 parents 7f86f0e + aa91744 commit b02b482
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 38 deletions.
2 changes: 1 addition & 1 deletion dist/metisMenu.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* metismenu - v2.4.1
* metismenu - v2.4.2
* A jQuery menu plugin
* https://github.com/onokumus/metisMenu#readme
*
Expand Down
32 changes: 16 additions & 16 deletions dist/metisMenu.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* metismenu - v2.4.1
* metismenu - v2.4.2
* A jQuery menu plugin
* https://github.com/onokumus/metisMenu#readme
*
Expand Down Expand Up @@ -132,23 +132,23 @@
.on('click.metisMenu', function(e) {
var self = $(this);
var $parent = self.parent('li');
var $submenu = $parent.children('ul');
if ($this.options.preventDefault) {
var $list = $parent.children('ul');
if($this.options.preventDefault){
e.preventDefault();
}
if (self.attr('aria-disabled') === 'true') {
return;
if(self.attr('aria-disabled') === 'true'){
return;
}
if ($parent.hasClass(activeClass) && !$this.options.doubleTapToGo) {
$this.hide($submenu);
self.attr('aria-expanded', false);
$this.hide($list);
self.attr('aria-expanded',false);
} else {
$this.show($submenu);
self.attr('aria-expanded', true);
$this.show($list);
self.attr('aria-expanded',true);
}

if ($this.options.onTransitionStart) {
$this.options.onTransitionStart($submenu);
if($this.options.onTransitionStart) {
$this.options.onTransitionStart();
}

//Do we need to enable the double tap
Expand Down Expand Up @@ -206,8 +206,8 @@

this.transitioning = 1;
var complete = function() {
if (this.transitioning && this.options.onTransitionEnd) {
this.options.onTransitionEnd($this);
if(this.transitioning && this.options.onTransitionEnd) {
this.options.onTransitionEnd();
}
$this
.removeClass(collapsingClass)
Expand Down Expand Up @@ -247,8 +247,8 @@
this.transitioning = 1;

var complete = function() {
if (this.transitioning && this.options.onTransitionEnd) {
this.options.onTransitionEnd($this);
if(this.transitioning && this.options.onTransitionEnd) {
this.options.onTransitionEnd();
}
this.transitioning = 0;
$this
Expand Down Expand Up @@ -294,4 +294,4 @@
$.fn.metisMenu = old;
return this;
};
}));
}));
2 changes: 1 addition & 1 deletion dist/metisMenu.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/metisMenu.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "metismenu",
"version": "2.4.1",
"version": "2.4.2",
"description": "A jQuery menu plugin",
"main": "./dist/metisMenu.js",
"scripts": {
Expand Down Expand Up @@ -31,8 +31,7 @@
"Radoslav Štofko (http://www.stoweb.cz)",
"Umut Karcı <[email protected]>",
"Chris Wiggins <[email protected]> (https://github.com/chriswiggins)",
"Jacob Magnusson <[email protected]>",
"kalidema <[email protected]>"
"Jacob Magnusson <[email protected]>"
],
"license": "MIT",
"bugs": {
Expand Down
30 changes: 15 additions & 15 deletions src/metisMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,23 +123,23 @@
.on('click.metisMenu', function(e) {
var self = $(this);
var $parent = self.parent('li');
var $submenu = $parent.children('ul');
if ($this.options.preventDefault) {
var $list = $parent.children('ul');
if($this.options.preventDefault){
e.preventDefault();
}
if (self.attr('aria-disabled') === 'true') {
return;
if(self.attr('aria-disabled') === 'true'){
return;
}
if ($parent.hasClass(activeClass) && !$this.options.doubleTapToGo) {
$this.hide($submenu);
self.attr('aria-expanded', false);
$this.hide($list);
self.attr('aria-expanded',false);
} else {
$this.show($submenu);
self.attr('aria-expanded', true);
$this.show($list);
self.attr('aria-expanded',true);
}

if ($this.options.onTransitionStart) {
$this.options.onTransitionStart($submenu);
if($this.options.onTransitionStart) {
$this.options.onTransitionStart();
}

//Do we need to enable the double tap
Expand Down Expand Up @@ -197,8 +197,8 @@

this.transitioning = 1;
var complete = function() {
if (this.transitioning && this.options.onTransitionEnd) {
this.options.onTransitionEnd($this);
if(this.transitioning && this.options.onTransitionEnd) {
this.options.onTransitionEnd();
}
$this
.removeClass(collapsingClass)
Expand Down Expand Up @@ -238,8 +238,8 @@
this.transitioning = 1;

var complete = function() {
if (this.transitioning && this.options.onTransitionEnd) {
this.options.onTransitionEnd($this);
if(this.transitioning && this.options.onTransitionEnd) {
this.options.onTransitionEnd();
}
this.transitioning = 0;
$this
Expand Down Expand Up @@ -285,4 +285,4 @@
$.fn.metisMenu = old;
return this;
};
}));
}));

0 comments on commit b02b482

Please sign in to comment.