Skip to content
This repository has been archived by the owner on Jan 6, 2019. It is now read-only.

Commit

Permalink
update to 1.6.1
Browse files Browse the repository at this point in the history 
check details on
https://github.com/Semantic-Org/Semantic-UI/blob/master/RELEASE-NOTES.md
  • Loading branch information
labby committed Jan 6, 2015
1 parent 5da55d1 commit 661b63c
Show file tree
Hide file tree
Showing 123 changed files with 28,951 additions and 49,612 deletions.
2 changes: 1 addition & 1 deletion dist/components/accordion.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* # Semantic UI
* # Semantic UI - 1.6.1
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*
Expand Down
123 changes: 88 additions & 35 deletions dist/components/accordion.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,31 @@ $.fn.accordion = function(parameters) {
$activeTitle
.addClass(className.active)
;
if(settings.animateChildren) {
if($.fn.transition !== undefined && $module.transition('is supported')) {
$activeContent
.children()
.transition({
animation : 'fade in',
useFailSafe : true,
debug : settings.debug,
verbose : settings.verbose,
duration : settings.duration
})
;
}
else {
$activeContent
.children()
.stop()
.animate({
opacity: 1
}, settings.duration, module.resetOpacity)
;
}
}
$activeContent
.stop()
.children()
.stop()
.animate({
opacity: 1
}, settings.duration, module.reset.display)
.end()
.slideDown(settings.duration, settings.easing, function() {
$activeContent
.addClass(className.active)
Expand Down Expand Up @@ -193,13 +210,32 @@ $.fn.accordion = function(parameters) {
$activeContent
.removeClass(className.active)
.show()
;
if(settings.animateChildren) {
if($.fn.transition !== undefined && $module.transition('is supported')) {
$activeContent
.children()
.transition({
animation : 'fade out',
useFailSafe : true,
debug : settings.debug,
verbose : settings.verbose,
duration : settings.duration
})
;
}
else {
$activeContent
.children()
.stop()
.animate({
opacity: 0
}, settings.duration, module.resetOpacity)
;
}
}
$activeContent
.stop()
.children()
.stop()
.animate({
opacity: 0
}, settings.duration, module.reset.opacity)
.end()
.slideUp(settings.duration, settings.easing, function() {
$.proxy(module.reset.display, this)();
$.proxy(settings.onClose, this)();
Expand Down Expand Up @@ -229,22 +265,39 @@ $.fn.accordion = function(parameters) {
else {
$openTitles = $activeAccordion.find(activeSelector).not($parentTitles);
$nestedTitles = $activeAccordion.find(activeContent).find(activeSelector).not($parentTitles);
$openTitles = $openTitles.not($nestedTitles);
$openTitles = $openTitles.not($nestedTitles);
$openContents = $openTitles.next($content);
}
if( ($openTitles.size() > 0) ) {
module.debug('Exclusive enabled, closing other content', $openTitles);
$openTitles
.removeClass(className.active)
;
if(settings.animateChildren) {
if($.fn.transition !== undefined && $module.transition('is supported')) {
$openContents
.children()
.transition({
animation : 'fade out',
useFailSafe : true,
debug : settings.debug,
verbose : settings.verbose,
duration : settings.duration
})
;
}
else {
$openContents
.children()
.stop()
.animate({
opacity: 0
}, settings.duration, module.resetOpacity)
;
}
}
$openContents
.stop()
.children()
.stop()
.animate({
opacity: 0
}, settings.duration, module.resetOpacity)
.end()
.slideUp(settings.duration , settings.easing, function() {
$(this).removeClass(className.active);
$.proxy(module.reset.display, this)();
Expand Down Expand Up @@ -459,23 +512,24 @@ $.fn.accordion = function(parameters) {

$.fn.accordion.settings = {

name : 'Accordion',
namespace : 'accordion',
name : 'Accordion',
namespace : 'accordion',

debug : false,
verbose : true,
performance : true,
debug : false,
verbose : true,
performance : true,

exclusive : true,
collapsible : true,
closeNested : false,
exclusive : true,
collapsible : true,
closeNested : false,
animateChildren : true,

duration : 500,
easing : 'easeInOutQuint',
duration : 500,
easing : 'easeOutQuint',

onOpen : function(){},
onClose : function(){},
onChange : function(){},
onOpen : function(){},
onClose : function(){},
onChange : function(){},

error: {
method : 'The method you called is not defined'
Expand All @@ -495,9 +549,8 @@ $.fn.accordion.settings = {

// Adds easing
$.extend( $.easing, {
easeInOutQuint: function (x, t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
return c/2*((t-=2)*t*t*t*t + 2) + b;
easeOutQuint: function (x, t, b, c, d) {
return c*((t=t/d-1)*t*t*t*t + 1) + b;
}
});

Expand Down
2 changes: 1 addition & 1 deletion dist/components/accordion.min.css
View file

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

4 changes: 2 additions & 2 deletions dist/components/accordion.min.js
View file

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

2 changes: 1 addition & 1 deletion dist/components/ad.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* # Semantic UI
* # Semantic UI - 1.6.1
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*
Expand Down
2 changes: 1 addition & 1 deletion dist/components/ad.min.css
View file

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

2 changes: 1 addition & 1 deletion dist/components/api.min.js
View file

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

2 changes: 1 addition & 1 deletion dist/components/breadcrumb.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* # Semantic UI
* # Semantic UI - 1.6.1
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*
Expand Down
2 changes: 1 addition & 1 deletion dist/components/breadcrumb.min.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* # Semantic UI
* # Semantic UI - 1.6.1
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*
Expand Down
Loading

0 comments on commit 661b63c

Please sign in to comment.