Merge branch 'master' into 2.0

obisconcept · Sep 26, 2017 · 28968f4 · 28968f4
2 parents e691293 + fbb14be
commit 28968f4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Resources/Private/Assets/JavaScript/main.js b/Resources/Private/Assets/JavaScript/main.js
@@ -21,9 +21,9 @@ window.initAjaxForm = function() {
         var presetName = $(ajaxForm).attr('data-preset-name');
         var dimension = $(ajaxForm).attr('data-dimension');
 
-        var formAjaxUrl = location.protocol + '//' + location.host + '/form/'  + ( dimension != '' ? dimension + '/' : '' ) + presetName + '/' + formIdentifier;
+        var formAjaxUrl = location.protocol + '//' + location.host + '/form/'  + ( dimension != '' ? dimension + '/' : 'en/' ) + presetName + '/' + formIdentifier;
 
-        $(ajaxForm).on('submit', 'form', function (e) {
+        $(ajaxForm).off('submit').on('submit', 'form', function (e) {
 
             var formObj = $(this);
             var formURL = formObj.attr('action');

diff --git a/Resources/Public/JavaScript/backend.min.js b/Resources/Public/JavaScript/backend.min.js
diff --git a/Resources/Public/JavaScript/main.js b/Resources/Public/JavaScript/main.js
@@ -21,9 +21,9 @@ window.initAjaxForm = function() {
         var presetName = $(ajaxForm).attr('data-preset-name');
         var dimension = $(ajaxForm).attr('data-dimension');
 
-        var formAjaxUrl = location.protocol + '//' + location.host + '/form/'  + ( dimension != '' ? dimension + '/' : '' ) + presetName + '/' + formIdentifier;
+        var formAjaxUrl = location.protocol + '//' + location.host + '/form/'  + ( dimension != '' ? dimension + '/' : 'en/' ) + presetName + '/' + formIdentifier;
 
-        $(ajaxForm).on('submit', 'form', function (e) {
+        $(ajaxForm).off('submit').on('submit', 'form', function (e) {
 
             var formObj = $(this);
             var formURL = formObj.attr('action');

diff --git a/Resources/Public/JavaScript/main.min.js b/Resources/Public/JavaScript/main.min.js