Skip to content

Commit

Permalink
Merge pull request jackmoore#796 from ronbak/master
Browse files Browse the repository at this point in the history
fixed typos
  • Loading branch information
jackmoore authored Sep 10, 2016
2 parents bac7812 + c2f5b78 commit 540e406
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ Files Changed: jquery.colorbox.js/jquery.colorbox-min.js

* Added 'innerWidth' and 'innerHeight' options to allow people to easily set the size dimensions for Colorbox, without having to anticipate the size of the borders and buttons.
* Renamed 'scrollbars' option to 'scrolling' to be in keeping with the existing HTML attribute. The option now also applies to iframes.
* Bug fix: In Safari, positioning occassionally incorrect when using '100%' dimensions.
* Bug fix: In Safari, positioning occasionally incorrect when using '100%' dimensions.
* Bug fix: In IE6, the background overlay is briefly not full size when first viewing.
* Bug fix: In Firefox, opening Colorbox causes a split second shift with a small minority of webpage layouts.
* Simplified code in a few areas.
Expand Down
4 changes: 2 additions & 2 deletions jquery.colorbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
$prev,
$close,
$groupControls,
$events = $('<a/>'), // $({}) would be prefered, but there is an issue with jQuery 1.4.2
$events = $('<a/>'), // $({}) would be preferred, but there is an issue with jQuery 1.4.2

// Variables for cached values or use across multiple functions
settings,
Expand Down Expand Up @@ -982,7 +982,7 @@
return;
}

// A small pause because some browsers will occassionaly report a
// A small pause because some browsers will occasionally report a
// img.width and img.height of zero immediately after the img.onload fires
setTimeout(function(){
var percent;
Expand Down

0 comments on commit 540e406

Please sign in to comment.