Permalink
Browse files

1.3.6b updates. See changelog for details.

  • Loading branch information...
1 parent 61c4d78 commit 87af4ea01db90cf57cb4f864d99e486806ccff1c @ericmmartin committed Jul 21, 2010
Showing with 207 additions and 133 deletions.
  1. +9 −0 ChangeLog.txt
  2. +18 −17 License.txt
  3. +2 −2 MIT-LICENSE.txt
  4. +1 −1 demo/index.html
  5. +2 −2 demo/js/gallery.js
  6. +3 −3 demo/js/jquery.simplemodal.js
  7. +132 −104 src/jquery.simplemodal.js
  8. +3 −0 test/index.html
  9. +3 −3 test/js/jquery.simplemodal.js
  10. +33 −0 test/js/simplemodal.js
  11. +1 −1 version.txt
View
@@ -1,5 +1,14 @@
==== SimpleModal ChangeLog ====
+== 1.3.6 ==
+ * Date: July 22, 2010
+ * Added bodyStretch option (to force overlay to fill window in IE6)
+ * Removed the autoResize and autoPosition options
+ * Changed meaning of the focus option
+ * Added update() function
+ * Changed setContainerDimensions fucntion code
+ * Fixed Opera screen painting issues
+
== 1.3.5 ==
* Date: April 19, 2010
* Switched back to using $.boxModal to support older versions of jQuery
View
@@ -1,20 +1,21 @@
-Copyright (c) 2009 Eric Martin http://ericmmartin.com
+You may use SimpleModal under the terms of either the MIT License or
+the GNU General Public License (GPL) Version 2.
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+The MIT License is recommended for most projects. It is simple and
+easy to understand and it places almost no restrictions on what you
+can do with SimpleModal.
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+If the GPL suits your project better you are also free to use
+SimpleModal under that license.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+You don�t have to do anything special to choose one license or the
+other and you don�t have to notify anyone which license you are using.
+
+You are free to use SimpleModal in commercial projects as long as the
+copyright header is left intact. If you would like to remove the
+SimpleModal copyright, please contact me (eric@ericmmartin.com) regarding
+re-licensing.
+
+Licenses
+MIT License (MIT-LICENSE.txt)
+GPL (GPL-LICENSE.txt)
View
@@ -1,4 +1,4 @@
-Copyright (c) 2007 John Resig, http://jquery.com/
+Copyright (c) 2010 Eric Martin http://ericmmartin.com
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
@@ -70,7 +70,7 @@
<!-- Start of Flickr Badge -->
<div id="flickr_badge_uber_wrapper">
<div id="flickr_badge_wrapper">
- <script type="text/javascript" src="http://www.flickr.com/badge_code_v2.gne?count=5&display=latest&size=s&layout=x&source=user_set&user=11678844%40N07&set=72157623117460038&context=in%2Fset-72157623117460038%2F"></script>
+ <script type="text/javascript" src="http://www.flickr.com/badge_code_v2.gne?show_name=1&count=5&display=random&size=t&layout=x&source=user_set&user=11678844%40N07&set=72157612224583954&context=in%2Fset-72157612224583954%2F"></script>
</div>
<div id="flickr_link">
<a href="http://www.flickr.com" id="flickr_www">www.<strong style="color:#3993ff">flick<span style="color:#ff1c92">r</span></strong>.com</a>
View
@@ -25,9 +25,9 @@ jQuery(function ($) {
closeHTML: '',
overlayId: 'gallery-overlay',
containerId: 'gallery-container',
- containerCss: {left:0, top:'10%', width:'100%'},
+ containerCss: {left:0, width:'100%'},
opacity: 80,
- autoPosition: false,
+ position: ['10%', null],
onOpen: G.open,
onClose: G.close
});

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 87af4ea

Please sign in to comment.