Skip to content

Commit

Permalink
Added UMD.
Browse files Browse the repository at this point in the history
  • Loading branch information
istvan-ujjmeszaros committed Apr 12, 2018
1 parent df1d9e5 commit e5a9451
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 15 deletions.
2 changes: 1 addition & 1 deletion bootstrap-colorpickersliders.jquery.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"widget",
"colorchooser"
],
"version": "3.1.0",
"version": "3.1.1",
"author": {
"name": "István Ujj-Mészáros",
"url": "https://github.com/istvan-ujjmeszaros"
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-colorpickersliders",
"version": "3.1.0",
"version": "3.1.1",
"homepage": "https://www.virtuosoft.eu/code/bootstrap-colorpickersliders/",
"authors": [
{
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
],
"description": "Bootstrap 3 optimized responsive color selector with HSV, HSL, RGB and CIE-Lch (which supports human perceived lightness) selectors and color swatches.",
"homepage": "http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/",
"version": "3.1.0",
"version": "3.1.1",
"authors": [
{
"name": "István Ujj-Mészáros",
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions index.html → demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet" type="text/css" media="all">
<link href="//cdnjs.cloudflare.com/ajax/libs/prettify/r298/prettify.min.css" rel="stylesheet" type="text/css" media="all">
<link href="demo.css" rel="stylesheet" type="text/css" media="all">
<link href="src/bootstrap.colorpickersliders.css" rel="stylesheet" type="text/css" media="all">
<link href="../src/bootstrap.colorpickersliders.css" rel="stylesheet" type="text/css" media="all">

<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/prettify/r298/run_prettify.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/tinycolor/0.11.1/tinycolor.min.js"></script>
<script src="src/bootstrap.colorpickersliders.js"></script>
<script src="../src/bootstrap.colorpickersliders.js"></script>

</head>

Expand Down
2 changes: 1 addition & 1 deletion dist/bootstrap.colorpickersliders.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Bootstrap Color Picker Sliders - v3.1.0
* Bootstrap Color Picker Sliders - v3.1.1
*
* Bootstrap 3 optimized responsive color selector with HSV, HSL, RGB and CIE-Lch (which supports human perceived lightness) selectors and color swatches.
* http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/
Expand Down
25 changes: 22 additions & 3 deletions dist/bootstrap.colorpickersliders.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Bootstrap Color Picker Sliders - v3.1.0
* Bootstrap Color Picker Sliders - v3.1.1
*
* Bootstrap 3 optimized responsive color selector with HSV, HSL, RGB and CIE-Lch (which supports human perceived lightness) selectors and color swatches.
* http://www.virtuosoft.eu/code/bootstrap-colorpickersliders/
Expand All @@ -12,7 +12,26 @@
*
* Using color math algorithms from EasyRGB Web site:/
* http://www.easyrgb.com/index.php?X=MATH */
(function($) {
(function(factory) {
if (typeof define === 'function' && define.amd) {
define(['jquery'], factory);
} else if (typeof module === 'object' && module.exports) {
module.exports = function(root, jQuery) {
if (jQuery === undefined) {
if (typeof window !== 'undefined') {
jQuery = require('jquery');
}
else {
jQuery = require('jquery')(root);
}
}
factory(jQuery);
return jQuery;
};
} else {
factory(jQuery);
}
}(function($) {
'use strict';

$.fn.ColorPickerSliders = function(options) {
Expand Down Expand Up @@ -2395,4 +2414,4 @@
return !!document.createElementNS && !!document.createElementNS('http://www.w3.org/2000/svg', 'svg').createSVGRect;
};

})(jQuery);
}));
4 changes: 2 additions & 2 deletions dist/bootstrap.colorpickersliders.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
},
"license": "Apache-2.0",
"main": "dist/bootstrap.colorpickersliders.js",
"style": "dist/bootstrap.colorpickersliders.css",
"contributors": [
],
"repository": {
"type": "git",
"url": "https://github.com/istvan-ujjmeszaros/bootstrap-colorpickersliders.git"
},
"homepage": "https://www.virtuosoft.eu/code/bootstrap-colorpickersliders/",
"version": "3.1.0",
"version": "3.1.1",
"devDependencies": {
"grunt": "^1.0.2",
"grunt-cli": "^1.2.0",
Expand Down
23 changes: 21 additions & 2 deletions src/bootstrap.colorpickersliders.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
(function($) {
(function(factory) {
if (typeof define === 'function' && define.amd) {
define(['jquery'], factory);
} else if (typeof module === 'object' && module.exports) {
module.exports = function(root, jQuery) {
if (jQuery === undefined) {
if (typeof window !== 'undefined') {
jQuery = require('jquery');
}
else {
jQuery = require('jquery')(root);
}
}
factory(jQuery);
return jQuery;
};
} else {
factory(jQuery);
}
}(function($) {
'use strict';

$.fn.ColorPickerSliders = function(options) {
Expand Down Expand Up @@ -2381,4 +2400,4 @@
return !!document.createElementNS && !!document.createElementNS('http://www.w3.org/2000/svg', 'svg').createSVGRect;
};

})(jQuery);
}));

0 comments on commit e5a9451

Please sign in to comment.