Skip to content

Commit 87af4ea

Browse files
ericmmartinericmmartin
committed
1.3.6b updates. See changelog for details.
1 parent 61c4d78 commit 87af4ea

File tree

11 files changed

+207
-133
lines changed

11 files changed

+207
-133
lines changed

‎ChangeLog.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
==== SimpleModal ChangeLog ====
22

3+
== 1.3.6 ==
4+
* Date: July 22, 2010
5+
* Added bodyStretch option (to force overlay to fill window in IE6)
6+
* Removed the autoResize and autoPosition options
7+
* Changed meaning of the focus option
8+
* Added update() function
9+
* Changed setContainerDimensions fucntion code
10+
* Fixed Opera screen painting issues
11+
312
== 1.3.5 ==
413
* Date: April 19, 2010
514
* Switched back to using $.boxModal to support older versions of jQuery

‎License.txt

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
Copyright (c) 2009 Eric Martin http://ericmmartin.com
1+
You may use SimpleModal under the terms of either the MIT License or
2+
the GNU General Public License (GPL) Version 2.
23

3-
Permission is hereby granted, free of charge, to any person obtaining
4-
a copy of this software and associated documentation files (the
5-
"Software"), to deal in the Software without restriction, including
6-
without limitation the rights to use, copy, modify, merge, publish,
7-
distribute, sublicense, and/or sell copies of the Software, and to
8-
permit persons to whom the Software is furnished to do so, subject to
9-
the following conditions:
4+
The MIT License is recommended for most projects. It is simple and
5+
easy to understand and it places almost no restrictions on what you
6+
can do with SimpleModal.
107

11-
The above copyright notice and this permission notice shall be
12-
included in all copies or substantial portions of the Software.
8+
If the GPL suits your project better you are also free to use
9+
SimpleModal under that license.
1310

14-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
11+
You don�t have to do anything special to choose one license or the
12+
other and you don�t have to notify anyone which license you are using.
13+
14+
You are free to use SimpleModal in commercial projects as long as the
15+
copyright header is left intact. If you would like to remove the
16+
SimpleModal copyright, please contact me (eric@ericmmartin.com) regarding
17+
re-licensing.
18+
19+
Licenses
20+
MIT License (MIT-LICENSE.txt)
21+
GPL (GPL-LICENSE.txt)

‎MIT-LICENSE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2007 John Resig, http://jquery.com/
1+
Copyright (c) 2010 Eric Martin http://ericmmartin.com
22

33
Permission is hereby granted, free of charge, to any person obtaining
44
a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
1717
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
1818
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
1919
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
20+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎demo/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ <h3>Basic Modal Dialog</h3>
7070
<!-- Start of Flickr Badge -->
7171
<div id="flickr_badge_uber_wrapper">
7272
<div id="flickr_badge_wrapper">
73-
<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>
73+
<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>
7474
</div>
7575
<div id="flickr_link">
7676
<a href="http://www.flickr.com" id="flickr_www">www.<strong style="color:#3993ff">flick<span style="color:#ff1c92">r</span></strong>.com</a>

‎demo/js/gallery.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jQuery(function ($) {
2525
closeHTML: '',
2626
overlayId: 'gallery-overlay',
2727
containerId: 'gallery-container',
28-
containerCss: {left:0, top:'10%', width:'100%'},
28+
containerCss: {left:0, width:'100%'},
2929
opacity: 80,
30-
autoPosition: false,
30+
position: ['10%', null],
3131
onOpen: G.open,
3232
onClose: G.close
3333
});

‎demo/js/jquery.simplemodal.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)