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

Conflicts:
	src/search/FindReplace.js
	src/utils/ViewUtils.js

Author: Marcel Gerber

src/editor/EditorManager.js

@@ -177,8 +177,8 @@ define(function (require, exports, module) {
      * @param {?File} file - current file (can be null)
      */
     function _handlecurrentFileChange(e, file) {
-        var doc = file ? DocumentManager.getOpenDocumentForPath(file.fullPath) : null;
-        _notifyActiveEditorChanged(doc ? doc._masterEditor : null);
+        var doc = file && DocumentManager.getOpenDocumentForPath(file.fullPath);
+        _notifyActiveEditorChanged(doc && doc._masterEditor);
     }
 
     /**
@@ -209,7 +209,7 @@ define(function (require, exports, module) {
         return editor;
     }
 
- /**
+    /**
      * @private
      * Finds an inline widget provider from the given list that can offer a widget for the current cursor
      * position, and once the widget has been created inserts it into the editor.
@@ -553,9 +553,10 @@ define(function (require, exports, module) {
 
         // show the view
         pane.showView(document._masterEditor);
+
         // give it focus
         document._masterEditor.focus();
-        
+
         if (createdNewEditor) {
             _restoreEditorViewState(document._masterEditor);
         }

src/editor/ImageViewer.js

@@ -51,7 +51,8 @@ define(function (require, exports, module) {
      */
     function ImageView(file, $container) {
         this.file = file;
-        this.$el = $(Mustache.render(ImageViewTemplate, {fullPath: file.fullPath}));
+        this.$el = $(Mustache.render(ImageViewTemplate, {fullPath: file.fullPath,
+                                                         now: new Date().valueOf()}));
 
         $container.append(this.$el);
 
@@ -393,15 +394,18 @@ define(function (require, exports, module) {
      */
     ImageView.prototype.refresh = function () {
         var noCacheUrl = this.$imagePreview.attr("src"),
-            now = new Date().valueOf();
+            now = new Date().valueOf(),
+            index = noCacheUrl.indexOf("?");
 
-        // Append a #<time-stamp> fragement to the URL 
-        //  to force a reload of the image
-        if (noCacheUrl.indexOf("#") > 0) {
-            noCacheUrl = noCacheUrl.replace(/#\d+/, "#" + now);
-        } else {
-            noCacheUrl = noCacheUrl + "#" + now;
+        // strip the old param off 
+        if (index > 0) {
+            noCacheUrl = noCacheUrl.slice(0, index);
         }
+        
+        // add a new param which will force chrome to 
+        //  re-read the image from disk 
+        noCacheUrl = noCacheUrl + "?ver=" + now;
+        
 
         // Update the DOM node with the src URL 
         this.$imagePreview.attr("src", noCacheUrl);

src/htmlContent/image-view.html

@@ -6,7 +6,7 @@
         </div>
         <div class="image">
             <div class="image-scale"></div>
-            <img class="image-preview" src="file:///{{fullPath}}">
+            <img class="image-preview" src="file:///{{fullPath}}?ver={{now}}">
             <div class="image-tip">
                 <table class="tip-container">
                     <tr>

src/utils/Async.js

@@ -337,11 +337,16 @@ define(function (require, exports, module) {
      * @param {boolean=} failOnReject       Whether to reject or not if one of the promises has been rejected.
      * @param {number=} timeout             Number of milliseconds to wait until rejecting the promise
      * 
-     * @return {$.Promise} Promise which will be completed once al the 
+     * @return {$.Promise} A Promise which will be resolved once all dependent promises are resolved. 
+     *                     It is resolved with an array of results from the successfully resolved dependent promises.
+     *                     The resulting array may not be in the same order or contain as many items as there were 
+     *                     promises to wait on and it will contain 'undefined' entries for those promises that resolve
+     *                     without a result.
      * 
      */
     function waitForAll(promises, failOnReject, timeout) {
         var masterDeferred = new $.Deferred(),
+            results = [],
             count = 0,
             sawRejects = false;
 
@@ -362,13 +367,16 @@ define(function (require, exports, module) {
                 .fail(function (err) {
                     sawRejects = true;
                 })
+                .done(function (result) {
+                    results.push(result);
+                })
                 .always(function () {
                     count++;
                     if (count === promises.length) {
                         if (failOnReject && sawRejects) {
                             masterDeferred.reject();
                         } else {
-                            masterDeferred.resolve();
+                            masterDeferred.resolve(results);
                         }
                     }
                 });

src/utils/Resizer.js

@@ -101,6 +101,29 @@ define(function (require, exports, module) {
         }
     }
 
+    /**
+     * Removes the resizability of an element if it's resizable
+     * @param {DOMNode} element Html element in which to remove sizing 
+     */
+    function removeSizable(element) {
+        var removeSizableFunc = $(element).data("removeSizable");
+        if (removeSizableFunc) {
+            removeSizableFunc.apply(element);
+        }
+    }
+    
+    /**
+     * Updates the sizing div by resyncing to the sizing edge of the element
+     * Call this method after manually changing the size of the element
+     * @param {DOMNode} element Html element whose sizer should be resynchronized
+     */
+    function resyncSizer(element) {
+        var resyncSizerFunc = $(element).data("resyncSizer");
+        if (resyncSizerFunc) {
+            resyncSizerFunc.apply(element);
+        }
+    }
+    
     /**
      * Returns the visibility state of a resizable element.
      * @param {DOMNode} element Html element to toggle
@@ -144,9 +167,10 @@ define(function (require, exports, module) {
      *                          the resizable element's size (useful for siblings laid out to the right of
      *                          the element). Must lie in element's parent's subtree.
      * @param {?boolean} createdByWorkspaceManager For internal use only
+     * @param {?boolean} usePercentages Maintain the size of the element as a percentage of its parent
+     *                          the default is to maintain the size of the element in pixels
      */
-    function makeResizable(element, direction, position, minSize, collapsible, forceLeft, createdByWorkspaceManager) {
-        
+    function makeResizable(element, direction, position, minSize, collapsible, forceLeft, createdByWorkspaceManager, usePercentages) {
         var $resizer            = $('<div class="' + direction + '-resizer"></div>'),
             $element            = $(element),
             $parent             = $element.parent(),
@@ -157,7 +181,40 @@ define(function (require, exports, module) {
             animationRequest    = null,
             directionProperty   = direction === DIRECTION_HORIZONTAL ? "clientX" : "clientY",
             directionIncrement  = (position === POSITION_TOP || position === POSITION_LEFT) ? 1 : -1,
-            elementSizeFunction = direction === DIRECTION_HORIZONTAL ? $element.width : $element.height,
+            parentSizeFunction  = direction === DIRECTION_HORIZONTAL ? $parent.innerWidth : $parent.innerHeight,
+            
+            elementSizeFunction = function (newSize) {
+                if (!newSize) {
+                    // calling the function as a getter
+                    if (direction === DIRECTION_HORIZONTAL) {
+                        return this.width();
+                    } else {
+                        return this.height();
+                    }
+                } else if (!usePercentages) {
+                    if (direction === DIRECTION_HORIZONTAL) {
+                        return this.width(newSize);
+                    } else {
+                        return this.height(newSize);
+                    }
+                } else {
+                    // calling the function as a setter
+                    var parentSize = parentSizeFunction.apply($parent),
+                        percentage,
+                        prop;
+
+                    if (direction === DIRECTION_HORIZONTAL) {
+                        prop = "width";
+                    } else {
+                        prop = "height";
+                    }
+                    percentage = newSize / parentSize;
+                    this.css(prop, (percentage * 100) + "%");
+                    
+                    return this; // chainable
+                }
+            },
+            
             resizerCSSPosition  = direction === DIRECTION_HORIZONTAL ? "left" : "top",
             contentSizeFunction = direction === DIRECTION_HORIZONTAL ? $resizableElement.width : $resizableElement.height;
 
@@ -197,6 +254,30 @@ define(function (require, exports, module) {
             }
         }
 
+        // If the resizer is positioned right or bottom of the panel, we need to listen to
+        // reposition it if the element size changes externally
+        function repositionResizer(elementSize) {
+            var resizerPosition = elementSize || 1;
+            if (position === POSITION_RIGHT || position === POSITION_BOTTOM) {
+                $resizer.css(resizerCSSPosition, resizerPosition);
+            }
+        }
+            
+        $element.data("removeSizable", function () {
+            $resizer.off(".resizer");
+            
+            $element.removeData("show");
+            $element.removeData("hide");
+            $element.removeData("resyncSizer");
+            $element.removeData("removeSizable");
+            
+            $resizer.remove();
+        });
+        
+        $element.data("resyncSizer", function () {
+            repositionResizer(elementSizeFunction.apply($element));
+        });
+        
         $element.data("show", function () {
             var elementOffset   = $element.offset(),
                 elementSize     = elementSizeFunction.apply($element) || elementPrefs.size,
@@ -247,16 +328,8 @@ define(function (require, exports, module) {
             PreferencesManager.setViewState(elementID, elementPrefs, null, isResizing);
         });
 
-        // If the resizer is positioned right or bottom of the panel, we need to listen to
-        // reposition it if the element size changes externally
-        function repositionResizer(elementSize) {
-            var resizerPosition = elementSize || 1;
-            if (position === POSITION_RIGHT || position === POSITION_BOTTOM) {
-                $resizer.css(resizerCSSPosition, resizerPosition);
-            }
-        }
-    
-        $resizer.on("mousedown", function (e) {
+
+        $resizer.on("mousedown.resizer", function (e) {
             var $resizeShield   = $("<div class='resizing-container " + direction + "-resizing' />"),
                 startPosition   = e[directionProperty],
                 startSize       = $element.is(":visible") ? elementSizeFunction.apply($element) : 0,
@@ -408,7 +481,7 @@ define(function (require, exports, module) {
             }
         }
     }
-	
+
     // Scan DOM for horz-resizable and vert-resizable classes and make them resizable
     AppInit.htmlReady(function () {
         var minSize = DEFAULT_MIN_SIZE;
@@ -465,6 +538,8 @@ define(function (require, exports, module) {
     PreferencesManager.convertPreferences(module, {"panelState": "user"}, true, _isPanelPreferences);
 
     exports.makeResizable   = makeResizable;
+    exports.removeSizable   = removeSizable;
+    exports.resyncSizer     = resyncSizer;
     exports.toggle          = toggle;
     exports.show            = show;
     exports.hide            = hide;
@@ -475,4 +550,6 @@ define(function (require, exports, module) {
     exports.DIRECTION_HORIZONTAL = DIRECTION_HORIZONTAL;
     exports.POSITION_TOP         = POSITION_TOP;
     exports.POSITION_RIGHT       = POSITION_RIGHT;
+    exports.POSITION_BOTTOM      = POSITION_BOTTOM;
+    exports.POSITION_LEFT        = POSITION_LEFT;
 });

src/utils/ViewUtils.js

@@ -184,10 +184,7 @@ define(function (require, exports, module) {
      */
     function sidebarList($scrollerElement, selectedClassName, leafClassName) {
         var $listElement = $scrollerElement.find("ul"),
-            $selectionMarker,
-            $selectionTriangle,
-            $sidebar = $("#sidebar"),
-            showTriangle = true;
+            $selectionMarker;
 
         // build selectionMarker and position absolute within the scroller
         $selectionMarker = $(window.document.createElement("div")).addClass("sidebar-selection");
@@ -198,56 +195,22 @@ define(function (require, exports, module) {
 
         // use relative postioning for clipping the selectionMarker within the scrollElement
         $scrollerElement.css("position", "relative");
-        
-        // build selectionTriangle and position fixed to the window
-        $selectionTriangle = $(window.document.createElement("div")).addClass("sidebar-selection-triangle");
-        
-        $scrollerElement.append($selectionTriangle);
+
 
         selectedClassName = "." + (selectedClassName || "selected");
 
-        var updateSelectionTriangle = function () {
-            var selectionMarkerHeight = $selectionMarker.height(),
-                selectionMarkerOffset = $selectionMarker.offset(),  // offset relative to *document*
-                scrollerOffset = $scrollerElement.offset(),
-                triangleHeight = $selectionTriangle.outerHeight(),
-                scrollerTop = scrollerOffset.top,
-                scrollerBottom = scrollerTop + $scrollerElement.outerHeight(),
-                triangleTop = selectionMarkerOffset.top;
-            
-            $selectionTriangle.css("top", triangleTop);
-            $selectionTriangle.css("left", $sidebar.width() - $selectionTriangle.outerWidth());
-            toggleClass($selectionTriangle, "triangle-visible", showTriangle);
-                
-            var triangleClipOffsetYBy = Math.floor((selectionMarkerHeight - triangleHeight) / 2),
-                triangleBottom = triangleTop + triangleHeight + triangleClipOffsetYBy;
-            
-            if (triangleTop < scrollerTop || triangleBottom > scrollerBottom) {
-                $selectionTriangle.css("clip", "rect(" + Math.max(scrollerTop - triangleTop - triangleClipOffsetYBy, 0) + "px, auto, " +
-                                           (triangleHeight - Math.max(triangleBottom - scrollerBottom, 0)) + "px, auto)");
-            } else {
-                $selectionTriangle.css("clip", "");
-            }
-        };
 
         var hideSelectionMarker = function (event) {
-            $selectionTriangle.addClass("forced-hidden");
             $selectionMarker.addClass("forced-hidden");
         };
 
         var updateSelectionMarker = function (event, reveal) {
             // find the selected list item
             var $listItem = $listElement.find(selectedClassName).closest("li");
 
-            if (leafClassName) {
-                showTriangle = $listItem.hasClass(leafClassName);
-            }
-
-            $selectionTriangle.removeClass("forced-hidden");
             $selectionMarker.removeClass("forced-hidden");
 
             // always hide selection visuals first to force layout (issue #719)
-            $selectionTriangle.hide();
             $selectionMarker.hide();
 
             if ($listItem.length === 1) {
@@ -261,9 +224,6 @@ define(function (require, exports, module) {
                 $selectionMarker.css("top", selectionMarkerTop);
                 $selectionMarker.show();
 
-                updateSelectionTriangle();
-                $selectionTriangle.show();
-            
                 // fully scroll to the selectionMarker if it's not initially in the viewport
                 var scrollerElement = $scrollerElement.get(0),
                     scrollerHeight = scrollerElement.clientHeight,
@@ -283,15 +243,10 @@ define(function (require, exports, module) {
         };
 
         $listElement.on("selectionChanged", updateSelectionMarker);
-        $scrollerElement.on("scroll", updateSelectionTriangle);
-        $scrollerElement.on("selectionRedraw", updateSelectionTriangle);
         $scrollerElement.on("selectionHide", hideSelectionMarker);
 
         // update immediately
         updateSelectionMarker();
-        
-        // update clipping when the window resizes
-        _resizeHandlers.push(updateSelectionTriangle);
     }
 
     /**