From 3369de966048442d3f9246a497f5f90132b44779 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Sat, 17 Feb 2018 20:37:23 +0000 Subject: [PATCH] possible fix for RP for forms --- public/js/app.js | 33 +++++++++---------- resources/assets/js/app.js | 33 +++++++++---------- .../html/src/FormBuilder.php | 4 +-- 3 files changed, 34 insertions(+), 36 deletions(-) diff --git a/public/js/app.js b/public/js/app.js index f9821404..7c559614 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -61,6 +61,22 @@ $.when( $.ready ).then(function() { $("#upload").change(function() { readURL(this); }); + /*$(".droppable").droppable({ + tolerance: "intersect", + drop: function( event, ui ) { + var tag = $( this ).data('id'); + var item = $( ui.draggable ).data('id'); + + $.get('tag/add/'+tag+'/'+item, function(data) { + if(data == 1) { + $( ui.draggable ).remove(); + } else { + alert('not added'); + } + }); + + } + });*/ $( "#sortable" ).sortable({ stop: function (event, ui) { @@ -76,23 +92,6 @@ $.when( $.ready ).then(function() { }); $("#sortable").sortable("disable"); - $(".droppable").droppable({ - tolerance: "pointer", - greedy: true, - drop: function( event, ui ) { - var tag = $( this ).data('id'); - var item = $( ui.draggable ).data('id'); - - $.get('tag/add/'+tag+'/'+item, function(data) { - if(data == 1) { - $( ui.draggable ).remove(); - } else { - //alert('not added'); - } - }); - - } - }); $('#app').on('click', '#config-button', function(e) { diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 322b1b1b..0bb37e4b 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -52,6 +52,22 @@ $.when( $.ready ).then(function() { $("#upload").change(function() { readURL(this); }); + /*$(".droppable").droppable({ + tolerance: "intersect", + drop: function( event, ui ) { + var tag = $( this ).data('id'); + var item = $( ui.draggable ).data('id'); + + $.get('tag/add/'+tag+'/'+item, function(data) { + if(data == 1) { + $( ui.draggable ).remove(); + } else { + alert('not added'); + } + }); + + } + });*/ $( "#sortable" ).sortable({ stop: function (event, ui) { @@ -67,23 +83,6 @@ $.when( $.ready ).then(function() { }); $("#sortable").sortable("disable"); - $(".droppable").droppable({ - tolerance: "pointer", - greedy: true, - drop: function( event, ui ) { - var tag = $( this ).data('id'); - var item = $( ui.draggable ).data('id'); - - $.get('tag/add/'+tag+'/'+item, function(data) { - if(data == 1) { - $( ui.draggable ).remove(); - } else { - //alert('not added'); - } - }); - - } - }); $('#app').on('click', '#config-button', function(e) { diff --git a/vendor/laravelcollective/html/src/FormBuilder.php b/vendor/laravelcollective/html/src/FormBuilder.php index 2b69ac05..8d33ce02 100644 --- a/vendor/laravelcollective/html/src/FormBuilder.php +++ b/vendor/laravelcollective/html/src/FormBuilder.php @@ -1055,10 +1055,10 @@ class FormBuilder protected function getRouteAction($options) { if (is_array($options)) { - return $this->url->route($options[0], array_slice($options, 1)); + return $this->url->route($options[0], array_slice($options, 1), false); } - return $this->url->route($options); + return $this->url->route($options, [], false); } /**