From 05e728c5954931680f3106af84c06f3f61bb5247 Mon Sep 17 00:00:00 2001 From: Aaron Bean Date: Thu, 5 May 2016 12:52:09 -0500 Subject: [PATCH] corrections to button text changing methodology --- form-cues.js | 6 ++++-- form-cues.min.js | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/form-cues.js b/form-cues.js index 32d4170..e2b1bca 100644 --- a/form-cues.js +++ b/form-cues.js @@ -45,9 +45,10 @@ * Disables/enables buttons and animates their icons * @param submitButton {Object|String} * @param submitIcon {Object|String} + * @param submitText {Object|String} * @param options */ - cues.setSubmitState = function (submitButton, submitIcon, options) { + cues.setSubmitState = function (submitButton, submitIcon, submitText, options) { options = options || {}; var isEnabled = options.isEnabled || options.enabled || false; var doSpin = options.doSpin || options.spin || false; @@ -57,8 +58,9 @@ var buttonText = options.buttonText || options.text || null; submitButton = ((submitButton instanceof Object) ? submitButton : $('#' + submitButton)); submitIcon = ((submitIcon instanceof Object) ? submitIcon : $('#' + submitIcon)); + submitText = ((submitText instanceof Object) ? submitText : $('#' + submitText)); if (!!buttonText) { - submitButton.prop('value', buttonText); + submitText.html(buttonText); } submitButton.prop('disabled', !isEnabled); if (!!doSpin) { diff --git a/form-cues.min.js b/form-cues.min.js index e0328d1..e32db3b 100644 --- a/form-cues.min.js +++ b/form-cues.min.js @@ -1,2 +1,2 @@ /*! form-cues 2016-05-05 */ -"use strict";(function(){var a=this,b=function(a){return a instanceof b?a:this instanceof b?void 0:new b(a)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=b),exports.cues=b):a.cues=b,b.addAlert=function(a,b,c){c=c||{};var d=c.level||"info",e=c.isDismissable||c.dismissable||!1,f=c.doMultiple||c.multiple||!1;a=a instanceof Object?a:$("#"+a);var g=e?'':"",h='
'+g+b+"
",i=f?a.append(h):a.html(h);i.alert()},b.setSubmitState=function(a,b,c){c=c||{};var d=c.isEnabled||c.enabled||!1,e=c.doSpin||c.spin||!1,f=c.defaultIcon||c.icon||"check",g=c.spinnerIcon||"spinner",h=c.animation||"spin",i=c.buttonText||c.text||null;a=a instanceof Object?a:$("#"+a),b=b instanceof Object?b:$("#"+b),i&&a.prop("value",i),a.prop("disabled",!d),e?(b.removeClass("fa-"+f),b.addClass("fa-"+g),b.addClass("fa-"+h)):(b.removeClass("fa-"+g),b.removeClass("fa-"+h),b.addClass("fa-"+f))}}).call(this); \ No newline at end of file +"use strict";(function(){var a=this,b=function(a){return a instanceof b?a:this instanceof b?void 0:new b(a)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=b),exports.cues=b):a.cues=b,b.addAlert=function(a,b,c){c=c||{};var d=c.level||"info",e=c.isDismissable||c.dismissable||!1,f=c.doMultiple||c.multiple||!1;a=a instanceof Object?a:$("#"+a);var g=e?'':"",h='
'+g+b+"
",i=f?a.append(h):a.html(h);i.alert()},b.setSubmitState=function(a,b,c,d){d=d||{};var e=d.isEnabled||d.enabled||!1,f=d.doSpin||d.spin||!1,g=d.defaultIcon||d.icon||"check",h=d.spinnerIcon||"spinner",i=d.animation||"spin",j=d.buttonText||d.text||null;a=a instanceof Object?a:$("#"+a),b=b instanceof Object?b:$("#"+b),c=c instanceof Object?c:$("#"+c),j&&c.html(j),a.prop("disabled",!e),f?(b.removeClass("fa-"+g),b.addClass("fa-"+h),b.addClass("fa-"+i)):(b.removeClass("fa-"+h),b.removeClass("fa-"+i),b.addClass("fa-"+g))}}).call(this); \ No newline at end of file diff --git a/package.json b/package.json index ba7e7f4..e8d68f1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "form-cues", "description": "Visual cues for forms using Bootstrap and Font Awesome", - "version": "0.1.2", + "version": "0.2.0", "homepage": "https://github.com/beardon/form-cues", "bugs": { "url": "https://github.com/beardon/form-cues/issues",