From 14da847c4c7cd6cc2e6c1e34840ad9906404ca2b Mon Sep 17 00:00:00 2001
From: nathanvda <nathan@dixis.com>
Date: Mon, 18 Jun 2018 01:32:41 +0200
Subject: [PATCH 1/7] Add option to sort select-options

The default option is not-sorted, which is
what it used to be long ago. Not sure what is
preferable.
---
 src/jquery.jeditable.js | 16 +++++++++-------
 tests/tests.js          | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/src/jquery.jeditable.js b/src/jquery.jeditable.js
index 810a88d..19c0028 100644
--- a/src/jquery.jeditable.js
+++ b/src/jquery.jeditable.js
@@ -668,13 +668,14 @@ var _supportInType = function (type) {
                     for (key in json) {
                         tuples.push([key, json[key]]); // Store: [key, value]
                     }
-                    // sort it
-                    tuples.sort(function(a, b) {
-                        a = a[1];
-                        b = b[1];
-                        return a < b ? -1 : (a > b ? 1 : 0);
-                    });
-
+                    if (settings.sort_select_options) {
+                        // sort it
+                        tuples.sort(function (a, b) {
+                            a = a[1];
+                            b = b[1];
+                            return a < b ? -1 : (a > b ? 1 : 0);
+                        });
+                    }     
                     // now add the options to our select
                     var option;
                     for (var i = 0; i < tuples.length; i++) {
@@ -783,6 +784,7 @@ var _supportInType = function (type) {
         loadtype   : 'GET',
         loadtext   : 'Loading...',
         placeholder: 'Click to edit',
+        sort_select_options: false,
         loaddata   : {},
         submitdata : {},
         ajaxoptions: {}
diff --git a/tests/tests.js b/tests/tests.js
index bcadba4..eac4678 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -24,3 +24,44 @@ QUnit.test('Enable/disable/destroy', function(assert) {
     elem.editable().editable('destroy');
     assert.notOk(elem.data('event.editable'));
 });
+
+QUnit.module("select-boxes");
+QUnit.test("Default: NOT Sorting select options", function(assert) {
+    elem.append( "<span id='select-tester'>Letter F</span>" );
+
+    $.fn.editable.defaults.sort_select_options = false;
+
+    $('#select-tester').editable('http://bla', {
+        type: 'select',
+        data: {"E": "Letter E", 'F': 'Letter F', 'D': 'Letter Disk'},
+        selected: 'Letter F'
+    });
+
+    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 options_list = []
+    $('#select-tester option').each(function(name, val) { options_list.push(val.text); });
+
+    assert.deepEqual(options_list, ["Letter E", "Letter F", "Letter Disk"], "Does not sort the given options-list");
+});
+QUnit.test("Default: Sorting select options", function(assert) {
+    elem.append( "<span id='select-sorted-tester'>Letter F</span>" );
+
+    $.fn.editable.defaults.sort_select_options = true;
+
+    $('#select-sorted-tester').editable('http://bla', {
+        type: 'select',
+        data: {"E": "Letter E", 'F': 'Letter F', 'D': 'Letter Disk'},
+        selected: 'Letter F'
+    });
+    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 options_list = []
+    $('#select-sorted-tester option').each(function(name, val) { options_list.push(val.text); });
+
+    assert.deepEqual(options_list, ["Letter Disk", "Letter E", "Letter F"], "It does sort the given options list");
+});

From 6fc5db847e5d65b589682e47d898617ad1ae56d9 Mon Sep 17 00:00:00 2001
From: nathanvda <nathan@dixis.com>
Date: Mon, 18 Jun 2018 02:10:06 +0200
Subject: [PATCH 2/7] Use the key to set the selected value

This fixes #167
---
 src/jquery.jeditable.js | 12 ++++++------
 tests/tests.js          | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/jquery.jeditable.js b/src/jquery.jeditable.js
index 19c0028..8ceaa42 100644
--- a/src/jquery.jeditable.js
+++ b/src/jquery.jeditable.js
@@ -688,14 +688,14 @@ var _supportInType = function (type) {
 
                         if (key !== 'selected') {
                             option = $('<option />').val(key).append(value);
-                        }
 
-                        // add the selected prop if it's the same as original or if the key is 'selected'
-                        if (key === 'selected' || key === $.trim(original.revert)) {
-                            $(option).prop('selected', 'selected');
-                        }
+                            // add the selected prop if it's the same as original or if the key is 'selected'
+                            if (json['selected'] === key || key === $.trim(original.revert)) {
+                                $(option).prop('selected', 'selected');
+                            }
 
-                        $(this).find('select').append(option);
+                            $(this).find('select').append(option);
+                        }
                     }
 
                     // submit on change if no submit button defined
diff --git a/tests/tests.js b/tests/tests.js
index eac4678..e8d95cb 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -34,7 +34,7 @@ QUnit.test("Default: NOT Sorting select options", function(assert) {
     $('#select-tester').editable('http://bla', {
         type: 'select',
         data: {"E": "Letter E", 'F': 'Letter F', 'D': 'Letter Disk'},
-        selected: 'Letter F'
+        selected: 'F'
     });
 
     assert.equal( $( "#select-tester").attr('title'), "Click to edit", "Editable enabled: it sets the title" );
@@ -54,7 +54,7 @@ QUnit.test("Default: Sorting select options", function(assert) {
     $('#select-sorted-tester').editable('http://bla', {
         type: 'select',
         data: {"E": "Letter E", 'F': 'Letter F', 'D': 'Letter Disk'},
-        selected: 'Letter F'
+        selected: 'F'
     });
     assert.equal( $( "#select-sorted-tester").attr('title'), "Click to edit", "Editable enabled: it sets the title" );
     $('#select-sorted-tester').click();
@@ -65,3 +65,33 @@ QUnit.test("Default: Sorting select options", function(assert) {
 
     assert.deepEqual(options_list, ["Letter Disk", "Letter E", "Letter F"], "It does sort the given options list");
 });
+QUnit.module("select-boxes setting selected");
+QUnit.test("Explicitly setting a selected option", function(assert) {
+    elem.append( "<span id='selected-tester'>Letter F</span>" );
+
+    $.fn.editable.defaults.sort_select_options = false;
+
+    $('#selected-tester').editable('http://bla', {
+        type: 'select',
+        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" );
+    $('#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( "<span id='selected-tester'>Letter F</span>" );
+
+    $.fn.editable.defaults.sort_select_options = false;
+
+    $('#selected-tester').editable('http://bla', {
+        type: 'select',
+        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" );
+    $('#selected-tester').click();
+    assert.equal($('#selected-tester form select :selected').text(), 'Letter E', "Selects the first option as selected?")
+});
+

From 55b00c8c6e7a3dcde77329bd7f864b463216c77b Mon Sep 17 00:00:00 2001
From: nathanvda <nathan@dixis.com>
Date: Mon, 18 Jun 2018 02:17:28 +0200
Subject: [PATCH 3/7] Naive/pragmatic to prevent double form submit

Not sure what caused it, but somehow the form.submit
was called twice. This prevents double submits
in a naive but effective way.
---
 src/jquery.jeditable.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/jquery.jeditable.js b/src/jquery.jeditable.js
index 8ceaa42..a75e4c2 100644
--- a/src/jquery.jeditable.js
+++ b/src/jquery.jeditable.js
@@ -231,6 +231,7 @@
 
                 // timeout function
                 var t;
+                var is_submitting = false;
 
                 if (settings.loadurl) {
                     t = self.setTimeout(function() {
@@ -339,13 +340,21 @@
 
                 form.submit(function(e) {
 
+                    /* Do no submit. */
+                    e.preventDefault();
+                    e.stopPropagation();
+
+                    if (is_submitting) {
+                        console.log("...we are already submitting .. stop!");
+                        return false;
+                    } else {
+                        is_submitting = true;
+                    }
+
                     if (t) {
                         self.clearTimeout(t);
                     }
 
-                    /* Do no submit. */
-                    e.preventDefault();
-
                     /* Call before submit hook. */
                     /* If it returns false abort submitting. */
                     if (false !== onsubmit.apply(form, [settings, self])) {

From c8d53d070660d17d1d8ec91cb8f129bf87a903c2 Mon Sep 17 00:00:00 2001
From: nathanvda <nathan@dixis.com>
Date: Mon, 18 Jun 2018 03:29:57 +0200
Subject: [PATCH 4/7] Fix codacy remarks

---
 src/jquery.jeditable.js | 12 +++++------
 tests/tests.js          | 48 ++++++++++++++++++++---------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/jquery.jeditable.js b/src/jquery.jeditable.js
index a75e4c2..2d4c846 100644
--- a/src/jquery.jeditable.js
+++ b/src/jquery.jeditable.js
@@ -231,7 +231,7 @@
 
                 // timeout function
                 var t;
-                var is_submitting = false;
+                var isSubmitting = false;
 
                 if (settings.loadurl) {
                     t = self.setTimeout(function() {
@@ -344,11 +344,11 @@
                     e.preventDefault();
                     e.stopPropagation();
 
-                    if (is_submitting) {
-                        console.log("...we are already submitting .. stop!");
+                    if (isSubmitting) {
+                        console.warn('...we are already submitting .. stop!');
                         return false;
                     } else {
-                        is_submitting = true;
+                        isSubmitting = true;
                     }
 
                     if (t) {
@@ -677,7 +677,7 @@ var _supportInType = function (type) {
                     for (key in json) {
                         tuples.push([key, json[key]]); // Store: [key, value]
                     }
-                    if (settings.sort_select_options) {
+                    if (settings.sortSelectOptions) {
                         // sort it
                         tuples.sort(function (a, b) {
                             a = a[1];
@@ -793,7 +793,7 @@ var _supportInType = function (type) {
         loadtype   : 'GET',
         loadtext   : 'Loading...',
         placeholder: 'Click to edit',
-        sort_select_options: false,
+        sortSelectOptions: false,
         loaddata   : {},
         submitdata : {},
         ajaxoptions: {}
diff --git a/tests/tests.js b/tests/tests.js
index e8d95cb..38f15ae 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -25,73 +25,73 @@ QUnit.test('Enable/disable/destroy', function(assert) {
     assert.notOk(elem.data('event.editable'));
 });
 
-QUnit.module("select-boxes");
-QUnit.test("Default: NOT Sorting select options", function(assert) {
+QUnit.module('select-boxes');
+QUnit.test('Default: NOT Sorting select options', function(assert) {
     elem.append( "<span id='select-tester'>Letter F</span>" );
 
-    $.fn.editable.defaults.sort_select_options = false;
+    $.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")
+    assert.equal($('#select-tester form').length, 1, 'Clicking Editable adds inline form')
 
     var options_list = []
     $('#select-tester option').each(function(name, val) { options_list.push(val.text); });
 
-    assert.deepEqual(options_list, ["Letter E", "Letter F", "Letter Disk"], "Does not sort the given options-list");
+    assert.deepEqual(options_list, ['Letter E', 'Letter F', 'Letter Disk'], 'Does not sort the given options-list');
 });
-QUnit.test("Default: Sorting select options", function(assert) {
+QUnit.test('Default: Sorting select options', function(assert) {
     elem.append( "<span id='select-sorted-tester'>Letter F</span>" );
 
-    $.fn.editable.defaults.sort_select_options = true;
+    $.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")
+    assert.equal($('#select-sorted-tester form').length, 1, 'Clicking Editable adds inline form');
 
     var options_list = []
     $('#select-sorted-tester option').each(function(name, val) { options_list.push(val.text); });
 
-    assert.deepEqual(options_list, ["Letter Disk", "Letter E", "Letter F"], "It does sort the given options list");
+    assert.deepEqual(options_list, ['Letter Disk', 'Letter E', 'Letter F'], 'It does sort the given options list');
 });
-QUnit.module("select-boxes setting selected");
-QUnit.test("Explicitly setting a selected option", function(assert) {
+QUnit.module('select-boxes setting selected');
+QUnit.test('Explicitly setting a selected option', function(assert) {
     elem.append( "<span id='selected-tester'>Letter F</span>" );
 
-    $.fn.editable.defaults.sort_select_options = false;
+    $.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")
+    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) {
+QUnit.test('Not setting a selected option', function(assert) {
     elem.append( "<span id='selected-tester'>Letter F</span>" );
 
-    $.fn.editable.defaults.sort_select_options = false;
+    $.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?")
+    assert.equal($('#selected-tester form select :selected').text(), 'Letter E', 'Selects the first option as selected?');
 });
 

From 1c72eb0ab6cf2e51ced3badbd819fff736e537ce Mon Sep 17 00:00:00 2001
From: nathanvda <nathan@dixis.com>
Date: Mon, 18 Jun 2018 03:45:19 +0200
Subject: [PATCH 5/7] Fix codacy remarks, try II :)

---
 tests/tests.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/tests.js b/tests/tests.js
index 38f15ae..eb206e1 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -27,7 +27,7 @@ QUnit.test('Enable/disable/destroy', function(assert) {
 
 QUnit.module('select-boxes');
 QUnit.test('Default: NOT Sorting select options', function(assert) {
-    elem.append( "<span id='select-tester'>Letter F</span>" );
+    elem.append( '<span id="select-tester">Letter F</span>' );
 
     $.fn.editable.defaults.sortSelectOptions = false;
 
@@ -39,15 +39,15 @@ QUnit.test('Default: NOT Sorting select options', function(assert) {
 
     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')
+    assert.equal($('#select-tester form').length, 1, 'Clicking Editable adds inline form');
 
-    var options_list = []
-    $('#select-tester option').each(function(name, val) { options_list.push(val.text); });
+    var optionsList = [];
+    $('#select-tester option').each(function(name, val) { optionsList.push(val.text); });
 
-    assert.deepEqual(options_list, ['Letter E', 'Letter F', 'Letter Disk'], 'Does not sort the given options-list');
+    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( "<span id='select-sorted-tester'>Letter F</span>" );
+    elem.append( '<span id="select-sorted-tester">Letter F</span>' );
 
     $.fn.editable.defaults.sortSelectOptions = true;
 
@@ -60,10 +60,10 @@ QUnit.test('Default: Sorting select options', function(assert) {
     $('#select-sorted-tester').click();
     assert.equal($('#select-sorted-tester form').length, 1, 'Clicking Editable adds inline form');
 
-    var options_list = []
-    $('#select-sorted-tester option').each(function(name, val) { options_list.push(val.text); });
+    var optionsList = [];
+    $('#select-sorted-tester option').each(function(name, val) { optionsList.push(val.text); });
 
-    assert.deepEqual(options_list, ['Letter Disk', 'Letter E', 'Letter F'], 'It does sort the given options list');
+    assert.deepEqual(optionsList, ['Letter Disk', 'Letter E', 'Letter F'], 'It does sort the given options list');
 });
 QUnit.module('select-boxes setting selected');
 QUnit.test('Explicitly setting a selected option', function(assert) {
@@ -78,10 +78,10 @@ QUnit.test('Explicitly setting a selected option', function(assert) {
 
     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')
+    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( "<span id='selected-tester'>Letter F</span>" );
+    elem.append( '<span id="selected-tester">Letter F</span>' );
 
     $.fn.editable.defaults.sortSelectOptions = false;
 

From e1061fd21d2b50f61c998ceb3116b7d32548ad98 Mon Sep 17 00:00:00 2001
From: nathanvda <nathan@dixis.com>
Date: Mon, 18 Jun 2018 07:10:30 +0200
Subject: [PATCH 6/7] Codacy: fix last string quotes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I am leaving the console.warn in there, but we
could just as easily remove it? I know logging to
console could be a problem with IE9-10 (if it is
not opened —WTF) but I prefer to include a console
shim in my own code. And there already is another
in the code.
---
 tests/tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tests.js b/tests/tests.js
index eb206e1..486c330 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -67,7 +67,7 @@ QUnit.test('Default: Sorting select options', function(assert) {
 });
 QUnit.module('select-boxes setting selected');
 QUnit.test('Explicitly setting a selected option', function(assert) {
-    elem.append( "<span id='selected-tester'>Letter F</span>" );
+    elem.append( '<span id="selected-tester">Letter F</span>' );
 
     $.fn.editable.defaults.sortSelectOptions = false;
 

From 7ea5db43b64d1c357b9208dcea8e3f0351e91ced Mon Sep 17 00:00:00 2001
From: nathanvda <nathan@dixis.com>
Date: Mon, 18 Jun 2018 13:35:39 +0200
Subject: [PATCH 7/7] =?UTF-8?q?Fixing=20@NicolasCarpi=E2=80=99s=20remarks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jquery.jeditable.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jquery.jeditable.js b/src/jquery.jeditable.js
index 2d4c846..f0a0a25 100644
--- a/src/jquery.jeditable.js
+++ b/src/jquery.jeditable.js
@@ -684,7 +684,7 @@ var _supportInType = function (type) {
                             b = b[1];
                             return a < b ? -1 : (a > b ? 1 : 0);
                         });
-                    }     
+                    }
                     // now add the options to our select
                     var option;
                     for (var i = 0; i < tuples.length; i++) {
@@ -699,7 +699,7 @@ var _supportInType = function (type) {
                             option = $('<option />').val(key).append(value);
 
                             // add the selected prop if it's the same as original or if the key is 'selected'
-                            if (json['selected'] === key || key === $.trim(original.revert)) {
+                            if (json.selected === key || key === $.trim(original.revert)) {
                                 $(option).prop('selected', 'selected');
                             }