L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'm27_MDL-48805' of git://github.com/totara/moodle into MOODLE_27_STABLE

Browse Source
This commit is contained in:
David Monllao
2015-02-10 15:27:16 +08:00
parent c7b96ac18a 33f9b3b1e1
commit 812ed49a93
4 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap-debug.js
Vendored
+14 -11
View File
@@ -707,18 +707,21 @@ NS.setup_toggle_show = function() {
NS.toggle_show = function(e) {
// Toggle the active class on both the clicked .btn-navbar and the
// associated target, defined by a CSS selector string set as the
// data-target attribute on the .btn-navbar element in question.
//
// This will allow for us to have multiple .btn-navbar elements
// each with their own collapse/expand targets - these targets
// should be of class .nav-collapse.
var myTarget = this.get('parentNode').one(this.getAttribute('data-target'));
if (myTarget) {
this.siblings(".btn-navbar").removeClass(CSS.ACTIVE);
myTarget.siblings(".nav-collapse").removeClass(CSS.ACTIVE);
myTarget.toggleClass(CSS.ACTIVE);
// data-target attribute on the .btn-navbar element in question.
var navButtons = Y.all(SELECTORS.NAVBAR_BUTTON);
var currentOpen = this.hasClass(CSS.ACTIVE);
// Close all nav sections.
Y.each(navButtons, function(navButton) {
Y.all(navButton.getAttribute('data-target')).removeClass(CSS.ACTIVE);
});
navButtons.removeClass(CSS.ACTIVE);
if (!currentOpen) {
// Open the current Nav section
this.addClass(CSS.ACTIVE);
Y.all(this.getAttribute('data-target')).addClass(CSS.ACTIVE);
}
e.currentTarget.toggleClass(CSS.ACTIVE);
};
theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap-min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap.js
Vendored
+14 -11
View File
@@ -697,18 +697,21 @@ NS.setup_toggle_show = function() {
NS.toggle_show = function(e) {
// Toggle the active class on both the clicked .btn-navbar and the
// associated target, defined by a CSS selector string set as the
// data-target attribute on the .btn-navbar element in question.
//
// This will allow for us to have multiple .btn-navbar elements
// each with their own collapse/expand targets - these targets
// should be of class .nav-collapse.
var myTarget = this.get('parentNode').one(this.getAttribute('data-target'));
if (myTarget) {
this.siblings(".btn-navbar").removeClass(CSS.ACTIVE);
myTarget.siblings(".nav-collapse").removeClass(CSS.ACTIVE);
myTarget.toggleClass(CSS.ACTIVE);
// data-target attribute on the .btn-navbar element in question.
var navButtons = Y.all(SELECTORS.NAVBAR_BUTTON);
var currentOpen = this.hasClass(CSS.ACTIVE);
// Close all nav sections.
Y.each(navButtons, function(navButton) {
Y.all(navButton.getAttribute('data-target')).removeClass(CSS.ACTIVE);
});
navButtons.removeClass(CSS.ACTIVE);
if (!currentOpen) {
// Open the current Nav section
this.addClass(CSS.ACTIVE);
Y.all(this.getAttribute('data-target')).addClass(CSS.ACTIVE);
}
e.currentTarget.toggleClass(CSS.ACTIVE);
};
theme/bootstrapbase/yui/src/bootstrap/js/bootstrap.js
Vendored
+14 -11
View File
@@ -97,16 +97,19 @@ NS.setup_toggle_show = function() {
NS.toggle_show = function(e) {
// Toggle the active class on both the clicked .btn-navbar and the
// associated target, defined by a CSS selector string set as the
// data-target attribute on the .btn-navbar element in question.
//
// This will allow for us to have multiple .btn-navbar elements
// each with their own collapse/expand targets - these targets
// should be of class .nav-collapse.
var myTarget = this.get('parentNode').one(this.getAttribute('data-target'));
if (myTarget) {
this.siblings(".btn-navbar").removeClass(CSS.ACTIVE);
myTarget.siblings(".nav-collapse").removeClass(CSS.ACTIVE);
myTarget.toggleClass(CSS.ACTIVE);
// data-target attribute on the .btn-navbar element in question.
var navButtons = Y.all(SELECTORS.NAVBAR_BUTTON);
var currentOpen = this.hasClass(CSS.ACTIVE);
// Close all nav sections.
Y.each(navButtons, function(navButton) {
Y.all(navButton.getAttribute('data-target')).removeClass(CSS.ACTIVE);
});
navButtons.removeClass(CSS.ACTIVE);
if (!currentOpen) {
// Open the current Nav section
this.addClass(CSS.ACTIVE);
Y.all(this.getAttribute('data-target')).addClass(CSS.ACTIVE);
}
e.currentTarget.toggleClass(CSS.ACTIVE);
};