Skip to content

Commit

Permalink
Fixed actors list not being corectly sorted. Bumped version to 1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
SandroHc committed Feb 25, 2017
1 parent 17ef8a7 commit b293f5a
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/assets/js/config.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ regions = [
]

CONFIG =
version: '1.1.0'
version: '1.1.1'
default_lang: 'pt'
lang: this.default_lang
default_region: '0' # Brazil
Expand Down
2 changes: 1 addition & 1 deletion src/assets/js/functions.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ sort_assets = () ->
comparator = (a, b) ->
a = a.name.toUpperCase()
b = b.name.toUpperCase()
return a < b ? 1 : a > b ? -1 : 0
return if a < b then -1 else if a > b then 1 else 0

# ASSETS.scenes.sort comparator
ASSETS.avatars.sort comparator
Expand Down
15 changes: 8 additions & 7 deletions src/dist/js/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ regions = [
];

CONFIG = {
version: '1.1.0',
version: '1.1.1',
default_lang: 'pt',
lang: this.default_lang,
default_region: '0',
Expand Down Expand Up @@ -5732,14 +5732,15 @@ draw_avatar = function(is_portrait, dest) {
sort_assets = function() {
var comparator;
comparator = function(a, b) {
var ref, ref1;
a = a.name.toUpperCase();
b = b.name.toUpperCase();
return (ref = a < b) != null ? ref : {
1: (ref1 = a > b) != null ? ref1 : -{
1: 0
}
};
if (a < b) {
return -1;
} else if (a > b) {
return 1;
} else {
return 0;
}
};
ASSETS.avatars.sort(comparator);
return ASSETS.emotions.sort(comparator);
Expand Down
4 changes: 2 additions & 2 deletions src/dist/js/bundle.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,6 @@
<!-- CDN: http://code.interactjs.io/v1.2.6/interact.min.js -->
<script src="dist/js/libs/interact.min.js" onload="init_drag()" async defer></script>

<script src="dist/js/bundle.js"></script>
<script src="dist/js/bundle.min.js"></script>
</body>
</html>

0 comments on commit b293f5a

Please sign in to comment.