Skip to content

Commit

Permalink
added random effect & released 1.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Syl committed Dec 6, 2013
1 parent fa5b426 commit 12efef0
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 22 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@

## Changelog

03/12/2013 - **1.2.3.1**
06/12/2013 - **1.2.4**

* fixed undefined if no overlay
* added 'random' effect

03/12/2013 - **1.2.3**

Expand Down
3 changes: 1 addition & 2 deletions assets/js/doc/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ $(function() {
container: '#demo1_main_image',
cssClass: 'img-responsive'
},
caption: true,
effect: 'random'
caption: true
});

/* Second demo */
Expand Down
2 changes: 1 addition & 1 deletion assets/less/desoslide/jquery.desoslide.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Version 1.2.3.1
* Version 1.2.4
* jQuery: desoSlide plugin - jquery.desoslide.less
* Copyright - 2013 - https://github.com/sylouuu/desoslide
* This source code is under the MIT License
Expand Down
2 changes: 1 addition & 1 deletion desoslide.jquery.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"slider",
"thumbnail"
],
"version": "1.2.3.1",
"version": "1.2.4",
"author": {
"name": "sylouuu",
"url": "https://github.com/sylouuu"
Expand Down
2 changes: 1 addition & 1 deletion dist/css/jquery.desoslide.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Version 1.2.3.1
* Version 1.2.4
* jQuery: desoSlide plugin - jquery.desoslide.less
* Copyright - 2013 - https://github.com/sylouuu/desoslide
* This source code is under the MIT License
Expand Down
23 changes: 11 additions & 12 deletions dist/js/jquery.desoslide.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Version 1.2.3.1
* Version 1.2.4
* jQuery: desoSlide plugin - jquery.desoslide.js
* Copyright - 2013 - https://github.com/sylouuu/desoslide
* This source code is under the MIT License
Expand Down Expand Up @@ -168,11 +168,21 @@
*/
app.loadImages();

/**
* Removing spinner
*/
app.removeSpinner();

/**
* Adding wraper
*/
app.addWrapper();

/**
* Handling effect
*/
app.effectHandler();

/**
* Showing main image
*/
Expand Down Expand Up @@ -238,7 +248,6 @@
* Get a random effect
*/
current_effect = app.getRandomEffect();
console.log($(p.main.container).selector +': '+ current_effect);
} else {
/**
* Incorrect effect value
Expand Down Expand Up @@ -390,11 +399,6 @@
*/
app.checkData();

/**
* Handling transition effect
*/
app.effectHandler();

$(p.main.container).find('img').attr({
'src': src,
'alt': alt,
Expand Down Expand Up @@ -926,11 +930,6 @@
* All images are loaded
*/
$(window).load(function() {
/**
* Removing spinner
*/
app.removeSpinner();

/**
* Initializing
*/
Expand Down
8 changes: 7 additions & 1 deletion dist/js/jquery.desoslide.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,9 @@ <h3 id="options">Options</h3>
</tr>
<tr>
<td data-title="Options"><code>effect</code></td>
<td data-title="Values"><code>'fade'</code> <code>'sideFade'</code> <code>'sideFadeBig'</code> <code>'flip'</code> <code>'light'</code> <code>'roll'</code> <code>'rotate'</code></td>
<td data-title="Values"><code>'fade'</code> <code>'sideFade'</code> <code>'sideFadeBig'</code> <code>'flip'</code> <code>'light'</code> <code>'roll'</code> <code>'rotate'</code> <code>'random'</code></td>
<td data-title="Default"><code>'fade'</code></td>
<td data-title="Description">Transition effect provided by <a href="http://daneden.me/animate/">animate.css</a>.</td>
<td data-title="Description">Transition effect provided by <a href="http://daneden.me/animate/">animate.css</a>. <code>'random'</code> chose the effect for you.</td>
</tr>
<tr>
<td data-title="Options"><code>overlay</code></td>
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ <h3>... with thumbnails!</h3>
<span class="glyphicon glyphicon-download-alt"></span> Download
</a>
</li>
<li>Version 1.2.3.1</li>
<li>Version 1.2.4</li>
</ul>
</div>
<!-- [END] JUMBOTRON -->
Expand Down

0 comments on commit 12efef0

Please sign in to comment.