Merge pull request #868 from edx/hotfix/lose_header_bug

Fix bug when editing video causes other components to lose their header

common/lib/xmodule/xmodule/js/fixtures/tabs-edit.html

-<div class="base_wrapper">
+<div class="component-editor">
+    <div class="base_wrapper">
         <section class="editor-with-tabs">
             <div class="wrapper-comp-editor" id="editor-tab-id" data-html_id='test_id'>
             <div class="edit-header">
@@ -29,5 +30,6 @@
         </section>
 
         <div class="component-edit-header" style="display: block"/>
+    </div>
 </div>
 

common/lib/xmodule/xmodule/js/spec/tabs/edit.coffee

@@ -65,7 +65,7 @@ describe "TabsEditingDescriptor", ->
 
   describe "editor/settings header", ->
     it "is hidden", ->
-      expect(@descriptor.element.find(".component-edit-header").css('display')).toEqual('none')
+      expect(@descriptor.element.closest(".component-editor").find(".component-edit-header")).toBeHidden()
 
 describe "TabsEditingDescriptor special save cases", ->
   beforeEach ->

common/lib/xmodule/xmodule/js/src/tabs/tabs-aggregator.coffee

@@ -9,7 +9,7 @@ class @TabsEditingDescriptor
     ###
 
     # hide editor/settings bar
-    $('.component-edit-header').hide()
+    @element.closest('.component-editor').find('.component-edit-header').hide()
 
     @$tabs = $(".tab", @element)
     @$content = $(".component-tab", @element)