Show source code

// inline select
 $(".editable-select").editable("save.php", {
     type   : "select",
+    sortselectoptions: true,
     // this data will be sorted by value
     data   : '{"Wiki":"Wiki","Banana":"Banana","Apple":"Apple", "Pear":"Pear", "selected":"Pear"}',
     submitdata : function() { return {id : 42, something: 'else'};},
diff --git a/dist/jquery.jeditable.min.js b/dist/jquery.jeditable.min.js
index 9d814fa..43e7b91 100644
--- a/dist/jquery.jeditable.min.js
+++ b/dist/jquery.jeditable.min.js
@@ -1,3 +1,3 @@
 /*! jquery-jeditable https://github.com/NicolasCARPi/jquery_jeditable#readme */
 
-!function($){"use strict";$.fn.editableAriaShim=function(){return this.attr({role:"button",tabindex:0}),this},$.fn.editable=function(target,options){if("disable"!==target)if("enable"!==target){if("destroy"!==target){var settings=$.extend({},$.fn.editable.defaults,{target:target},options),plugin=$.editable.types[settings.type].plugin||function(){},submit=$.editable.types[settings.type].submit||function(){},buttons=$.editable.types[settings.type].buttons||$.editable.types.defaults.buttons,content=$.editable.types[settings.type].content||$.editable.types.defaults.content,element=$.editable.types[settings.type].element||$.editable.types.defaults.element,reset=$.editable.types[settings.type].reset||$.editable.types.defaults.reset,destroy=$.editable.types[settings.type].destroy||$.editable.types.defaults.destroy,callback=settings.callback||function(){},intercept=settings.intercept||function(s){return s},onedit=settings.onedit||function(){},onsubmit=settings.onsubmit||function(){},onreset=settings.onreset||function(){},onerror=settings.onerror||reset;settings.before;return settings.tooltip&&$(this).attr("title",settings.tooltip),this.each(function(){var self=this;$(this).data("event.editable",settings.event),$(this).html().trim()||$(this).html(settings.placeholder),"destroy"!==target?($(this).on(settings.event,function(e){if(!0!==$(this).data("disabled.editable")&&9!==e.which&&!self.editing&&!1!==onedit.apply(this,[settings,self,e])){if(settings.before&&"function"==typeof settings.before)settings.before(e);else if(settings.before&&"function"!=typeof settings.before)throw"The 'before' option needs to be provided as a function!";e.preventDefault(),e.stopPropagation(),settings.tooltip&&$(self).removeAttr("title"),$(this).html().toLowerCase().replace(/(;|"|\/)/g,"")===settings.placeholder.toLowerCase().replace(/(;|"|\/)/g,"")&&$(this).html(""),self.editing=!0,self.revert=$(self).text(),$(self).html("");var form=$("
");settings.cssclass&&("inherit"===settings.cssclass?form.attr("class",$(self).attr("class")):form.attr("class",settings.cssclass)),settings.style&&("inherit"===settings.style?(form.attr("style",$(self).attr("style")),form.css("display",$(self).css("display"))):form.attr("style",settings.style)),settings.label&&form.append(""+settings.label+""),settings.formid&&form.attr("id",settings.formid);var input_content,t,input=element.apply(form,[settings,self]);settings.inputcssclass&&("inherit"===settings.inputcssclass?input.attr("class",$(self).attr("class")):input.attr("class",settings.inputcssclass));var isSubmitting=!1;if(settings.loadurl){t=self.setTimeout(function(){input.disabled=!0},100),$(self).html(settings.loadtext);var loaddata={};loaddata[settings.id]=self.id,"function"==typeof settings.loaddata?$.extend(loaddata,settings.loaddata.apply(self,[self.revert,settings])):$.extend(loaddata,settings.loaddata),$.ajax({type:settings.loadtype,url:settings.loadurl,data:loaddata,async:!1,cache:!1,success:function(result){self.clearTimeout(t),input_content=result,input.disabled=!1}})}else settings.data?(input_content=settings.data,"function"==typeof settings.data&&(input_content=settings.data.apply(self,[self.revert,settings]))):input_content=self.revert;if(content.apply(form,[input_content,settings,self]),input.attr("name",settings.name),"none"!==settings.width){var adj_width=settings.width-(input.outerWidth(!0)-settings.width);input.width(adj_width)}buttons.apply(form,[settings,self]),settings.showfn&&"function"==typeof settings.showfn&&form.hide(),$(self).html(""),$(self).append(form),settings.showfn&&"function"==typeof settings.showfn&&settings.showfn(form),plugin.apply(form,[settings,self]),form.find(":input:visible:enabled:first").trigger("focus"),settings.select&&input.trigger("select"),$(this).on("keydown",function(e){27===e.which?(e.preventDefault(),reset.apply(form,[settings,self])):13==e.which&&e.shiftKey&&(e.preventDefault(),form.trigger("submit"))}),"cancel"===settings.onblur?input.on("blur",function(e){t=self.setTimeout(function(){reset.apply(form,[settings,self])},500)}):"submit"===settings.onblur?input.on("blur",function(e){t=self.setTimeout(function(){form.trigger("submit")},200)}):"function"==typeof settings.onblur&&input.on("blur",function(e){!1===settings.onblur.apply(self,[input.val(),settings,form])&&reset.apply(form,[settings,self])}),form.on("submit",function(e){if(e.preventDefault(),e.stopPropagation(),isSubmitting)return!1;if(isSubmitting=!0,t&&self.clearTimeout(t),(isSubmitting=!1!==onsubmit.apply(form,[settings,self]))&&(isSubmitting=!1!==submit.apply(form,[settings,self])))if("function"==typeof settings.target){var responseHandler=function(value,complete){isSubmitting=!1,!1!==complete&&($(self).html(value),self.editing=!1,callback.apply(self,[self.innerText,settings]),$(self).html().trim()||$(self).html(settings.placeholder))},userTarget=settings.target.apply(self,[input.val(),settings,responseHandler]);!1!==userTarget&&void 0!==userTarget&&responseHandler(userTarget,userTarget)}else{var submitdata={};submitdata[settings.name]=input.val(),submitdata[settings.id]=self.id,"function"==typeof settings.submitdata?$.extend(submitdata,settings.submitdata.apply(self,[self.revert,settings,submitdata])):$.extend(submitdata,settings.submitdata),"PUT"===settings.method&&(submitdata._method="put"),$(self).html(settings.indicator);var ajaxoptions={type:"POST",complete:function(xhr,status){isSubmitting=!1},data:submitdata,dataType:"html",url:settings.target,success:function(result,status){result=intercept.apply(self,[result,status]),"html"===ajaxoptions.dataType&&$(self).html(result),self.editing=!1,callback.apply(self,[result,settings,submitdata]),$(self).html().trim()||$(self).html(settings.placeholder)},error:function(xhr,status,error){onerror.apply(form,[settings,self,xhr])}};$.extend(ajaxoptions,settings.ajaxoptions),$.ajax(ajaxoptions)}return $(self).attr("title",settings.tooltip),!1})}}),self.reset=function(form){self.editing&&!1!==onreset.apply(form,[settings,self])&&($(self).text(self.revert),self.editing=!1,$(self).html().trim()||$(self).html(settings.placeholder),settings.tooltip&&$(self).attr("title",settings.tooltip))},self.destroy=function(form){$(self).off($(self).data("event.editable")).removeData("disabled.editable").removeData("event.editable"),self.clearTimeouts(),self.editing&&reset.apply(form,[settings,self])},self.clearTimeout=function(t){var timeouts=$(self).data("timeouts");if(clearTimeout(t),timeouts){var i=timeouts.indexOf(t);i>-1?(timeouts.splice(i,1),timeouts.length<=0&&$(self).removeData("timeouts")):console.warn("jeditable clearTimeout could not find timeout "+t)}},self.clearTimeouts=function(){var timeouts=$(self).data("timeouts");if(timeouts){for(var i=0,n=timeouts.length;i');return $(this).append(input),input},content:function(string,settings,original){$(this).find(":input:first").val(string)},reset:function(settings,original){original.reset(this)},destroy:function(settings,original){original.destroy(this)},buttons:function(settings,original){var submit,cancel,form=this;(settings.submit&&(settings.submit.match(/>$/)?submit=$(settings.submit).on("click",function(){"submit"!==submit.attr("type")&&form.trigger("submit")}):((submit=$('')).html(settings.submit),settings.submitcssclass&&submit.addClass(settings.submitcssclass)),$(this).append(submit)),settings.cancel)&&(settings.cancel.match(/>$/)?cancel=$(settings.cancel):((cancel=$('')).html(settings.cancel),settings.cancelcssclass&&cancel.addClass(settings.cancelcssclass)),$(this).append(cancel),$(cancel).on("click",function(event){return("function"==typeof $.editable.types[settings.type].reset?$.editable.types[settings.type].reset:$.editable.types.defaults.reset).apply(form,[settings,original]),!1}))}},text:{element:function(settings,original){var input=$("").attr({autocomplete:"off",list:settings.list,maxlength:settings.maxlength,pattern:settings.pattern,placeholder:settings.placeholder,tooltip:settings.tooltip,type:"text"});return"none"!==settings.width&&input.css("width",settings.width),"none"!==settings.height&&input.css("height",settings.height),settings.size&&input.attr("size",settings.size),settings.maxlength&&input.attr("maxlength",settings.maxlength),$(this).append(input),input}},textarea:{element:function(settings,original){var textarea=$("");return settings.rows?textarea.attr("rows",settings.rows):"none"!==settings.height&&textarea.height(settings.height),settings.cols?textarea.attr("cols",settings.cols):"none"!==settings.width&&textarea.width(settings.width),settings.maxlength&&textarea.attr("maxlength",settings.maxlength),$(this).append(textarea),textarea}},select:{element:function(settings,original){var select=$("");return settings.multiple&&select.attr("multiple","multiple"),$(this).append(select),select},content:function(data,settings,original){var json;json=String===data.constructor?JSON.parse(data):data;var key,option,tuples=[];if(Array.isArray(json)&&json.every(Array.isArray))tuples=json,json={},tuples.forEach(function(e){json[e[0]]=e[1]});else for(key in json)tuples.push([key,json[key]]);settings.sortselectoptions&&tuples.sort(function(a,b){return(a=a[1])<(b=b[1])?-1:a>b?1:0});for(var i=0;i").val(key).append(value),json.selected!==key&&key!==String.prototype.trim.call(null==original.revert?"":original.revert)||$(option).prop("selected","selected"),$(this).find("select").append(option)))}if(!settings.submit){var form=this;$(this).find("select").change(function(){form.trigger("submit")})}}},number:{element:function(settings,original){var input=$("").attr({maxlength:settings.maxlength,placeholder:settings.placeholder,min:settings.min,max:settings.max,step:settings.step,tooltip:settings.tooltip,type:_supportInType("number")});return"none"!==settings.width&&input.css("width",settings.width),$(this).append(input),input}},email:{element:function(settings,original){var input=$("").attr({maxlength:settings.maxlength,placeholder:settings.placeholder,tooltip:settings.tooltip,type:_supportInType("email")});return"none"!==settings.width&&input.css("width",settings.width),$(this).append(input),input}},url:{element:function(settings,original){var input=$("").attr({maxlength:settings.maxlength,pattern:settings.pattern,placeholder:settings.placeholder,tooltip:settings.tooltip,type:_supportInType("url")});return"none"!==settings.width&&input.css("width",settings.width),$(this).append(input),input}}},addInputType:function(name,input){$.editable.types[name]=input}},$.fn.editable.defaults={name:"value",id:"id",type:"text",width:"auto",height:"auto",event:"click.editable keydown.editable",onblur:"cancel",tooltip:"Click to edit",loadtype:"GET",loadtext:"Loading...",placeholder:"Click to edit",sortselectoptions:!1,loaddata:{},submitdata:{},ajaxoptions:{}}}(jQuery);
\ No newline at end of file
+!function($){"use strict";$.fn.editableAriaShim=function(){return this.attr({role:"button",tabindex:0}),this},$.fn.editable=function(target,options){if("disable"!==target)if("enable"!==target){if("destroy"!==target){var settings=$.extend({},$.fn.editable.defaults,{target:target},options),plugin=$.editable.types[settings.type].plugin||function(){},submit=$.editable.types[settings.type].submit||function(){},buttons=$.editable.types[settings.type].buttons||$.editable.types.defaults.buttons,content=$.editable.types[settings.type].content||$.editable.types.defaults.content,element=$.editable.types[settings.type].element||$.editable.types.defaults.element,reset=$.editable.types[settings.type].reset||$.editable.types.defaults.reset,destroy=$.editable.types[settings.type].destroy||$.editable.types.defaults.destroy,callback=settings.callback||function(){},intercept=settings.intercept||function(s){return s},onedit=settings.onedit||function(){},onsubmit=settings.onsubmit||function(){},onreset=settings.onreset||function(){},onerror=settings.onerror||reset;settings.before;return settings.tooltip&&$(this).attr("title",settings.tooltip),this.each(function(){var self=this;$(this).data("event.editable",settings.event),$(this).html().trim()||$(this).html(settings.placeholder),"destroy"!==target?($(this).on(settings.event,function(e){if(!0!==$(this).data("disabled.editable")&&9!==e.which&&!self.editing&&!1!==onedit.apply(this,[settings,self,e])){if(settings.before&&"function"==typeof settings.before)settings.before(e);else if(settings.before&&"function"!=typeof settings.before)throw"The 'before' option needs to be provided as a function!";e.preventDefault(),e.stopPropagation(),settings.tooltip&&$(self).removeAttr("title"),$(this).html().toLowerCase().replace(/(;|"|\/)/g,"")===settings.placeholder.toLowerCase().replace(/(;|"|\/)/g,"")&&$(this).html(""),self.editing=!0,self.revert=$(self).text(),$(self).html("");var form=$("");settings.cssclass&&("inherit"===settings.cssclass?form.attr("class",$(self).attr("class")):form.attr("class",settings.cssclass)),settings.style&&("inherit"===settings.style?(form.attr("style",$(self).attr("style")),form.css("display",$(self).css("display"))):form.attr("style",settings.style)),settings.label&&form.append(""+settings.label+""),settings.formid&&form.attr("id",settings.formid);var input_content,t,input=element.apply(form,[settings,self]);settings.inputcssclass&&("inherit"===settings.inputcssclass?input.attr("class",$(self).attr("class")):input.attr("class",settings.inputcssclass));var isSubmitting=!1;if(settings.loadurl){t=self.setTimeout(function(){input.disabled=!0},100),$(self).html(settings.loadtext);var loaddata={};loaddata[settings.id]=self.id,"function"==typeof settings.loaddata?$.extend(loaddata,settings.loaddata.apply(self,[self.revert,settings])):$.extend(loaddata,settings.loaddata),$.ajax({type:settings.loadtype,url:settings.loadurl,data:loaddata,async:!1,cache:!1,success:function(result){self.clearTimeout(t),input_content=result,input.disabled=!1}})}else settings.data?(input_content=settings.data,"function"==typeof settings.data&&(input_content=settings.data.apply(self,[self.revert,settings]))):input_content=self.revert;if(content.apply(form,[input_content,settings,self]),input.attr("name",settings.name),"none"!==settings.width){var adj_width=settings.width-(input.outerWidth(!0)-settings.width);input.width(adj_width)}buttons.apply(form,[settings,self]),settings.showfn&&"function"==typeof settings.showfn&&form.hide(),$(self).html(""),$(self).append(form),settings.showfn&&"function"==typeof settings.showfn&&settings.showfn(form),plugin.apply(form,[settings,self]),form.find(":input:visible:enabled:first").trigger("focus"),settings.select&&input.trigger("select"),$(this).on("keydown.editable",function(e){27===e.which?(e.preventDefault(),reset.apply(form,[settings,self])):13==e.which&&e.shiftKey&&(e.preventDefault(),form.trigger("submit"))}),"cancel"===settings.onblur?input.on("blur.editable",function(e){t=self.setTimeout(function(){reset.apply(form,[settings,self])},500)}):"submit"===settings.onblur?input.on("blur.editable",function(e){t=self.setTimeout(function(){form.trigger("submit")},200)}):"function"==typeof settings.onblur&&input.on("blur.editable",function(e){!1===settings.onblur.apply(self,[input.val(),settings,form])&&reset.apply(form,[settings,self])}),form.on("submit",function(e){if(e.preventDefault(),e.stopPropagation(),isSubmitting)return!1;if(isSubmitting=!0,t&&self.clearTimeout(t),(isSubmitting=!1!==onsubmit.apply(form,[settings,self]))&&(isSubmitting=!1!==submit.apply(form,[settings,self])))if("function"==typeof settings.target){var responseHandler=function(value,complete){isSubmitting=!1,!1!==complete&&($(self).html(value),self.editing=!1,callback.apply(self,[self.innerText,settings]),$(self).html().trim()||$(self).html(settings.placeholder))},userTarget=settings.target.apply(self,[input.val(),settings,responseHandler]);!1!==userTarget&&void 0!==userTarget&&responseHandler(userTarget,userTarget)}else{var submitdata={};submitdata[settings.name]=input.val(),submitdata[settings.id]=self.id,"function"==typeof settings.submitdata?$.extend(submitdata,settings.submitdata.apply(self,[self.revert,settings,submitdata])):$.extend(submitdata,settings.submitdata),"PUT"===settings.method&&(submitdata._method="put"),$(self).html(settings.indicator);var ajaxoptions={type:"POST",complete:function(xhr,status){isSubmitting=!1},data:submitdata,dataType:"html",url:settings.target,success:function(result,status){result=intercept.apply(self,[result,status]),"html"===ajaxoptions.dataType&&$(self).html(result),self.editing=!1,callback.apply(self,[result,settings,submitdata]),$(self).html().trim()||$(self).html(settings.placeholder)},error:function(xhr,status,error){onerror.apply(form,[settings,self,xhr])}};$.extend(ajaxoptions,settings.ajaxoptions),$.ajax(ajaxoptions)}return settings.tooltip&&$(self).attr("title",settings.tooltip),!1})}}),self.reset=function(form){self.editing&&!1!==onreset.apply(form,[settings,self])&&($(self).find("input,form").off(".editable"),$(self).text(self.revert),self.editing=!1,$(self).html().trim()||$(self).html(settings.placeholder),settings.tooltip&&$(self).attr("title",settings.tooltip))},self.destroy=function(form){$(self).off($(self).data("event.editable")).removeData("disabled.editable").removeData("event.editable"),self.clearTimeouts(),self.editing&&reset.apply(form,[settings,self])},self.clearTimeout=function(t){var timeouts=$(self).data("timeouts");if(clearTimeout(t),timeouts){var i=timeouts.indexOf(t);i>-1?(timeouts.splice(i,1),timeouts.length<=0&&$(self).removeData("timeouts")):console.warn("jeditable clearTimeout could not find timeout "+t)}},self.clearTimeouts=function(){var timeouts=$(self).data("timeouts");if(timeouts){for(var i=0,n=timeouts.length;i');return $(this).append(input),input},content:function(string,settings,original){$(this).find(":input:first").val(string)},reset:function(settings,original){original.reset(this)},destroy:function(settings,original){original.destroy(this)},buttons:function(settings,original){var submit,cancel,form=this;(settings.submit&&(settings.submit.match(/>$/)?submit=$(settings.submit).on("click",function(){"submit"!==submit.attr("type")&&form.trigger("submit")}):((submit=$('')).html(settings.submit),settings.submitcssclass&&submit.addClass(settings.submitcssclass)),$(this).append(submit)),settings.cancel)&&(settings.cancel.match(/>$/)?cancel=$(settings.cancel):((cancel=$('')).html(settings.cancel),settings.cancelcssclass&&cancel.addClass(settings.cancelcssclass)),$(this).append(cancel),$(cancel).on("click",function(event){return("function"==typeof $.editable.types[settings.type].reset?$.editable.types[settings.type].reset:$.editable.types.defaults.reset).apply(form,[settings,original]),!1}))}},text:{element:function(settings,original){var input=$("").attr({autocomplete:"off",list:settings.list,maxlength:settings.maxlength,pattern:settings.pattern,placeholder:settings.placeholder,tooltip:settings.tooltip,type:"text"});return"none"!==settings.width&&input.css("width",settings.width),"none"!==settings.height&&input.css("height",settings.height),settings.size&&input.attr("size",settings.size),settings.maxlength&&input.attr("maxlength",settings.maxlength),$(this).append(input),input}},textarea:{element:function(settings,original){var textarea=$("");return settings.rows?textarea.attr("rows",settings.rows):"none"!==settings.height&&textarea.height(settings.height),settings.cols?textarea.attr("cols",settings.cols):"none"!==settings.width&&textarea.width(settings.width),settings.maxlength&&textarea.attr("maxlength",settings.maxlength),$(this).append(textarea),textarea}},select:{element:function(settings,original){var select=$("");return settings.multiple&&select.attr("multiple","multiple"),$(this).append(select),select},content:function(data,settings,original){var json;json=String===data.constructor?JSON.parse(data):data;var key,option,tuples=[];if(Array.isArray(json)&&json.every(Array.isArray))tuples=json,json={},tuples.forEach(function(e){json[e[0]]=e[1]});else for(key in json)tuples.push([key,json[key]]);settings.sortselectoptions&&tuples.sort(function(a,b){return(a=a[1])<(b=b[1])?-1:a>b?1:0});for(var i=0;i").val(key).append(value),json.selected!==key&&key!==String.prototype.trim.call(null==original.revert?"":original.revert)||$(option).prop("selected","selected"),$(this).find("select").append(option)))}if(!settings.submit){var form=this;$(this).find("select").change(function(){form.trigger("submit")})}}},number:{element:function(settings,original){var input=$("").attr({maxlength:settings.maxlength,placeholder:settings.placeholder,min:settings.min,max:settings.max,step:settings.step,tooltip:settings.tooltip,type:_supportInType("number")});return"none"!==settings.width&&input.css("width",settings.width),$(this).append(input),input}},email:{element:function(settings,original){var input=$("").attr({maxlength:settings.maxlength,placeholder:settings.placeholder,tooltip:settings.tooltip,type:_supportInType("email")});return"none"!==settings.width&&input.css("width",settings.width),$(this).append(input),input}},url:{element:function(settings,original){var input=$("").attr({maxlength:settings.maxlength,pattern:settings.pattern,placeholder:settings.placeholder,tooltip:settings.tooltip,type:_supportInType("url")});return"none"!==settings.width&&input.css("width",settings.width),$(this).append(input),input}}},addInputType:function(name,input){$.editable.types[name]=input}},$.fn.editable.defaults={name:"value",id:"id",type:"text",width:"auto",height:"auto",event:"click.editable keydown.editable",onblur:"cancel",tooltip:"Click to edit",loadtype:"GET",loadtext:"Loading...",placeholder:"Click to edit",sortselectoptions:!1,loaddata:{},submitdata:{},ajaxoptions:{}}}(jQuery);
\ No newline at end of file
diff --git a/src/jquery.jeditable.js b/src/jquery.jeditable.js
index 39d0c22..cc13605 100644
--- a/src/jquery.jeditable.js
+++ b/src/jquery.jeditable.js
@@ -91,6 +91,7 @@
         if ('destroy' === target) {
             $(this)
                 .off($(this).data('event.editable'))
+                .off('.editablekey')
                 .removeData('disabled.editable')
                 .removeData('event.editable');
             return;
@@ -308,35 +309,37 @@
                 }
 
                 /* discard changes if pressing esc */
-                $(this).on('keydown', function(e) {
+                $(this).on('keydown.editablekey', function(e) {
                     if (e.which === 27) {
                         e.preventDefault();
                         reset.apply(form, [settings, self]);
+                        $(this).off(e);
                     /* allow shift+enter to submit form (required for textarea) */
                     } else if (e.which == 13 && e.shiftKey){
                         e.preventDefault();
                         form.trigger('submit');
+                        $(this).off(e);
                     }
                 });
 
                 /* Discard, submit or nothing with changes when clicking outside. */
                 /* Do nothing is usable when navigating with tab. */
                 if ('cancel' === settings.onblur) {
-                    input.on('blur', function(e) {
+                    input.on('blur.editable', function(e) {
                         /* Prevent canceling if submit was clicked. */
                         t = self.setTimeout(function() {
                             reset.apply(form, [settings, self]);
                         }, 500);
                     });
                 } else if ('submit' === settings.onblur) {
-                    input.on('blur', function(e) {
+                    input.on('blur.editable', function(e) {
                         /* Prevent double submit if submit was clicked. */
                         t = self.setTimeout(function() {
                             form.trigger('submit');
                         }, 200);
                     });
                 } else if (typeof settings.onblur === 'function') {
-                    input.on('blur', function(e) {
+                    input.on('blur.editable', function(e) {
                         // reset the form if the onblur function returns false
                         if (false === settings.onblur.apply(self, [input.val(), settings, form])) {
                             reset.apply(form, [settings, self]);
@@ -358,7 +361,7 @@
                     }
 
                     if (t) {
-                        self.clearTimeout(t);
+                        self.clearTimeout(t);   // stop blur events preventing a submit
                     }
 
                     /* Call before submit hook. */
@@ -376,6 +379,8 @@
                               var responseHandler = function(value, complete) {
                                   isSubmitting = false;
                                   if (false !== complete) {
+                                      $(self).find('input,form').off('.editable');
+                                      $(self).off('.editablekey');
                                       $(self).html(value);
                                       self.editing = false;
                                       callback.apply(self, [self.innerText, settings]);
@@ -445,7 +450,8 @@
                             }
                         }
                     }
-
+                    $(self).find('input,form').off('.editable');
+                    $(self).off('.editablekey');
                     /* Show tooltip again. */
                     if (settings.tooltip) {
                       $(self).attr('title', settings.tooltip);
@@ -456,12 +462,14 @@
 
             // PRIVILEGED METHODS
 
-            // RESET
+            // RESET - if in editing mode, revert text and exit editing mode
             self.reset = function(form) {
                 /* Prevent calling reset twice when blurring. */
                 if (self.editing) {
                     /* Before reset hook, if it returns false abort resetting. */
                     if (false !== onreset.apply(form, [settings, self])) {
+                        $(self).find("input,form").off(".editable");
+                        $(self).off('.editablekey');
                         $(self).text(self.revert);
                         self.editing   = false;
                         if (!$(self).html().trim()) {
@@ -479,6 +487,7 @@
             self.destroy = function(form) {
                 $(self)
                 .off($(self).data('event.editable'))
+                .off('.editablekey')
                 .removeData('disabled.editable')
                 .removeData('event.editable');
 
diff --git a/tests/index.html b/tests/index.html
index 1a7d9e0..2ce6345 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -12,8 +12,9 @@
     
     
         

-        

+        

         
+        
         
     
 
diff --git a/tests/jquery-track-handlers.js b/tests/jquery-track-handlers.js
new file mode 100644
index 0000000..8e47381
--- /dev/null
+++ b/tests/jquery-track-handlers.js
@@ -0,0 +1,82 @@
+/* jQuery event handler tracker - coded by ChatGPT
+ Allows to track event handlers bound with jQuery for testing purposes
+ Limitations:
+ 1) May not work propery with jQuery delegated event handlers (not tested)
+ 2) Relies on jQuery internals, e.g. handling of namespaces (jQuery 3.x calls remove separate for each previously bound namespaced event type, so we don't have to account for that here)
+ 3) Does not account for $.off(Event) where Event is a jQuery.Event object, https://api.jquery.com/off/#off-event
+
+// Example Usage
+$('#myElement').on('click', function() {
+    console.log('Clicked!');
+});
+
+$('#myElement').on('mouseover', function() {
+    console.log('Mouse over!');
+});
+
+// Retrieve tracked events
+console.log($('#myElement').getTrackedEvents());
+// expect to get an array of length 2, one element of each of click and mouseover event types
+*/
+
+(function($) {
+    // Create a WeakMap to store event data per element
+    var eventRegistry = new WeakMap();
+
+    // Hook into jQuery's internal event system
+    var originalAdd = $.event.add;
+    $.event.add = function(elem, types, handler, data, selector) {
+        if (!eventRegistry.has(elem)) {
+            eventRegistry.set(elem, []);
+        }
+
+        // Store event details, support multiple space-separated event types
+        types.split(" ").forEach(type => {
+            eventRegistry.get(elem).push({
+                event: type,
+                handler: handler,
+                selector: selector,
+                boundTimeMs: Date.now()
+            });
+        });
+        // Call the original jQuery event handler
+        return originalAdd.call(this, elem, types, handler, data, selector);
+    };
+
+    // Hook into jQuery's event system for removing events
+    var originalRemove = $.event.remove;
+    $.event.remove = function(elem, types, handler, selector) {
+        if (eventRegistry.has(elem)) {
+            let events = eventRegistry.get(elem);
+
+            if (types) {
+                // Support multiple space-separated event types
+                types.split(" ").forEach(type => {
+                    events = events.filter(e =>
+                        !(e.event === type &&
+                          (!handler || e.handler === handler) &&
+                          (!selector || e.selector === selector))
+                    );
+                });
+            } else {
+                // If no types are provided, remove all events
+                events = [];
+            }
+
+            // Update or delete registry entry
+            if (events.length > 0) {
+                eventRegistry.set(elem, events);
+            } else {
+                eventRegistry.delete(elem);
+            }
+        }
+
+        // Call the original jQuery event removal function
+        return originalRemove.call(this, elem, types, handler, selector);
+    };
+
+    // jQuery plugin to retrieve tracked events for an element
+    $.fn.getTrackedEvents = function() {
+        return eventRegistry.get(this[0]) || [];
+    };
+})(jQuery);
diff --git a/tests/tests.js b/tests/tests.js
index f505f0f..b2c850c 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -1,74 +1,262 @@
 /* jquery-jeditable tests */
-var elem = $('#qunit-fixture');
+var $elem = $(), elem;
 
-QUnit.test('Registration', function(assert) {
+function cleanUp($el) {
+    $elem = $("
").appendTo('#qunit-fixture');
+    elem = $elem.get(0);
+}
+QUnit.on('testStart', testStart => {
+    console.log(testStart);
+    // name: 'my test'
+    // moduleName: 'my module'
+    // fullName: ['parent', 'my module', 'my test']
+
+    // name: 'global test'
+    // moduleName: null
+    // fullName: ['global test']
+});
+
+QUnit.module('Basics', {
+    beforeEach: function () {
+        cleanUp($('#qunit-fixture'));
+    }
+});
+QUnit.test('Registration', function (assert) {
     assert.ok($.fn.editable, 'registered as a jQuery plugin');
 });
-QUnit.test('Chainability', function(assert) {
-    assert.ok(elem.editable().addClass('testing'), 'can be chained');
-    assert.ok(elem.hasClass('testing'), 'successfully chained');
+QUnit.test('Chainability', function (assert) {
+
+    assert.ok($elem.editable().addClass('testing'), 'can be chained');
+    assert.ok($elem.hasClass('testing'), 'successfully chained');
+});
+
+QUnit.test('ARIA attributes', function (assert) {
+
+    $elem.editable().editableAriaShim();
+    assert.ok($elem.is('[role="button"]'), 'added role');
+});
+
+
+QUnit.test('Enable/disable/destroy', function (assert) {
+    $elem.text("testtext").editable({ type: "text" });
+    $elem.editable('disable');
+    assert.strictEqual($elem.data('disabled.editable'), true, "Disabled state ok");
+
+    $elem.editable('enable');
+    assert.ok($elem.data('event.editable'), "Enabled after disabled");
+
+    $elem.editable().editable('destroy');
+    assert.notOk($elem.data('event.editable'), "Destroy removes jQuery data");
+
+    assert.equal($elem.find("input[type=text]").length, 0, "Destroy removes INPUT field");
 });
 
-QUnit.test('ARIA attributes', function(assert) {
-    elem.editable().editableAriaShim();
-    assert.ok(elem.is('[role="button"]'), 'added role');
+QUnit.test('Event handlers', async function (assert) {
+    const done1 = assert.async();
+    const done2 = assert.async();
+    var handlers = $elem.getTrackedEvents();
+
+    console.log("before editable() handlers.len=" + $elem.getTrackedEvents().length, $elem.getTrackedEvents());
+    assert.equal($elem.getTrackedEvents().length, 0, "No event handlers prior to first call");
+    $elem.text("initialtext").editable(
+        function (newValue, settings) {
+            //assert.step("SUBMIT " + newValue);
+            console.log("SUBMIT");
+            done1();
+            return newValue;  // return text value to commit value to HTML
+        }, {
+        type: "text",
+        submit: "OK",
+        onblur: "submit"
+        });
+    assert.equal($elem.getTrackedEvents().length, 2, "Two event handlers after initialization");
+    console.log("aft .editable() handlers.len=" + $elem.getTrackedEvents().length, $elem.getTrackedEvents());
+
+    $elem.click();  // activate editable
+    setTimeout(function () {
+        //assert.equal($elem.getTrackedEvents().length, 3, "3 event handlers after click");
+        console.log("aft .click()) handlers.len=" + $elem.getTrackedEvents().length, $elem.getTrackedEvents());
+
+        $elem.find("input").val("newtext");
+        assert.equal($elem.find("button").length, 1, "One OK button");
+        $elem.find("button").click();   // submit with OK button
+
+        setTimeout(function () {
+            $elem.editable('destroy');
+            assert.equal($elem.getTrackedEvents().length, 0, "No event handlers after call to 'destroy'");
+            console.log("aft destroy editable() handlers.len=" + $elem.getTrackedEvents().length, $elem.getTrackedEvents());
+            done2();
+        }, 400);
+    }, 400);
 });
 
-QUnit.test('Enable/disable/destroy', function(assert) {
-    elem.editable().editable('disable');
-    assert.strictEqual(elem.data('disabled.editable'), true);
+QUnit.test('Event handlers losing focus', async function (assert) {
+    const done1 = assert.async();
+    const done2 = assert.async();
+    var handlers = $elem.getTrackedEvents();
+
+    var $other = $elem.parent().append("
Other content
");
+    console.log("before editable() handlers.len=" + $elem.getTrackedEvents().length, $elem.getTrackedEvents());
+    assert.equal($other.length, 1, "Other element exists");
+    assert.equal($elem.getTrackedEvents().length, 0, "No event handlers prior to first call");
+    $elem.text("initialtext").editable(
+        function (newValue, settings) {
+            //assert.step("SUBMIT " + newValue);
+            console.log("SUBMIT callback newValue="+newValue);
+            done1();
+            return newValue;  // return text value to commit value to HTML
+        }, {
+        type: "text",
+        submit: "OK",
+        onblur: "cancel"
+        });
+    assert.equal($elem.getTrackedEvents().length, 2, "Two event handlers after initialization");
+    console.log("aft .editable() handlers.len=" + $elem.getTrackedEvents().length, $elem.getTrackedEvents());
 
-    elem.editable('enable');
-    assert.ok(elem.data('event.editable'));
+    $elem.click();  // activate editable
+    setTimeout(function () {
+        //assert.equal($elem.getTrackedEvents().length, 3, "3 event handlers after click");
+        console.log("aft activate .click()) handlers.len=" + $elem.getTrackedEvents().length, $elem.getTrackedEvents());
 
-    elem.editable().editable('destroy');
-    assert.notOk(elem.data('event.editable'));
+        $elem.find("input").val("newtext");
+        //assert.equal($other.lengt.find("button").length, 1, "One OK button");
+        //$other.click(); // click on other element, losing focus on editable
+        $elem.find("input").trigger("blur");
+
+        setTimeout(function () {
+            assert.equal($elem.getTrackedEvents().length, 2, "2 event handlers after blur");
+            console.log("aft blur .click()) handlers.len=" + $elem.getTrackedEvents().length, $elem.getTrackedEvents());
+            //debugger;
+            $elem.editable('destroy');
+            assert.equal($elem.getTrackedEvents().length, 0, "No event handlers after call to 'destroy'");
+            console.log("aft destroy editable() handlers.len=" + $elem.getTrackedEvents().length, $elem.getTrackedEvents());
+            done2();
+        }, 1000);
+    }, 400);
+});
+
+QUnit.module('Text Field', {
+    beforeEach: function () {
+        cleanUp($('#qunit-fixture'));
+    }
 });
+QUnit.test('Open, text value', async function (assert) {
+    const done = assert.async();
+    const DEMO_TEXT = "demo";
+
+    $elem.text(DEMO_TEXT).editable({ type: "text" });
 
-QUnit.module('select-boxes');
-QUnit.test('Default: NOT Sorting select options', function(assert) {
-    elem.append( 'Letter F' );
+    $elem.trigger("click");
+    setTimeout(function () {
+        assert.equal($elem.find("input[type=text]").length, 1, "INPUT field is present and of type text");
+        assert.equal($elem.find("input").is(":visible"), 1, "INPUT field is visible");
+        assert.equal($elem.find("input").val(), DEMO_TEXT, "INPUT value is initialized from prior text content");
+        done();
+    }, 400);
+});
+
+QUnit.test('Submit', async function (assert) {
+    const done = assert.async();
+    const done2 = assert.async();
+
+    assert.timeout(1200); // Timeout after 0.5 seconds
+
+    const DEMO_TEXT = "demo";
+    $elem.text(DEMO_TEXT).editable(
+        function (newValue, settings) {
+            assert.step("SUBMIT " + newValue);
+            console.log("SUBMIT");
+            done();
+            return newValue;  // return text value to commit value to HTML
+        }, {
+        type: "text",
+        submit: "OK", // OK button to submit
+        onedit: function () {
+            console.log("EDIT");
+            assert.step("EDIT started");
+            return true;  // return true to proceed editing
+        }
+    });
+
+    $elem.trigger("click"); // activate editable
+    setTimeout(function () {
+        assert.equal($elem.find("input[type=text]").length, 1, "INPUT field is present and of type text");
+        assert.equal($elem.find("input").is(":visible"), 1, "INPUT field is visible");
+        assert.equal($elem.find("input").val(), DEMO_TEXT, "INPUT value is initialized from prior text content");
+        assert.equal($elem.find("button").length, 1, "Button is present");
+        assert.equal($elem.find("button").text(), "OK", "Button text is 'OK'");
+
+        const INPUT_TEXT = "newtext"
+        var elemInput = $elem.find("input").get(0);
+        assert.ok(elemInput, "Input HTMLElement found");
+        $elem.find("input").val(INPUT_TEXT);
+
+        $elem.find("button").click();
+
+        setTimeout(function () {
+            //debugger;
+            done2();
+            assert.verifySteps(["EDIT started", "SUBMIT " + INPUT_TEXT], "input text submitted");
+        }, 400);
+    }, 400);
+});
+
+QUnit.module('select-boxes', {
+    beforeEach: function () {
+        cleanUp($('#qunit-fixture'));
+    }
+});
+QUnit.test('Default: NOT Sorting select options', function (assert) {
+
+    $elem.append('Letter F');
 
     $.fn.editable.defaults.sortselectoptions = false;
 
     $('#select-tester').editable('http://bla', {
         type: 'select',
-        data: {'E': 'Letter E', 'F': 'Letter F', 'D': 'Letter Disk'},
+        data: { 'E': 'Letter E', 'F': 'Letter F', 'D': 'Letter Disk' },
         selected: 'F'
     });
 
-    assert.equal( $('#select-tester').attr('title'), 'Click to edit', 'Editable enabled: it sets the title' );
+    assert.equal($('#select-tester').attr('title'), 'Click to edit', 'Editable enabled: it sets the title');
     $('#select-tester').click();
     assert.equal($('#select-tester form').length, 1, 'Clicking Editable adds inline form');
 
     var optionsList = [];
-    $('#select-tester option').each(function(name, val) { optionsList.push(val.text); });
+    $('#select-tester option').each(function (name, val) { optionsList.push(val.text); });
 
     assert.deepEqual(optionsList, ['Letter E', 'Letter F', 'Letter Disk'], 'Does not sort the given options-list');
 });
-QUnit.test('Default: Sorting select options', function(assert) {
-    elem.append( 'Letter F' );
+QUnit.test('Default: Sorting select options', function (assert) {
+
+    $elem.append('Letter F');
 
     $.fn.editable.defaults.sortselectoptions = true;
 
     $('#select-sorted-tester').editable('http://bla', {
         type: 'select',
-        data: {'E': 'Letter E', 'F': 'Letter F', 'D': 'Letter Disk'},
+        data: { 'E': 'Letter E', 'F': 'Letter F', 'D': 'Letter Disk' },
         selected: 'F'
     });
-    assert.equal( $('#select-sorted-tester').attr('title'), 'Click to edit', 'Editable enabled: it sets the title' );
+    assert.equal($('#select-sorted-tester').attr('title'), 'Click to edit', 'Editable enabled: it sets the title');
     $('#select-sorted-tester').click();
     assert.equal($('#select-sorted-tester form').length, 1, 'Clicking Editable adds inline form');
 
     var optionsList = [];
-    $('#select-sorted-tester option').each(function(name, val) { optionsList.push(val.text); });
+    $('#select-sorted-tester option').each(function (name, val) { optionsList.push(val.text); });
 
     assert.deepEqual(optionsList, ['Letter Disk', 'Letter E', 'Letter F'], 'It does sort the given options list');
 });
-QUnit.module('select-boxes input data');
-QUnit.test('List of tuples', function(assert) {
-    elem.append('');
-    var e = $('#select-tester', elem);
+
+QUnit.module('select-boxes input data', {
+    beforeEach: function () {
+        cleanUp($('#qunit-fixture'));
+    }
+});
+QUnit.test('List of tuples', function (assert) {
+
+    $elem.append('');
+    var e = $('#select-tester', $elem);
 
     var test_data = [['E', 'Letter E'], ['F', 'Letter F'], ['D', 'Letter Disk']];
     e.editable('http://bla', {
@@ -79,12 +267,13 @@ QUnit.test('List of tuples', function(assert) {
     e.click();
 
     var optionsList = [];
-    e.find('option').each(function(name, val) { optionsList.push([val.value, val.text]); });
+    e.find('option').each(function (name, val) { optionsList.push([val.value, val.text]); });
     assert.deepEqual(optionsList, test_data, 'Options keep sorted as defined in input');
 });
-QUnit.test('List of strings', function(assert) {
-    elem.append('');
-    var e = $('#select-tester', elem);
+QUnit.test('List of strings', function (assert) {
+
+    $elem.append('');
+    var e = $('#select-tester', $elem);
 
     var test_data = ['E', 'F', 'D'];
     var sort = Math.random() > 0.5;
@@ -97,18 +286,19 @@ QUnit.test('List of strings', function(assert) {
     e.click();
 
     var optionsList = [];
-    var expected_result = [['0', 'E'],['1', 'F'], ['2', 'D']];
+    var expected_result = [['0', 'E'], ['1', 'F'], ['2', 'D']];
     if (sort) {
-        expected_result.sort(function(a, b) {return a[1] > b[1];});
+        expected_result.sort(function (a, b) { a = a[1]; b = b[1]; return a < b ? -1 : (a > b ? 1 : 0); });
     }
-    e.find('option').each(function(name, val) { optionsList.push([val.value, val.text]); });
-    assert.deepEqual(optionsList, expected_result, 'Options get auto assigned integer values in order of input and options are sorted by label based on sortselectoptions option');
+    e.find('option').each(function (name, val) { optionsList.push([val.value, val.text]); });
+    assert.deepEqual(optionsList, expected_result, 'Options get auto assigned integer values in order of input and options are sorted by label based on sortselectoptions option: ');
 });
-QUnit.test('Object', function(assert) {
-    elem.append('');
-    var e = $('#select-tester', elem);
+QUnit.test('Object', function (assert) {
 
-    var test_data = {'E': 'Letter E', 'F': 'Letter F', 'D': 'Letter Disk'};
+    $elem.append('');
+    var e = $('#select-tester', $elem);
+
+    var test_data = { 'E': 'Letter E', 'F': 'Letter F', 'D': 'Letter Disk' };
     var sort = Math.random() > 0.5;
     e.editable('http://bla', {
         type: 'select',
@@ -121,37 +311,44 @@ QUnit.test('Object', function(assert) {
     var optionsList = [];
     var expected_result = [['E', 'Letter E'], ['F', 'Letter F'], ['D', 'Letter Disk']];
     if (sort) {
-        expected_result.sort(function(a, b) {return a[1] > b[1];});
+        expected_result.sort(function (a, b) { a = a[1]; b = b[1]; return a < b ? -1 : (a > b ? 1 : 0); });
+    }
+    e.find('option').each(function (name, val) { optionsList.push([val.value, val.text]); });
+    assert.deepEqual(optionsList, expected_result, 'Options are sorted either in order of object definition or by label depending on sortselectoptions option: ' + sort);
+});
+
+QUnit.module('select-boxes setting selected', {
+    beforeEach: function () {
+        cleanUp($('#qunit-fixture'));
     }
-    e.find('option').each(function(name, val) { optionsList.push([val.value, val.text]); });
-    assert.deepEqual(optionsList, expected_result, 'Options are sorted either in order of object definition or by label depending on sortselectoptions option');
 });
-QUnit.module('select-boxes setting selected');
-QUnit.test('Explicitly setting a selected option', function(assert) {
-    elem.append( 'Letter F' );
+QUnit.test('Explicitly setting a selected option', function (assert) {
+
+    $elem.append('Letter F');
 
     $.fn.editable.defaults.sortselectoptions = false;
 
     $('#selected-tester').editable('http://bla', {
         type: 'select',
-        data: {'E': 'Letter E', 'F': 'Letter F', 'D': 'Letter Disk', 'selected': 'F'},
+        data: { 'E': 'Letter E', 'F': 'Letter F', 'D': 'Letter Disk', 'selected': 'F' },
     });
 
-    assert.equal( $( '#selected-tester').attr('title'), 'Click to edit', 'Editable enabled: it sets the title' );
+    assert.equal($('#selected-tester').attr('title'), 'Click to edit', 'Editable enabled: it sets the title');
     $('#selected-tester').click();
     assert.equal($('#selected-tester form select :selected').text(), 'Letter F', 'Sets the correct value as selected');
 });
-QUnit.test('Not setting a selected option', function(assert) {
-    elem.append( 'Letter F' );
+QUnit.test('Not setting a selected option', function (assert) {
+
+    $elem.append('Letter F');
 
     $.fn.editable.defaults.sortselectoptions = false;
 
     $('#selected-tester').editable('http://bla', {
         type: 'select',
-        data: {'E': 'Letter E', 'F': 'Letter F', 'D': 'Letter Disk'},
+        data: { 'E': 'Letter E', 'F': 'Letter F', 'D': 'Letter Disk' },
     });
 
-    assert.equal( $( '#selected-tester').attr('title'), 'Click to edit', 'Editable enabled: it sets the title' );
+    assert.equal($('#selected-tester').attr('title'), 'Click to edit', 'Editable enabled: it sets the title');
     $('#selected-tester').click();
     assert.equal($('#selected-tester form select :selected').text(), 'Letter E', 'Selects the first option as selected?');
 });