use iconSet:"glyph" as default for guiStyle:"bootstrap" or guiStyle:"…

…bootstrapPrimary"
chamilo · Feb 19, 2016 · c9a3bf3 · c9a3bf3
1 parent 3408e0f
commit c9a3bf3
Show file tree

Hide file tree

Showing 6 changed files with 106 additions and 106 deletions.
diff --git a/js/grid.base.js b/js/grid.base.js
@@ -2345,7 +2345,7 @@
 				fatalErrorFunction = isFunction(defaults.fatalError) ? defaults.fatalError : alert,
 				locale = pin.locale || defaults.locale || "en-US",
 				direction = locales[locale] != null && typeof locales[locale].isRTL === "boolean" ? (locales[locale].isRTL ? "rtl" : "ltr") : "ltr",
-				iconSet = pin.iconSet || defaults.iconSet || "jQueryUI",
+				iconSet = pin.iconSet || defaults.iconSet || ((pin.guiStyle || defaults.guiStyle) === "bootstrap" || (pin.guiStyle || defaults.guiStyle) === "bootstrapPrimary" ? "glyph" : "jQueryUI"),
 				guiStyle = pin.guiStyle || defaults.guiStyle || "jQueryUI",
 				getIcon = function (path) {
 					//return jgrid.getIconRes(iconSet, path);

diff --git a/js/jquery.jqgrid.min.js b/js/jquery.jqgrid.min.js
diff --git a/js/jquery.jqgrid.min.map b/js/jquery.jqgrid.min.map
diff --git a/js/jquery.jqgrid.src.js b/js/jquery.jqgrid.src.js
@@ -2345,7 +2345,7 @@
 				fatalErrorFunction = isFunction(defaults.fatalError) ? defaults.fatalError : alert,
 				locale = pin.locale || defaults.locale || "en-US",
 				direction = locales[locale] != null && typeof locales[locale].isRTL === "boolean" ? (locales[locale].isRTL ? "rtl" : "ltr") : "ltr",
-				iconSet = pin.iconSet || defaults.iconSet || "jQueryUI",
+				iconSet = pin.iconSet || defaults.iconSet || ((pin.guiStyle || defaults.guiStyle) === "bootstrap" || (pin.guiStyle || defaults.guiStyle) === "bootstrapPrimary" ? "glyph" : "jQueryUI"),
 				guiStyle = pin.guiStyle || defaults.guiStyle || "jQueryUI",
 				getIcon = function (path) {
 					//return jgrid.getIconRes(iconSet, path);