Skip to content

Commit

Permalink
Merge pull request #141 from Strategery-Inc/damian/release-3-2-3
Browse files Browse the repository at this point in the history
- V. 3.2.3
  • Loading branch information
damian-pastorini committed Feb 5, 2016
2 parents 24ca717 + 85fcb85 commit 4ba72af
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 13 deletions.
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@ If you have a different theme other than the default, you will need to copy the
<td>Repository</td><td>https://github.com/webcreate/infinite-ajax-scroll</td>
</tr>
</table>

### Development Notes
To hook to window.ias you need to listen the window.onload event:

`jQuery(window).load(function() {
console.log('window load jquery');
console.log(window.ias);
});`

------------------
### Release Notes
##### v3.1.0
Expand Down
7 changes: 3 additions & 4 deletions app/code/community/Strategery/Infinitescroll/Helper/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
*
* @author Gabriel Somoza (me@gabrielsomoza.com)
* @link http://gabrielsomoza.com/
*
* Update 2.0.0
* @author Damian A. Pastorini (admin@dwdesigner.com)
* @link http://www.dwdesigner.com/
*
* @author Damian A. Pastorini (damian.pastorini@dwdeveloper.com)
* @link http://www.dwdeveloper.com/
*/
class Strategery_Infinitescroll_Helper_Data extends Mage_Core_Helper_Abstract
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
* @author Gabriel Somoza (me@gabrielsomoza.com)
* @link http://gabrielsomoza.com/
*
* Update 2.0.0
* @author Enrique Piatti (contacto@enriquepiatti.com)
* @link http://www.dwdesigner.com/
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
* @author Gabriel Somoza (me@gabrielsomoza.com)
* @link http://gabrielsomoza.com/
*
* Update 2.0.0
* @author Enrique Piatti (contacto@enriquepiatti.com)
* @link http://www.dwdesigner.com/
*/
Expand Down
22 changes: 22 additions & 0 deletions app/code/community/Strategery/Infinitescroll/etc/adminhtml.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,26 @@
<?xml version="1.0"?>
<!--
/**
* InfiniteScroll - Magento Integration
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0),
* available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
*
* @category Strategery
* @package Strategery_Infinitescroll
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* @copyright Copyright (c) 2014 Strategery Inc. (http://usestrategery.com)
*
* @author Gabriel Somoza (me@gabrielsomoza.com)
* @link http://gabrielsomoza.com/
*
* @author Damian A. Pastorini (damian.pastorini@dwdeveloper.com)
* @link http://www.dwdeveloper.com/
*/
-->
<config>
<acl>
<resources>
Expand Down
6 changes: 3 additions & 3 deletions app/code/community/Strategery/Infinitescroll/etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
* @author Gabriel Somoza (me@gabrielsomoza.com)
* @link http://gabrielsomoza.com/
*
* @author Damian A. Pastorini (admin@dwdesigner.com)
* @link http://www.dwdesigner.com/
* @author Damian A. Pastorini (damian.pastorini@dwdeveloper.com)
* @link http://www.dwdeveloper.com/
*/
-->
<config>
<modules>
<Strategery_Infinitescroll>
<version>3.2.2</version>
<version>3.2.3</version>
</Strategery_Infinitescroll>
</modules>
<global>
Expand Down
5 changes: 2 additions & 3 deletions app/code/community/Strategery/Infinitescroll/etc/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
* @author Gabriel Somoza (me@gabrielsomoza.com)
* @link http://gabrielsomoza.com/
*
* Update 2.0.0
* @author Damian A. Pastorini (admin@dwdesigner.com)
* @link http://www.dwdesigner.com/
* @author Damian A. Pastorini (damian.pastorini@dwdeveloper.com)
* @link http://www.dwdeveloper.com/
*/
-->
<config>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
* @copyright Copyright (c) 2014 Strategery Inc. (http://usestrategery.com)
*
* @author Enrique Piatti (contacto@enriquepiatti.com)
*
* @author Damian A. Pastorini (damian.pastorini@dwdeveloper.com)
* @link http://www.dwdeveloper.com/
*/
?>
<?php if($this->isEnabled()): ?>
Expand Down Expand Up @@ -178,7 +181,7 @@
}

SgyIAS._log('Done loading IAS.');
$(document).trigger( "infiniteScrollReady", [window.ias]);
$(document).trigger( "infiniteScrollReady", [window.ias]);
});
});
}
Expand Down

0 comments on commit 4ba72af

Please sign in to comment.