Skip to content

Commit

Permalink
Merge branch 'release/1.0.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianstein committed Aug 17, 2016
2 parents 8ad6c8c + 486ff0a commit f975042
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions Resources/Private/JavaScript/In2studyfinder.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
filterHandling.init();
paginationHandling.init();
uiBehaviour.checkboxHandling();

if (readFilterFromUrl) {
readFilterFromUrl = false;
if (window.location.hash) {
var paginationPage = urlHandling.loadSelectedOptionsFromUrl();
filterHandling.filterChanged(paginationPage);
}
}
//if (readFilterFromUrl) {
// readFilterFromUrl = false;
// if (window.location.hash) {
// console.log('URL');
// var paginationPage = urlHandling.loadSelectedOptionsFromUrl();
// filterHandling.filterChanged(paginationPage);
// }
//}
}
};
}
Expand Down
2 changes: 1 addition & 1 deletion Resources/Public/JavaScript/In2studyfinder.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 ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
'uploadfolder' => '0',
'createDirs' => '',
'clearCacheOnLoad' => 0,
'version' => '1.0.9',
'version' => '1.0.10',
'constraints' => array(
'depends' => array(
'typo3' => '6.2.0-7.6.99',
Expand Down

0 comments on commit f975042

Please sign in to comment.