Skip to content

Square dimensions recalculated to allow selection of full color range #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benjaminmueller wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −16
Open

Square dimensions recalculated to allow selection of full color range #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dist/iris-basic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*! Iris Color Picker - v1.0.7 - 2014-11-28
/*! Iris Color Picker - v1.0.7 - 2015-03-11
* https://github.com/Automattic/Iris
* Copyright (c) 2014 Matt Wiebe; Licensed GPLv2 */
* Copyright (c) 2015 Matt Wiebe; Licensed GPLv2 */
(function( $, undef ){
var _html, nonGradientIE, gradientType, vendorPrefixes, _css, Iris, UA, isIE, IEVersion;

Expand Down Expand Up @@ -763,8 +763,8 @@

control = this.controls.squareDrag;
dimensions = {
w: square.width(),
h: square.height()
w: square.width() - control.width(),
h: square.height() - control.height()
};
square.data( 'dimensions', dimensions );
return dimensions;
Expand Down
6 changes: 3 additions & 3 deletions dist/iris-basic.min.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dist/iris.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*! Iris Color Picker - v1.0.7 - 2014-11-28
/*! Iris Color Picker - v1.0.7 - 2015-03-11
* https://github.com/Automattic/Iris
* Copyright (c) 2014 Matt Wiebe; Licensed GPLv2 */
* Copyright (c) 2015 Matt Wiebe; Licensed GPLv2 */
(function( $, undef ){
var _html, nonGradientIE, gradientType, vendorPrefixes, _css, Iris, UA, isIE, IEVersion;

Expand Down Expand Up @@ -763,8 +763,8 @@

control = this.controls.squareDrag;
dimensions = {
w: square.width(),
h: square.height()
w: square.width() - control.width(),
h: square.height() - control.height()
};
square.data( 'dimensions', dimensions );
return dimensions;
Expand Down
Loading