wait #5768 @1

diff --git a/resources/views/fields/fluidbook_composition.blade.php b/resources/views/fields/fluidbook_composition.blade.php
index df603fa732c126d732eb05a244cb99c36b5efeaa..e30f4102930c94e106e566e21d81f92ca3b384da 100644 (file)
--- a/resources/views/fields/fluidbook_composition.blade.php
+++ b/resources/views/fields/fluidbook_composition.blade.php
@@ -53,16 +53,27 @@
                         }
                     });
 
-                    $(document).on('change blur', '#pagenumber_input', function () {
 
-                        var v = $(this).val();
-                        var p = $(this).closest('.page').index() + 1;
-                        $("#pagenumber_input").remove();
+                    function updateNumFromEvent(force) {
+                        let i = $('#pagenumber_input');
+                        var v = i.val();
+                        var p = i.closest('.page').index() + 1;
+                        i.remove();
 
-                        if (v !== $(this).attr('data-orig-value')) {
+                        if (force || v !== i.attr('data-orig-value')) {
                             updateNumFromEdit(v, p);
                         }
+                    }
 
+                    $(document).on('change blur', '#pagenumber_input', function () {
+                        updateNumFromEvent(false);
+                    });
+
+                    $(document).on('keypress', '#pagenumber_input', function (e) {
+                        var keycode = (e.keyCode ? e.keyCode : e.which);
+                        if (keycode == 13) {
+                            updateNumFromEvent(true);
+                        }
                     });
 
                     $(document).on('click', '#composition_pages .page span', function () {
@@ -176,7 +187,7 @@
                 }
 
                 function showProgressBar(message, progress, uploadID) {
-                    showLoader(message,progress)
+                    showLoader(message, progress)
 
                     if (progress >= 3) {
                         hideProgressBar();
@@ -200,7 +211,7 @@
 
                 function hideProgressBar() {
                     setTimeout(function () {
-                      hideLoader();
+                        hideLoader();
                     }, 2000);
                 }
 
@@ -296,7 +307,7 @@
                         '<input type="file" id="compositionUploadBrowse" name="file" value="" accept=".pdf" />' +
                         '<input type="hidden" name="_token" value="{{csrf_token()}}" />' +
                         '</form>');
-                    $('#composition_pages').append(form);
+                    $('#composition_uploader').append(form);
                     $("#compositionUploadBrowse").click();
                 }