Skip to content

Commit 17cfd05

Browse files
Updated distribution to version 2.2.0
1 parent e761c14 commit 17cfd05

File tree

145 files changed

+10065
-5074
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+10065
-5074
lines changed

components/accordion.css

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
/*!
2-
* # Semantic UI 2.1.7 - Accordion
2+
* # Semantic UI 2.2.0 - Accordion
33
* http://github.com/semantic-org/semantic-ui/
44
*
55
*
6-
* Copyright 2015 Contributors
76
* Released under the MIT license
87
* http://opensource.org/licenses/MIT
98
*
@@ -64,8 +63,10 @@
6463
margin: 0em 0.25rem 0em 0rem;
6564
padding: 0em;
6665
font-size: 1em;
67-
-webkit-transition: -webkit-transform 0.1s ease, opacity 0.1s ease;
68-
transition: transform 0.1s ease, opacity 0.1s ease;
66+
-webkit-transition: opacity 0.1s ease, -webkit-transform 0.1s ease;
67+
transition: opacity 0.1s ease, -webkit-transform 0.1s ease;
68+
transition: transform 0.1s ease, opacity 0.1s ease;
69+
transition: transform 0.1s ease, opacity 0.1s ease, -webkit-transform 0.1s ease;
6970
vertical-align: baseline;
7071
-webkit-transform: none;
7172
-ms-transform: none;
@@ -129,7 +130,7 @@
129130
.ui.styled.accordion,
130131
.ui.styled.accordion .accordion {
131132
border-radius: 0.28571429rem;
132-
background: #ffffff;
133+
background: #FFFFFF;
133134
box-shadow: 0px 1px 2px 0 rgba(34, 36, 38, 0.15), 0px 0px 0px 1px rgba(34, 36, 38, 0.15);
134135
}
135136
.ui.styled.accordion .title,
@@ -140,7 +141,7 @@
140141
font-weight: bold;
141142
border-top: 1px solid rgba(34, 36, 38, 0.15);
142143
-webkit-transition: background 0.1s ease, color 0.1s ease;
143-
transition: background 0.1s ease, color 0.1s ease;
144+
transition: background 0.1s ease, color 0.1s ease;
144145
}
145146
.ui.styled.accordion > .title:first-child,
146147
.ui.styled.accordion .accordion .title:first-child {

components/accordion.js

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
/*!
2-
* # Semantic UI 2.1.7 - Accordion
2+
* # Semantic UI 2.2.0 - Accordion
33
* http://github.com/semantic-org/semantic-ui/
44
*
55
*
6-
* Copyright 2015 Contributors
76
* Released under the MIT license
87
* http://opensource.org/licenses/MIT
98
*
@@ -13,6 +12,13 @@
1312

1413
"use strict";
1514

15+
window = (typeof window != 'undefined' && window.Math == Math)
16+
? window
17+
: (typeof self != 'undefined' && self.Math == Math)
18+
? self
19+
: Function('return this')()
20+
;
21+
1622
$.fn.accordion = function(parameters) {
1723
var
1824
$allModules = $(this),
@@ -367,7 +373,12 @@ $.fn.accordion = function(parameters) {
367373
$.extend(true, settings, name);
368374
}
369375
else if(value !== undefined) {
370-
settings[name] = value;
376+
if($.isPlainObject(settings[name])) {
377+
$.extend(true, settings[name], value);
378+
}
379+
else {
380+
settings[name] = value;
381+
}
371382
}
372383
else {
373384
return settings[name];
@@ -388,7 +399,7 @@ $.fn.accordion = function(parameters) {
388399
}
389400
},
390401
debug: function() {
391-
if(settings.debug) {
402+
if(!settings.silent && settings.debug) {
392403
if(settings.performance) {
393404
module.performance.log(arguments);
394405
}
@@ -399,7 +410,7 @@ $.fn.accordion = function(parameters) {
399410
}
400411
},
401412
verbose: function() {
402-
if(settings.verbose && settings.debug) {
413+
if(!settings.silent && settings.verbose && settings.debug) {
403414
if(settings.performance) {
404415
module.performance.log(arguments);
405416
}
@@ -410,8 +421,10 @@ $.fn.accordion = function(parameters) {
410421
}
411422
},
412423
error: function() {
413-
module.error = Function.prototype.bind.call(console.error, console, settings.name + ':');
414-
module.error.apply(console, arguments);
424+
if(!settings.silent) {
425+
module.error = Function.prototype.bind.call(console.error, console, settings.name + ':');
426+
module.error.apply(console, arguments);
427+
}
415428
},
416429
performance: {
417430
log: function(message) {
@@ -544,6 +557,7 @@ $.fn.accordion.settings = {
544557
name : 'Accordion',
545558
namespace : 'accordion',
546559

560+
silent : false,
547561
debug : false,
548562
verbose : false,
549563
performance : true,

components/accordion.min.css

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)