Fixed issue #79 - icon color selection

jquery · Mar 27, 2012 · bce1d32 · bce1d32
1 parent 7e1791c
commit bce1d32
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/jqm/1.0.1/default.css b/jqm/1.0.1/default.css
@@ -603,7 +603,7 @@ a.ui-link-inherit {
 	.ui-icon-gear, .ui-icon-refresh, .ui-icon-forward, .ui-icon-back,
 	.ui-icon-grid, .ui-icon-star, .ui-icon-alert, .ui-icon-info, .ui-icon-home, .ui-icon-search, .ui-icon-searchfield:after, 
 	.ui-icon-checkbox-off, .ui-icon-checkbox-on, .ui-icon-radio-off, .ui-icon-radio-on {
-		background-image: url(../jqm/1.0.1/images/icons-36-white.png);
+		background-image: url(../jqm/1.0.1/images/icons-36-white.png) /*{global-large-icon-set}*/;
 		-moz-background-size: 776px 18px;
 		-o-background-size: 776px 18px;
 		-webkit-background-size: 776px 18px;

diff --git a/jqm/1.0.1/default_theme.css b/jqm/1.0.1/default_theme.css
@@ -880,7 +880,7 @@ a.ui-link-inherit {
 	.ui-icon-gear, .ui-icon-refresh, .ui-icon-forward, .ui-icon-back,
 	.ui-icon-grid, .ui-icon-star, .ui-icon-alert, .ui-icon-info, .ui-icon-home, .ui-icon-search, .ui-icon-searchfield:after, 
 	.ui-icon-checkbox-off, .ui-icon-checkbox-on, .ui-icon-radio-off, .ui-icon-radio-on {
-		background-image: url(../jqm/1.0.1/images/icons-36-white.png);
+		background-image: url(../jqm/1.0.1/images/icons-36-white.png) /*{global-large-icon-set}*/;
 		-moz-background-size: 776px 18px;
 		-o-background-size: 776px 18px;
 		-webkit-background-size: 776px 18px;

diff --git a/js/app.js b/js/app.js
@@ -879,12 +879,8 @@ TR.initControls = function() {
 
 	//Icon Set
     $( "[data-type=icon_set]" ).bind( "blur mouseup", function() {
-        if( this.value == "white" ) {
-            TR.styleArray[$( this ).attr( "data-name" )] = "url(images/icons-18-white.png)";
-
-        } else if(this.value == "black") {
-            TR.styleArray[$( this ).attr( "data-name" )] = "url(images/icons-18-black.png)";
-        }
+        TR.styleArray[$( this ).attr( "data-name" )] = "url(../jqm/" + TR.version + "/images/icons-18-" + this.value + ".png)";
+		TR.styleArray["global-large-icon-set"] = "url(../jqm/" + TR.version + "images/icons-36-" + this.value + ".png)";
         TR.updateAllCSS();
     });