Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
shprink committed Jul 29, 2016
2 parents 3b18112 + a88f69d commit d4ef983
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 9 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<a name="1.0.2"></a>
### 1.0.2

* [BUG] Allow transitions to same state with different parameters <https://github.com/shprink/ionic-native-transitions/pull/126>

<a name="1.0.1"></a>
### 1.0.1

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ Disable native transition for one state (for instance on tabs)
# * @param {object} stateOptions default:{}
# * @param {object|null} transitionOptions default:null

$ionicNativeTransitions.stateGo('yourState', {}, {
$ionicNativeTransitions.stateGo('yourState', {}, {}, {
"type": "slide",
"direction": "up", // 'left|right|up|down', default 'left' (which is like 'next')
"duration": 1500, // in milliseconds (ms), default 400
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ionic-native-transitions",
"version": "1.0.1",
"version": "1.0.2",
"description": "Native transitions for Ionic applications",
"main": [
"dist/ionic-native-transitions.js"
Expand Down
6 changes: 4 additions & 2 deletions dist/ionic-native-transitions.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/ionic-native-transitions.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/ionic-native-transitions.min.js

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion lib/provider.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,12 @@ export default function () {
$log.debug('[native transition] cannot change state without a state...');
return;
}
if ($state.current.name === state && !stateOptions.reload) {

if ($state.is(state, stateParams) && !stateOptions.reload) {
$log.debug('[native transition] same state transition are not possible');
return;
}

unregisterToStateChangeStartEvent();
transition(transitionOptions);
return $timeout(() => $state.go(state, stateParams, stateOptions));
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ionic-native-transitions",
"version": "1.0.1",
"version": "1.0.2",
"description": "Native transitions for Ionic applications",
"main": "dist/ionic-native-transitions.js",
"scripts": {
Expand Down

0 comments on commit d4ef983

Please sign in to comment.