changed var names to match changes in 2.5.1

helios-ag · Oct 27, 2014 · 6a74e35 · 6a74e35
1 parent ce9ccfd
commit 6a74e35
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Controller/ElFinderController.php b/Controller/ElFinderController.php
@@ -33,7 +33,7 @@ public function showAction($instance)
      * @param $instance
      * @return array
      */
-    private function selectEditor($parameters, $instance, $id = null)
+    private function selectEditor($parameters, $instance, $formTypeId = null)
     {
         $editor = $parameters['editor'];
         $locale = $parameters['locale'] ?: $this->container->getParameter('locale');
@@ -77,7 +77,7 @@ private function selectEditor($parameters, $instance, $id = null)
                     'fullscreen' => $fullscreen,
                     'includeAssets' => $includeAssets,
                     'instance' => $instance,
-                    'id'=>$id
+                    'id'=>$formTypeId
                 );
                 return $result;
             default:

diff --git a/Resources/views/Form/elfinder_widget.html.twig b/Resources/views/Form/elfinder_widget.html.twig
@@ -5,8 +5,8 @@
             $('[data-type="elfinder-input-field"][id="{{ id }}"]').on("click",function() {
                 var childWin = window.open("{{path('elfinder', {'instance': instance })}}?id={{ id }}", "popupWindow", "height=450, width=900");
             });
-            function setValue(value, id) {
-                $('[data-type="elfinder-input-field"]'+ (id ? '[id="'+ id +'"]': '')).val(value);
+            function setValue(value, element_id) {
+                $('[data-type="elfinder-input-field"]'+ (element_id ? '[id="'+ element_id +'"]': '')).val(value);
             }
         </script>
     {% endif %}