Skip to content

Commit

Permalink
Some code cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
@thednp
thednp committed Sep 28, 2017
1 parent 369d236 commit bfd131c
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 43 deletions.
15 changes: 5 additions & 10 deletions dist/bootstrap-native-v4.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,13 +278,9 @@
triggerHandler = function(){ hasClass(alert,'fade') ? emulateTransitionEnd(alert,transitionEndHandler) : transitionEndHandler(); },
// handlers
clickHandler = function(e){
var eventTarget = e[target];
eventTarget = eventTarget[hasAttribute](dataDismiss) ? eventTarget : eventTarget[parentNode];
if (eventTarget && eventTarget[hasAttribute](dataDismiss)) { // we double check the data attribute, it's important
alert = getClosest(eventTarget,'.'+component);
element = queryElement('['+dataDismiss+'="'+component+'"]',alert);
(element === eventTarget || element === eventTarget[parentNode]) && alert && self.close();
}
alert = getClosest(e[target],'.'+component);
element = queryElement('['+dataDismiss+'="'+component+'"]',alert);
element && alert && (element === e[target] || element.contains(e[target])) && self.close();
},
transitionEndHandler = function(){
bootstrapCustomEvent.call(alert, closedEvent, component);
Expand Down Expand Up @@ -335,9 +331,8 @@

// private methods
toggle = function(e) {
var parent = e[target][parentNode],
label = e[target].tagName === LABEL ? e[target] : parent.tagName === LABEL ? parent : null; // the .btn label

var label = e[target].tagName === LABEL ? e[target] : e[target][parentNode].tagName === LABEL ? e[target][parentNode] : null; // the .btn label

if ( !label ) return; //react if a label or its immediate child is clicked

var eventTarget = this, // the button group, the target of the handler function
Expand Down
2 changes: 1 addition & 1 deletion dist/bootstrap-native-v4.min.js
View file

Large diffs are not rendered by default.

15 changes: 5 additions & 10 deletions dist/bootstrap-native.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,13 +406,9 @@
triggerHandler = function(){ hasClass(alert,'fade') ? emulateTransitionEnd(alert,transitionEndHandler) : transitionEndHandler(); },
// handlers
clickHandler = function(e){
var eventTarget = e[target];
eventTarget = eventTarget[hasAttribute](dataDismiss) ? eventTarget : eventTarget[parentNode];
if (eventTarget && eventTarget[hasAttribute](dataDismiss)) { // we double check the data attribute, it's important
alert = getClosest(eventTarget,'.'+component);
element = queryElement('['+dataDismiss+'="'+component+'"]',alert);
(element === eventTarget || element === eventTarget[parentNode]) && alert && self.close();
}
alert = getClosest(e[target],'.'+component);
element = queryElement('['+dataDismiss+'="'+component+'"]',alert);
element && alert && (element === e[target] || element.contains(e[target])) && self.close();
},
transitionEndHandler = function(){
bootstrapCustomEvent.call(alert, closedEvent, component);
Expand Down Expand Up @@ -485,9 +481,8 @@
}
},
toggle = function(e) {
var parent = e[target][parentNode],
label = e[target].tagName === LABEL ? e[target] : parent.tagName === LABEL ? parent : null; // the .btn label

var label = e[target].tagName === LABEL ? e[target] : e[target][parentNode].tagName === LABEL ? e[target][parentNode] : null; // the .btn label

if ( !label ) return; //react if a label or its immediate child is clicked

var eventTarget = this, // the button group, the target of the handler function
Expand Down
2 changes: 1 addition & 1 deletion dist/bootstrap-native.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2996,7 +2996,7 @@ <h4>Example</h4>
</section>
</div>

<div id="side-nav" class="col-sm-3">
<div id="side-nav" class="col-sm-3 hidden-xs">
<h3 class="visible-xs">Navigation</h3>
<ul id="nav-scrollspy" class="nav nav-stacked" data-spy="affix" data-target="#use" data-offset-bottom="120">
<li><a href="#myCarousel">Download</a></li>
Expand Down
10 changes: 3 additions & 7 deletions lib/V3/alert-native.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,9 @@ var Alert = function( element ) {
triggerHandler = function(){ hasClass(alert,'fade') ? emulateTransitionEnd(alert,transitionEndHandler) : transitionEndHandler(); },
// handlers
clickHandler = function(e){
var eventTarget = e[target];
eventTarget = eventTarget[hasAttribute](dataDismiss) ? eventTarget : eventTarget[parentNode];
if (eventTarget && eventTarget[hasAttribute](dataDismiss)) { // we double check the data attribute, it's important
alert = getClosest(eventTarget,'.'+component);
element = queryElement('['+dataDismiss+'="'+component+'"]',alert);
(element === eventTarget || element === eventTarget[parentNode]) && alert && self.close();
}
alert = getClosest(e[target],'.'+component);
element = queryElement('['+dataDismiss+'="'+component+'"]',alert);
element && alert && (element === e[target] || element.contains(e[target])) && self.close();
},
transitionEndHandler = function(){
bootstrapCustomEvent.call(alert, closedEvent, component);
Expand Down
5 changes: 2 additions & 3 deletions lib/V3/button-native.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@ var Button = function( element, option ) {
}
},
toggle = function(e) {
var parent = e[target][parentNode],
label = e[target].tagName === LABEL ? e[target] : parent.tagName === LABEL ? parent : null; // the .btn label

var label = e[target].tagName === LABEL ? e[target] : e[target][parentNode].tagName === LABEL ? e[target][parentNode] : null; // the .btn label

if ( !label ) return; //react if a label or its immediate child is clicked

var eventTarget = this, // the button group, the target of the handler function
Expand Down
10 changes: 3 additions & 7 deletions lib/V4/alert-native.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,9 @@ var Alert = function( element ) {
triggerHandler = function(){ hasClass(alert,'fade') ? emulateTransitionEnd(alert,transitionEndHandler) : transitionEndHandler(); },
// handlers
clickHandler = function(e){
var eventTarget = e[target];
eventTarget = eventTarget[hasAttribute](dataDismiss) ? eventTarget : eventTarget[parentNode];
if (eventTarget && eventTarget[hasAttribute](dataDismiss)) { // we double check the data attribute, it's important
alert = getClosest(eventTarget,'.'+component);
element = queryElement('['+dataDismiss+'="'+component+'"]',alert);
(element === eventTarget || element === eventTarget[parentNode]) && alert && self.close();
}
alert = getClosest(e[target],'.'+component);
element = queryElement('['+dataDismiss+'="'+component+'"]',alert);
element && alert && (element === e[target] || element.contains(e[target])) && self.close();
},
transitionEndHandler = function(){
bootstrapCustomEvent.call(alert, closedEvent, component);
Expand Down
5 changes: 2 additions & 3 deletions lib/V4/button-native.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ var Button = function( element ) {

// private methods
toggle = function(e) {
var parent = e[target][parentNode],
label = e[target].tagName === LABEL ? e[target] : parent.tagName === LABEL ? parent : null; // the .btn label

var label = e[target].tagName === LABEL ? e[target] : e[target][parentNode].tagName === LABEL ? e[target][parentNode] : null; // the .btn label

if ( !label ) return; //react if a label or its immediate child is clicked

var eventTarget = this, // the button group, the target of the handler function
Expand Down

0 comments on commit bfd131c

Please sign in to comment.