#0040945 - Fix bugs on edit form with fullscreen map feature

1 files changed, 18 insertions, 15 deletions

diff --git a/app/assets/javascripts/tools.coffee b/app/assets/javascripts/tools.coffee
index 9274e57e9..04b61cde6 100644
--- a/app/assets/javascripts/tools.coffee
+++ b/app/assets/javascripts/tools.coffee
@@ -1,29 +1,32 @@
 (($) ->
   $ ->
     $('.ce-hide').removeClass 'ce-hide'
-    $('#map').before('<button id="ce-SidebarNavBlock" class="hide"><i class="fa fa-bars"></i></button>')
-    $('[data-ce-action]').click ->
+    sidebar = $('#sidebar').text().trim().length > 0
+    if (sidebar)
+      $('#map').before('<button id="ce-SidebarNavBlock" class="hide"><i class="fa fa-bars"></i></button>')
+    $('[data-ce-action]').click (e) ->
+      e.preventDefault()
       action = $(this).data('ce-action')
       id = $(this).data('ce-id')
       $map = $('#'+id)
       if (action == 'map-fullscreen')
-        if $map.hasClass('ce-isExpanded')
-          $map.removeClass('ce-isExpanded')
-          $map.css('width', '')
+        if $map.hasClass('ce-MapBlock-fullWidth')
+          $map.removeClass('ce-MapBlock-fullWidth')
           $map.css('height', '')
         else
           offset_top = $map.offset().top + 2
           height = $(window).height() - offset_top
-          $map.addClass('ce-isExpanded')
-          $map.css('height', height).css('width', '100%')
-        $('#sidebar').toggleClass('hide')
-        $('#sidebar').toggleClass('ce-SidebarFloatBlock')
-        $('#ce-SidebarNavBlock').toggleClass('hide')
-        $map.closest('.col-md-9, .col-md-12').toggleClass('col-md-9 col-md-12')
+          $map.addClass('ce-MapBlock-fullWidth')
+          $map.css('height', height)
+        if sidebar
+          $('#sidebar').toggleClass('hide')
+          $('#sidebar').toggleClass('ce-SidebarFloatBlock')
+          $('#ce-SidebarNavBlock').toggleClass('hide')
+          $map.closest('.col-md-9, .col-md-12').toggleClass('col-md-9 col-md-12')
         $map.find('i').toggleClass('fa-expand fa-compress')
         map.updateSize()
-      $('#ce-SidebarNavBlock').click ->
-        $('.ce-SidebarFloatBlock').toggleClass('hide')
-    return
-  return
+      if sidebar
+        $('#ce-SidebarNavBlock').click (e) ->
+          e.preventDefault()
+          $('.ce-SidebarFloatBlock').toggleClass('hide')
 ) jQuery