Merge remote-tracking branch 'origin' into rlim/update-codemirror

Author: RaymondLim

README.md

@@ -105,9 +105,9 @@ Not sure you needed the exclamation point there, but we like your enthusiasm.
 
 #### What's Brackets working on next?
 
-* In our [feature backlog](http://bit.ly/BracketsBacklog), the columns labeled "Sprint N"
-  are features already in progress and should ship within 2 weeks. Features at the top of
-  the "Product Backlog" list will come next.
+* In our [feature backlog](http://bit.ly/BracketsBacklog), the columns to the right
+  (starting from "Development") list the features that we're currently working on.
+  "Ready" shows what we'll be working on next.
 * Watch our [GitHub activity stream](https://github.com/adobe/brackets/pulse).
 
 #### Contact info

src/LiveDevelopment/Agents/RemoteFunctions.js

@@ -254,27 +254,26 @@ function RemoteFunctions(experimental) {
                 "border-bottom-right-radius": styles.borderBottomRightRadius,
                 "border-style": "solid",
                 "border-width": "1px",
-                "border-color": "rgb(94,167,255)",
+                "border-color": "#00a2ff",
+                "box-shadow": "0 0 1px #fff",
                 "box-sizing": "border-box"
             };
 
             var animateStartValues = {
-                "opacity": 0,
-                "background": "rgba(94,167,255, 0.5)",
-                "box-shadow": "0 0 6px 1px rgba(94,167,255, 0.6), inset 0 0 4px 1px rgba(255,255,255,1)"
+                "background-color": "rgba(0, 162, 255, 0.5)",
+                "opacity": 0
             };
 
             var animateEndValues = {
-                "opacity": 1,
-                "background": "rgba(94,167,255, 0.1)",
-                "box-shadow": "0 0 1px 0 rgba(94,167,255, 0), inset 0 0 4px 1px rgba(255,255,255,0.8)"
+                "background-color": "rgba(0, 162, 255, 0)",
+                "opacity": 1
             };
 
             var transitionValues = {
-                "-webkit-transition-property": "opacity, box-shadow, background",
-                "-webkit-transition-duration": "0.3s, 0.4s, 0.4s",
-                "transition-property": "opacity, box-shadow, background",
-                "transition-duration": "0.3s, 0.4s, 0.4s"
+                "-webkit-transition-property": "opacity, background-color",
+                "-webkit-transition-duration": "300ms, 2.3s",
+                "transition-property": "opacity, background-color",
+                "transition-duration": "300ms, 2.3s"
             };
 
             function _setStyleValues(styleValues, obj) {

src/editor/Editor.js

@@ -212,6 +212,9 @@ define(function (require, exports, module) {
         // (if makeMasterEditor, we attach the Doc back to ourselves below once we're fully initialized)
 
         this._inlineWidgets = [];
+        this._inlineWidgetQueues = {};
+        this._hideMarks = [];
+        
         this._$messagePopover = null;
 
         // Editor supplies some standard keyboard behavior extensions of its own
@@ -1984,14 +1987,14 @@ define(function (require, exports, module) {
      * @type {Object}
      * Promise queues for inline widgets being added to a given line.
      */
-    Editor.prototype._inlineWidgetQueues = {};
+    Editor.prototype._inlineWidgetQueues = null;
 
     /**
      * @private
      * @type {Array}
      * A list of objects corresponding to the markers that are hiding lines in the current editor.
      */
-    Editor.prototype._hideMarks = [];
+    Editor.prototype._hideMarks = null;
 
     /**
      * @private