Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update: Add destroy method #119

Closed
wants to merge 5 commits into from
Closed

Update: Add destroy method #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f6e9e2
Update: Instantiate [data-toggle=sidenav] on page load
pat270 Jan 22, 2016
00c3314
Fix: Side Navigation defaults to delegate false if use-delegate undef…
pat270 Jan 23, 2016
c775721
Update: Delegate should work on regular sidenav
pat270 Jan 25, 2016
c800d4c
Update: Add destroy method to Side Navigation plugin
pat270 Jan 27, 2016
c7d9181
Fix: Side Navigation close should use delegate
pat270 Jan 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/content/sidenav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ <h5>Syntax with Options:</h5>
<div class="sidenav-container" id="mySidenavContainerId">
<div class="sidenav-menu-slider" style="background:#FFF;">
<div class="sidenav-menu">
<div class="col-md-12">... Your Side Nav Content ...</div>
<div class="col-md-12">
<a class="sidenav-close pull-right" href="#1">X</a>
<p>... Your Side Nav Content ...</p>
</div>
</div>
</div>

Expand Down Expand Up @@ -125,7 +128,10 @@ <h5>Syntax with Options:</h5>
<div class="sidenav-container" id="mySidenavContainerId1">
<div class="sidenav-menu-slider" style="background:#FFF;">
<div class="sidenav-menu">
<div class="col-md-12">... Your Side Nav Content ...</div>
<div class="col-md-12">
<a class="sidenav-close pull-right" href="#1">X</a>
<p>... Your Side Nav Content ...</p>
</div>
</div>
</div>

Expand Down Expand Up @@ -426,8 +432,6 @@ <h4><code>sideNavInstance.visible()</code></h4>
toggler: '#mySidenavToggleId1'
});

$('[data-toggle="sidenav"]').sideNavigation();

$('#showSimpleSidenav2').on('click', function(event) {
event.preventDefault();

Expand Down
70 changes: 62 additions & 8 deletions src/js/side-navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,12 @@
options.type = element.data('type');
options.typeMobile = element.data('type-mobile');
options.url = element.data('url');
options.useDelegate = element.data('use-delegate') || false;
options.useDelegate = element.data('use-delegate');
options.width = '';

if (options.useDelegate === undefined) {
options.useDelegate = true;
}
}
else { // find toggler
toggler = element.find(options.toggler);
Expand Down Expand Up @@ -125,6 +129,31 @@
els.css(attribute, '');
},

destroy: function() {
var instance = this;
var element = instance.element;
var options = instance.options;

// Detach sidenav close

doc.off('click.close.lexicon.sidenav', instance.closeButtonSelector);
doc.data(instance.dataCloseButtonSelector, null);

// Detach toggler

if (options.useDelegate) {
doc.off('click.lexicon.sidenav', instance.togglerSelector);
doc.data(instance.dataTogglerSelector, null);
}
else {
element.off('click.lexicon.sidenav');
}

// Remove Side Navigation

element.data('lexicon.sidenav', null);
},

getSidenavLeftWidth: function(type, offset, width) {
var instance = this;

Expand Down Expand Up @@ -611,23 +640,34 @@
var instance = this;

var element = instance.element;
var options = instance.options;

var closeButton = element.find('.sidenav-close').first();
var container = instance.options.target ? $(instance.options.target) : doc.find(element.attr('href'));
var containerSelector = '#' + element.attr('id');

if (instance.useDataAttribute) {
closeButton = container.find('.sidenav-close');
containerSelector = options.target || element.attr('href');
}

if (!closeButton.data('click.lexicon.sidenav')) {
closeButton.on('click.lexicon.sidenav', function(event) {
var closeButton = $(containerSelector).find('.sidenav-close').first();
var closeButtonSelector = '#' + guid(closeButton, 'generatedLexiconSidenavCloseId');
var dataCloseButtonSelector ='lexicon.' + closeButtonSelector;

if (!doc.data(dataCloseButtonSelector)) {
doc.data(dataCloseButtonSelector, 'true');

doc.on('click.close.lexicon.sidenav', closeButtonSelector, function(event) {
event.preventDefault();

if (!instance.useDataAttribute) {
instance.element = doc.find(options.selector);
}

instance.toggle();
});

closeButton.data('click.lexicon.sidenav', true);
}

instance.closeButtonSelector = closeButtonSelector;
instance.dataCloseButtonSelector = dataCloseButtonSelector;
},

_onClickTrigger: function() {
Expand Down Expand Up @@ -680,12 +720,19 @@
'click.lexicon.sidenav',
togglerSelector,
function(event) {
if (!instance.useDataAttribute) {
instance.element = doc.find(options.selector);
}

instance.toggle();

event.preventDefault();
}
);
}

instance.togglerSelector = togglerSelector;
instance.dataTogglerSelector = dataTogglerSelector;
},

_onScreenChange: function() {
Expand Down Expand Up @@ -900,4 +947,11 @@
Plugin.Constructor = SideNavigation;

$.fn.sideNavigation = Plugin;

$(function() {
var sidenav = $('[data-toggle="sidenav"]');
var target = sidenav.attr('data-target') || sidenav.attr('href');

Plugin.call(sidenav);
});
}(jQuery);