Skip to content

Commit

Permalink
#42, #43: isIE function fixed and onReady callback added in config
Browse files Browse the repository at this point in the history
  • Loading branch information
creativeaura committed May 12, 2014
1 parent d6c0069 commit 0f38564
Show file tree
Hide file tree
Showing 16 changed files with 81 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ npm-debug.log
.c9revisions/README.md.c9save
node_modules
.idea
deploy
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 1.0.9 (May 12th, 2014)

- BUG - base.browser.isIE returns TRUE on non IE browser [Issue #43](https://github.com/creativeaura/threesixty-slider/issues/43)
- Feature - Trigger "ready" event [Issue #42](https://github.com/creativeaura/threesixty-slider/issues/42)

## 1.0.8 (April 3rd, 2014)

- Missing drag flag added to disable drag and swipe events [Issue #40](https://github.com/creativeaura/threesixty-slider/issues/40)
Expand Down
19 changes: 18 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,23 @@ require('time-grunt')(grunt);
createTag: false,
push: false
}
}
},
usemin: {
html: 'deploy/*.html'
},
copy: {
deploy: {
files: [
{expand: true, cwd: 'demo/', src: ['**'], dest: 'deploy/'}
]
},
dist: {
files: [
{expand: true, flatten: true, src: ['dist/threesixty.min.js'], dest: 'deploy/js/', filter: 'isFile'},
{expand: true, flatten: true, src: ['dist/threesixty.min.js'], dest: 'demo/js/', filter: 'isFile'}
]
}
}
});

// Load the plugin that provides the "uglify" task.
Expand All @@ -84,5 +100,6 @@ require('time-grunt')(grunt);
// Default task(s).
grunt.registerTask('default', ['jshint', 'uglify']);
grunt.registerTask('build', ['uglify']);
grunt.registerTask('deploy', ['copy:deploy', 'usemin:html', 'copy:dist']);
grunt.registerTask('demo', ['connect:demo']);
};
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![Three Sixty Image slider plugin](https://raw.github.com/creativeaura/threesixty-slider/master/images/360.png)


Three Sixty Image slider plugin v1.0.8
Three Sixty Image slider plugin v1.0.9
=================

[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/creativeaura/threesixty-slider/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
Expand Down Expand Up @@ -147,6 +147,9 @@ Here are the list of config value you can pass in while you initilize your 360 s
<tr>
<td>responsive</td><td>false</td><td>Boolean</td><td>Enable responsive width for 360</td>
</tr>
<tr>
<td>onReady</td><td>function() {}</td><td>Function</td><td>Callback triggers once all images are loaded and ready to render on the screen</td>
</tr>
</table>

Demo
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "threesixty-slider",
"description": "360 degree Image Slider",
"main": "dist/threesixty.min.js",
"version": "1.0.8",
"version": "1.0.9",
"ignore": [
".jshintrc",
".editorconfig",
Expand Down
2 changes: 2 additions & 0 deletions demo/custom_controls.html
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,9 @@ <h3>This plugin is supported in all browsers including our beloved IE 6</h3>
</div>
</section>
<script src="js/jquery-1.8.3.min.js"></script>
<!-- build:js js/threesixty.min.js -->
<script type="text/javascript" src='../src/threesixty.js'></script>
<!-- endbuild -->
<script type="text/javascript" src="js/prism.js"></script>
<script type="text/javascript">
window.onload = init;
Expand Down
9 changes: 7 additions & 2 deletions demo/default_control.html
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@ <h3>This plugin is supported in all browsers including our beloved IE 6</h3>
</div>
</section>
<script src="js/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src='../dist/threesixty.min.js'></script>
<!-- build:js js/threesixty.min.js -->
<script type="text/javascript" src='../src/threesixty.js'></script>
<!-- endbuild -->
<script type="text/javascript" src="js/prism.js"></script>
<script type="text/javascript">
window.onload = init;
Expand All @@ -176,7 +178,10 @@ <h3>This plugin is supported in all browsers including our beloved IE 6</h3>
height: 447,
width: 1000,
navigation: true,
disableSpin: false
disableSpin: false,
onReady: function () {
//
}
});

}
Expand Down
2 changes: 2 additions & 0 deletions demo/full_page_scrolling.html
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,9 @@ <h3>This plugin is supported in all browsers including our beloved IE 6</h3>
</div>
</section>
<script src="js/jquery-1.8.3.min.js"></script>
<!-- build:js js/threesixty.min.js -->
<script type="text/javascript" src='../src/threesixty.js'></script>
<!-- endbuild -->
<script type="text/javascript" src="js/prism.js"></script>
<script type="text/javascript">
window.onload = init;
Expand Down
2 changes: 2 additions & 0 deletions demo/img_array.html
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,9 @@ <h3>This plugin is supported in all browsers including our beloved IE 6</h3>
</div>
</section>
<script src="js/jquery-1.10.2.min.js"></script>
<!-- build:js js/threesixty.min.js -->
<script type="text/javascript" src='../src/threesixty.js'></script>
<!-- endbuild -->
<script type="text/javascript" src="js/prism.js"></script>
<script type="text/javascript">
window.onload = init;
Expand Down
4 changes: 3 additions & 1 deletion demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ <h3>This plugin is supported in all browsers including our beloved IE 6</h3>
</div>
</section>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
<script type="text/javascript" src='../dist/threesixty.min.js'></script>
<!-- build:js js/threesixty.min.js -->
<script type="text/javascript" src='../src/threesixty.js'></script>
<!-- endbuild -->
</body>

</html>
2 changes: 2 additions & 0 deletions demo/multiple_sliders.html
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,9 @@ <h3>This plugin is supported in all browsers including our beloved IE 6</h3>
</div>
</section>
<script src="js/jquery-1.8.3.min.js"></script>
<!-- build:js js/threesixty.min.js -->
<script type="text/javascript" src='../src/threesixty.js'></script>
<!-- endbuild -->
<script type="text/javascript" src="js/prism.js"></script>
<script type="text/javascript">
window.onload = init;
Expand Down
2 changes: 2 additions & 0 deletions demo/plugins.html
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,9 @@ <h3>This plugin is supported in all browsers including our beloved IE 6</h3>
</div>
</section>
<script src="js/jquery-1.8.3.min.js"></script>
<!-- build:js js/threesixty.min.js -->
<script type="text/javascript" src='../src/threesixty.js'></script>
<!-- endbuild -->
<script type="text/javascript" src='../src/plugins/threesixty.fullscreen.js'></script>
<script type="text/javascript" src="js/prism.js"></script>
<script type="text/javascript">
Expand Down
2 changes: 2 additions & 0 deletions demo/responsive.html
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ <h3 id="myModalLabel">Modal header</h3>
</div>
</section>
<script src="js/jquery-1.8.3.min.js"></script>
<!-- build:js js/threesixty.min.js -->
<script type="text/javascript" src='../src/threesixty.js'></script>
<!-- endbuild -->
<script type="text/javascript" src="js/prism.js"></script>
<script type="text/javascript">
window.onload = init;
Expand Down
4 changes: 2 additions & 2 deletions dist/threesixty.min.js

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

Loading

0 comments on commit 0f38564

Please sign in to comment.