Skip to content

Commit

Permalink
]Merge branch 'master' of github.com:Semantic-Org/Semantic-UI into next
Browse files Browse the repository at this point in the history
Conflicts:
	RELEASE-NOTES.md
	dist/semantic.min.css
	package.json
  • Loading branch information
jlukic committed Jan 12, 2015
2 parents 91ab032 + 862adba commit 175b84b
Show file tree
Hide file tree
Showing 121 changed files with 291 additions and 273 deletions.
18 changes: 16 additions & 2 deletions RELEASE-NOTES.md
Expand Up @@ -9,9 +9,8 @@
**Enhancements**
- **Sidebar** - Having a sidebar visible on page load is now much simpler. You can include ``ui visible sidebar`` on page load to have a sidebar element appear on page load. To close call `$('.ui.sidebar').sidebar('hide')`


**Code / Build**
- **Build** - `Dist/` files now have file permissions `644` by default. Can adjust in `semantic.json`. You will need to run `npm install` to add the new gulp-chmod dependency *Thanks @PeterDaveHello*
- **Build** - `Dist/` files now set file permissions in build. `644` by default. Can adjust in `semantic.json` or during gulp install. You will need to run `npm install` to add the new gulp-chmod dependency *Thanks @PeterDaveHello*
- **Modules** - Remove use of deprecated `.size()` for `.length` across all modules
- **Modules** - Use of `$.proxy` swapped to native `function.call()` for performance gains across all modules

Expand All @@ -22,6 +21,21 @@
- **Steps** - Steps now use ``table-cell`` to allow steps to be equal height by default, even with different content height.
- **Button** - Fix issue with labeled icon groups in material theme

### Version 1.6.4 - January 12, 2015

- `1.6.3` contained an unintentional character at beginning of `label.less` re-released as `1.6.4`

**Bugs**
- **Build** - Fix CSS property typo in list icon, and label causing issues with some custom build tools

### Version 1.6.3 - January 12, 2015

- `1.6.3` contained an unintentional character at beginning of `label.less` re-released as `1.6.4`

**Bugs**
- **Build** - Fix CSS property typo in list icon, and label causing issues with some custom build tools
- **Label** - Fix attached labels to have correct border radius inside of attached segments of all kinds

### Version 1.6.2 - January 06, 2015

**Site Variables**
Expand Down
2 changes: 1 addition & 1 deletion dist/components/accordion.css
@@ -1,5 +1,5 @@
/*
* # Semantic UI - 1.6.2
* # Semantic UI - 1.7.0
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*
Expand Down
2 changes: 1 addition & 1 deletion dist/components/accordion.min.css

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/accordion.min.js

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
@@ -1,5 +1,5 @@
/*
* # Semantic UI - 1.6.2
* # Semantic UI - 1.7.0
* 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

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

16 changes: 8 additions & 8 deletions dist/components/api.js
Expand Up @@ -342,27 +342,27 @@ $.api = $.fn.api = function(parameters) {
request: {
complete: function(response) {
module.remove.loading();
$.proxy(settings.onComplete, context)(response, $module);
settings.onComplete.call(context, response, $module);
},
done: function(response) {
module.debug('API Response Received', response);
if(settings.dataType == 'json') {
if( $.isFunction(settings.successTest) ) {
module.debug('Checking JSON returned success', settings.successTest, response);
if( settings.successTest(response) ) {
$.proxy(settings.onSuccess, context)(response, $module);
settings.onSuccess.call(context, response, $module);
}
else {
module.debug('JSON test specified by user and response failed', response);
$.proxy(settings.onFailure, context)(response, $module);
settings.onFailure.call(context, response, $module);
}
}
else {
$.proxy(settings.onSuccess, context)(response, $module);
settings.onSuccess.call(context, response, $module);
}
}
else {
$.proxy(settings.onSuccess, context)(response, $module);
settings.onSuccess.call(context, response, $module);
}
},
error: function(xhr, status, httpMessage) {
Expand Down Expand Up @@ -401,10 +401,10 @@ $.api = $.fn.api = function(parameters) {
setTimeout(module.remove.error, settings.errorDuration);
}
module.debug('API Request error:', errorMessage);
$.proxy(settings.onError, context)(errorMessage, context);
settings.onError.call(context, errorMessage, $module);
}
else {
$.proxy(settings.onAbort, context)(errorMessage, context);
settings.onAbort.call(context, errorMessage, $module);
module.debug('Request Aborted (Most likely caused by page change or CORS Policy)', status, httpMessage);
}
}
Expand Down Expand Up @@ -462,7 +462,7 @@ $.api = $.fn.api = function(parameters) {
var
runSettings
;
runSettings = $.proxy(settings.beforeSend, $module)(settings);
runSettings = settings.beforeSend.call($module, settings);
if(runSettings) {
if(runSettings.success !== undefined) {
module.debug('Legacy success callback detected', runSettings);
Expand Down
4 changes: 2 additions & 2 deletions dist/components/api.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/components/breadcrumb.css
@@ -1,5 +1,5 @@
/*
* # Semantic UI - 1.6.2
* # Semantic UI - 1.7.0
* 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
@@ -1,5 +1,5 @@
/*
* # Semantic UI - 1.6.2
* # Semantic UI - 1.7.0
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*
Expand Down
2 changes: 1 addition & 1 deletion dist/components/button.css
@@ -1,5 +1,5 @@
/*
* # Semantic UI - 1.6.2
* # Semantic UI - 1.7.0
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*
Expand Down
2 changes: 1 addition & 1 deletion dist/components/button.min.css

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/card.css
@@ -1,5 +1,5 @@
/*
* # Semantic UI - 1.6.2
* # Semantic UI - 1.7.0
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*
Expand Down
2 changes: 1 addition & 1 deletion dist/components/card.min.css

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/checkbox.css
@@ -1,5 +1,5 @@
/*
* # Semantic UI - 1.6.2
* # Semantic UI - 1.7.0
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*
Expand Down
2 changes: 1 addition & 1 deletion dist/components/checkbox.min.css

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/checkbox.min.js

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/comment.css
@@ -1,5 +1,5 @@
/*
* # Semantic UI - 1.6.2
* # Semantic UI - 1.7.0
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*
Expand Down
2 changes: 1 addition & 1 deletion dist/components/comment.min.css

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/dimmer.css
@@ -1,5 +1,5 @@
/*
* # Semantic UI - 1.6.2
* # Semantic UI - 1.7.0
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*
Expand Down
8 changes: 4 additions & 4 deletions dist/components/dimmer.js
Expand Up @@ -172,8 +172,8 @@ $.fn.dimmer = function(parameters) {
module.debug('Showing dimmer', $dimmer, settings);
if( (!module.is.dimmed() || module.is.animating()) && module.is.enabled() ) {
module.animate.show(callback);
$.proxy(settings.onShow, element)();
$.proxy(settings.onChange, element)();
settings.onShow.call(element);
settings.onChange.call(element);
}
else {
module.debug('Dimmer is already shown or disabled');
Expand All @@ -188,8 +188,8 @@ $.fn.dimmer = function(parameters) {
if( module.is.dimmed() || module.is.animating() ) {
module.debug('Hiding dimmer', $dimmer);
module.animate.hide(callback);
$.proxy(settings.onHide, element)();
$.proxy(settings.onChange, element)();
settings.onHide.call(element);
settings.onChange.call(element);
}
else {
module.debug('Dimmer is not visible');
Expand Down
2 changes: 1 addition & 1 deletion dist/components/dimmer.min.css

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

0 comments on commit 175b84b

Please sign in to comment.