Merge remote-tracking branch 'upstream/master' into unused-vars

Conflicts:
	src/widgets/StatusBar.js

Author: Marcel Gerber

src/editor/EditorManager.js

@@ -176,7 +176,7 @@ define(function (require, exports, module) {
      * @param {!jQuery.Event} e - event
      * @param {?File} file - current file (can be null)
      */
-    function _handlecurrentFileChange(e, file) {
+    function _handleCurrentFileChange(e, file) {
         var doc = file && DocumentManager.getOpenDocumentForPath(file.fullPath);
         _notifyActiveEditorChanged(doc && doc._masterEditor);
     }
@@ -473,7 +473,7 @@ define(function (require, exports, module) {
      */
     function _createFullEditorForDocument(document, pane) {
         // Create editor; make it initially invisible
-        var editor = _createEditorForDocument(document, true, pane.$el);
+        var editor = _createEditorForDocument(document, true, pane.$content);
         editor.setVisible(false);
         pane.addView(editor);
         $(exports).triggerHandler("_fullEditorCreatedForDocument", [document, editor, pane.id]);
@@ -783,7 +783,7 @@ define(function (require, exports, module) {
     // Create PerfUtils measurement
     PerfUtils.createPerfMeasurement("JUMP_TO_DEFINITION", "Jump-To-Definiiton");
 
-    $(MainViewManager).on("currentFileChange", _handlecurrentFileChange);
+    $(MainViewManager).on("currentFileChange", _handleCurrentFileChange);
     $(MainViewManager).on("workingSetRemove workingSetRemoveList", _handleRemoveFromPaneView);
 
 

src/editor/EditorStatusBar.js

@@ -261,10 +261,10 @@ define(function (require, exports, module) {
         }
 
         if (!current) {
-            StatusBar.hide();
+            StatusBar.hideAllPanes();
         } else {
             var fullPath = current.document.file.fullPath;
-            StatusBar.show();
+            StatusBar.showAllPanes();
 
             $(current).on("cursorActivity.statusbar", _updateCursorInfo);
             $(current).on("optionChange.statusbar", function () {
@@ -397,8 +397,6 @@ define(function (require, exports, module) {
         });
 
         $statusOverwrite.on("click", _updateEditorOverwriteMode);
-        
-        _onActiveEditorChange(null, EditorManager.getActiveEditor(), null);
     }
 
     // Initialize: status bar focused listener
@@ -409,5 +407,7 @@ define(function (require, exports, module) {
         // Populate language switcher with all languages after startup; update it later if this set changes
         _populateLanguageDropdown();
         $(LanguageManager).on("languageAdded languageModified", _populateLanguageDropdown);
+        _onActiveEditorChange(null, EditorManager.getActiveEditor(), null);
+        StatusBar.show();
     });
 });

src/editor/ImageViewer.js

@@ -423,7 +423,7 @@ define(function (require, exports, module) {
         if (view) {
             pane.showView(view);
         } else {
-            view = new ImageView(file, pane.$el);
+            view = new ImageView(file, pane.$content);
             pane.addView(view, true);
         }
         return new $.Deferred().resolve().promise();

src/htmlContent/pane.html

@@ -1,3 +1,6 @@
 <div id="{{id}}" class="view-pane">
-    <div class="not-editor"></div>
+    <div class="pane-header"></div>
+    <div class="pane-content">
+        <div class="not-editor"></div>
+    </div>
 </div>