gollum 3.1.2 → 3.1.3

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mouse/mouse_event.js

@@ -92,18 +92,15 @@ var MouseEvent = exports.MouseEvent = function(domEvent, editor) {
             
         var editor = this.editor;
         
-        if (editor.getReadOnly()) {
+
+        var selectionRange = editor.getSelectionRange();
+        if (selectionRange.isEmpty())
             this.$inSelection = false;
-        }
         else {
-            var selectionRange = editor.getSelectionRange();
-            if (selectionRange.isEmpty())
-                this.$inSelection = false;
-            else {
-                var pos = this.getDocumentPosition();
-                this.$inSelection = selectionRange.contains(pos.row, pos.column);
-            }
+            var pos = this.getDocumentPosition();
+            this.$inSelection = selectionRange.contains(pos.row, pos.column);
         }
+
         return this.$inSelection;
     };
     

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mouse/mouse_handler.js

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -14,7 +14,7 @@
  *     * Neither the name of Ajax.org B.V. nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -36,24 +36,37 @@ var useragent = require("../lib/useragent");
 var DefaultHandlers = require("./default_handlers").DefaultHandlers;
 var DefaultGutterHandler = require("./default_gutter_handler").GutterHandler;
 var MouseEvent = require("./mouse_event").MouseEvent;
-var DragdropHandler = require("./dragdrop").DragdropHandler;
+var DragdropHandler = require("./dragdrop_handler").DragdropHandler;
+var config = require("../config");
 
 var MouseHandler = function(editor) {
+    var _self = this;
     this.editor = editor;
 
     new DefaultHandlers(this);
     new DefaultGutterHandler(this);
     new DragdropHandler(this);
 
-    event.addListener(editor.container, "mousedown", function(e) {
+    var focusEditor = function(e) {
+        // because we have to call event.preventDefault() any window on ie and iframes
+        // on other browsers do not get focus, so we have to call window.focus() here
+        if (!document.hasFocus || !document.hasFocus())
+            window.focus();
         editor.focus();
-        return event.preventDefault(e);
-    });
+    };
 
     var mouseTarget = editor.renderer.getMouseEventTarget();
     event.addListener(mouseTarget, "click", this.onMouseEvent.bind(this, "click"));
     event.addListener(mouseTarget, "mousemove", this.onMouseMove.bind(this, "mousemove"));
-    event.addMultiMouseDownListener(mouseTarget, [300, 300, 250], this, "onMouseEvent");
+    event.addMultiMouseDownListener(mouseTarget, [400, 300, 250], this, "onMouseEvent");
+    if (editor.renderer.scrollBarV) {
+        event.addMultiMouseDownListener(editor.renderer.scrollBarV.inner, [400, 300, 250], this, "onMouseEvent");
+        event.addMultiMouseDownListener(editor.renderer.scrollBarH.inner, [400, 300, 250], this, "onMouseEvent");
+        if (useragent.isIE) {
+            event.addListener(editor.renderer.scrollBarV.element, "mousedown", focusEditor);
+            event.addListener(editor.renderer.scrollBarH.element, "mousedown", focusEditor);
+        }
+    }
     event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this, "mousewheel"));
 
     var gutterEl = editor.renderer.$gutter;
@@ -61,30 +74,33 @@ var MouseHandler = function(editor) {
     event.addListener(gutterEl, "click", this.onMouseEvent.bind(this, "gutterclick"));
     event.addListener(gutterEl, "dblclick", this.onMouseEvent.bind(this, "gutterdblclick"));
     event.addListener(gutterEl, "mousemove", this.onMouseEvent.bind(this, "guttermousemove"));
-};
 
-(function() {
+    event.addListener(mouseTarget, "mousedown", focusEditor);
 
-    this.$scrollSpeed = 1;
-    this.setScrollSpeed = function(speed) {
-        this.$scrollSpeed = speed;
-    };
+    event.addListener(gutterEl, "mousedown", function(e) {
+        editor.focus();
+        return event.preventDefault(e);
+    });
 
-    this.getScrollSpeed = function() {
-        return this.$scrollSpeed;
-    };
+    editor.on("mousemove", function(e){
+        if (_self.state || _self.$dragDelay || !_self.$dragEnabled)
+            return;
 
-    this.onMouseEvent = function(name, e) {
-        this.editor._emit(name, new MouseEvent(e, this.editor));
-    };
+        var character = editor.renderer.screenToTextCoordinates(e.x, e.y);
+        var range = editor.session.selection.getRange();
+        var renderer = editor.renderer;
 
-    this.$dragDelay = 250;
-    this.setDragDelay = function(dragDelay) {
-        this.$dragDelay = dragDelay;
-    };
+        if (!range.isEmpty() && range.insideStart(character.row, character.column)) {
+            renderer.setCursorStyle("default");
+        } else {
+            renderer.setCursorStyle("");
+        }
+    });
+};
 
-    this.getDragDelay = function() {
-        return this.$dragDelay;
+(function() {
+    this.onMouseEvent = function(name, e) {
+        this.editor._emit(name, new MouseEvent(e, this.editor));
     };
 
     this.onMouseMove = function(name, e) {
@@ -109,13 +125,10 @@ var MouseHandler = function(editor) {
         this.state = state;
     };
 
-    this.captureMouse = function(ev, state) {
-        if (state)
-            this.setState(state);
-
+    this.captureMouse = function(ev, mouseMoveHandler) {
         this.x = ev.x;
         this.y = ev.y;
-        
+
         this.isMousePressed = true;
 
         // do not move textarea during selection
@@ -125,37 +138,68 @@ var MouseHandler = function(editor) {
 
         var self = this;
         var onMouseMove = function(e) {
+            if (!e) return;
+            // if editor is loaded inside iframe, and mouseup event is outside
+            // we won't recieve it, so we cancel on first mousemove without button
+            if (useragent.isWebKit && !e.which && self.releaseMouse)
+                return self.releaseMouse();
+
             self.x = e.clientX;
             self.y = e.clientY;
+            mouseMoveHandler && mouseMoveHandler(e);
+            self.mouseEvent = new MouseEvent(e, self.editor);
+            self.$mouseMoved = true;
         };
 
         var onCaptureEnd = function(e) {
             clearInterval(timerId);
+            onCaptureInterval();
             self[self.state + "End"] && self[self.state + "End"](e);
-            self.$clickSelection = null;
+            self.state = "";
             if (renderer.$keepTextAreaAtCursor == null) {
                 renderer.$keepTextAreaAtCursor = true;
                 renderer.$moveTextAreaToCursor();
             }
             self.isMousePressed = false;
+            self.$onCaptureMouseMove = self.releaseMouse = null;
+            e && self.onMouseEvent("mouseup", e);
         };
 
         var onCaptureInterval = function() {
             self[self.state] && self[self.state]();
-        }
-        
+            self.$mouseMoved = false;
+        };
+
         if (useragent.isOldIE && ev.domEvent.type == "dblclick") {
-            setTimeout(function() {
-                onCaptureInterval();
-                onCaptureEnd(ev.domEvent);
-            });
-            return;
+            return setTimeout(function() {onCaptureEnd(ev);});
         }
 
-        event.capture(this.editor.container, onMouseMove, onCaptureEnd);
+        self.$onCaptureMouseMove = onMouseMove;
+        self.releaseMouse = event.capture(this.editor.container, onMouseMove, onCaptureEnd);
         var timerId = setInterval(onCaptureInterval, 20);
     };
+    this.releaseMouse = null;
+    this.cancelContextMenu = function() {
+        var stop = function(e) {
+            if (e && e.domEvent && e.domEvent.type != "contextmenu")
+                return;
+            this.editor.off("nativecontextmenu", stop);
+            if (e && e.domEvent)
+                event.stopEvent(e.domEvent);
+        }.bind(this);
+        setTimeout(stop, 10);
+        this.editor.on("nativecontextmenu", stop);
+    };
 }).call(MouseHandler.prototype);
 
+config.defineOptions(MouseHandler.prototype, "mouseHandler", {
+    scrollSpeed: {initialValue: 2},
+    dragDelay: {initialValue: (useragent.isMac ? 150 : 0)},
+    dragEnabled: {initialValue: true},
+    focusTimout: {initialValue: 0},
+    tooltipFollowsMouse: {initialValue: true}
+});
+
+
 exports.MouseHandler = MouseHandler;
 });

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/{mode/liquid_highlight_rules_test.js → mouse/mouse_handler_test.js}

@@ -30,51 +30,44 @@
 
 if (typeof process !== "undefined") {
     require("amd-loader");
+    require("../test/mockdom");
 }
 
 define(function(require, exports, module) {
+"use strict";
 
-var LiquidMode = require("./liquid").Mode;
+var Editor = require("../editor").Editor;
+var MockRenderer = require("../test/mockrenderer").MockRenderer;
 var assert = require("../test/assertions");
+var MouseEvent = function(type, opts){
+    var e = document.createEvent("MouseEvents");
+    e.initMouseEvent("mouse" + type,
+        true, true, window,
+        opts.detail,
+        opts.x, opts.y, opts.x, opts.y,
+        opts.ctrl, opts.alt, opts.shift, opts.meta,
+        opts.button || 0, opts.relatedTarget);
+    return e;
+};
 
 module.exports = {
 
-    name: "Liquid Tokenizer",
-
-    setUp : function() {
-        this.tokenizer = new LiquidMode().getTokenizer();
+    setUp : function(next) {
+        this.editor = new Editor(new MockRenderer());
+        this.editor.setValue("Juhu kinners!")
+        next();
     },
 
-    "test: tokenize tags" : function() {
-        var line = "for one in many";
-
-        var tokens = this.tokenizer.getLineTokens(line, "liquid_start").tokens;
-
-        assert.equal(7, tokens.length);
-        assert.equal("keyword", tokens[0].type);
-        assert.equal("text", tokens[1].type);
-        assert.equal("identifier", tokens[2].type);
-        assert.equal("text", tokens[3].type);
-        assert.equal("keyword", tokens[4].type);
-        assert.equal("text", tokens[5].type);
-        assert.equal("identifier", tokens[6].type);
-    },
-
-    "test: tokenize parens" : function() {
-        var line = "[{( )}]";
-
-        var tokens = this.tokenizer.getLineTokens(line, "liquid_start").tokens;
-
-        assert.equal(7, tokens.length);
-        assert.equal("paren.lparen", tokens[0].type);
-        assert.equal("paren.lparen", tokens[1].type);
-        assert.equal("paren.lparen", tokens[2].type);
-        assert.equal("text", tokens[3].type);
-        assert.equal("paren.rparen", tokens[4].type);
-        assert.equal("paren.rparen", tokens[5].type);
-        assert.equal("paren.rparen", tokens[6].type);
+    "test: double tap. issue #956" : function() {
+        // mouse up fired immediately after mouse down
+        var target = this.editor.renderer.getMouseEventTarget();
+        target.dispatchEvent(MouseEvent("down", {x: 1, y: 1}));
+        target.dispatchEvent(MouseEvent("up", {x: 1, y: 1}));
+        target.dispatchEvent(MouseEvent("down", {x: 1, y: 1, detail: 2}));
+        target.dispatchEvent(MouseEvent("up", {x: 1, y: 1, detail: 2}));
+        
+        assert.equal(this.editor.getSelectedText(), "Juhu");
     }
-
 };
 
 });

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mouse/multi_select_handler.js

@@ -31,7 +31,7 @@
 define(function(require, exports, module) {
 
 var event = require("../lib/event");
-
+var useragent = require("../lib/useragent");
 
 // mouse
 function isSamePoint(p1, p2) {
@@ -42,19 +42,26 @@ function onMouseDown(e) {
     var ev = e.domEvent;
     var alt = ev.altKey;
     var shift = ev.shiftKey;
-    var ctrl = e.getAccelKey();
+    var ctrl = ev.ctrlKey;
+    var accel = e.getAccelKey();
     var button = e.getButton();
+    
+    if (ctrl && useragent.isMac)
+        button = ev.button;
 
     if (e.editor.inMultiSelectMode && button == 2) {
         e.editor.textInput.onContextMenu(e.domEvent);
         return;
     }
     
-    if (!ctrl && !alt) {
-        if (button == 0 && e.editor.inMultiSelectMode)
+    if (!ctrl && !alt && !accel) {
+        if (button === 0 && e.editor.inMultiSelectMode)
             e.editor.exitMultiSelectMode();
         return;
     }
+    
+    if (button !== 0)
+        return;
 
     var editor = e.editor;
     var selection = editor.selection;
@@ -63,39 +70,37 @@ function onMouseDown(e) {
     var cursor = selection.getCursor();
     var inSelection = e.inSelection() || (selection.isEmpty() && isSamePoint(pos, cursor));
 
-
     var mouseX = e.x, mouseY = e.y;
     var onMouseSelection = function(e) {
         mouseX = e.clientX;
         mouseY = e.clientY;
     };
-
-    var blockSelect = function() {
-        var newCursor = editor.renderer.pixelToScreenCoordinates(mouseX, mouseY);
-        var cursor = session.screenToDocumentPosition(newCursor.row, newCursor.column);
-
-        if (isSamePoint(screenCursor, newCursor)
-            && isSamePoint(cursor, selection.selectionLead))
-            return;
-        screenCursor = newCursor;
-
-        editor.selection.moveCursorToPosition(cursor);
-        editor.selection.clearSelection();
-        editor.renderer.scrollCursorIntoView();
-
-        editor.removeSelectionMarkers(rectSel);
-        rectSel = selection.rectangularRangeBlock(screenCursor, screenAnchor);
-        rectSel.forEach(editor.addSelectionMarker, editor);
-        editor.updateSelectionMarkers();
-    };
     
     var session = editor.session;
     var screenAnchor = editor.renderer.pixelToScreenCoordinates(mouseX, mouseY);
     var screenCursor = screenAnchor;
-
     
+    var selectionMode;
+    if (editor.$mouseHandler.$enableJumpToDef) {
+        if (ctrl && alt || accel && alt)
+            selectionMode = "add";
+        else if (alt)
+            selectionMode = "block";
+    } else {
+        if (accel && !alt) {
+            selectionMode = "add";
+            if (!isMultiSelect && shift)
+                return;
+        } else if (alt) {
+            selectionMode = "block";
+        }
+    }
+    
+    if (selectionMode && useragent.isMac && ev.ctrlKey) {
+        editor.$mouseHandler.cancelContextMenu();
+    }
 
-    if (ctrl && !shift && !alt && button == 0) {
+    if (selectionMode == "add") {
         if (!isMultiSelect && inSelection)
             return; // dragging
 
@@ -105,39 +110,90 @@ function onMouseDown(e) {
         }
 
         var oldRange = selection.rangeList.rangeAtPoint(pos);
-
-        event.capture(editor.container, function(){}, function() {
+        
+        
+        editor.$blockScrolling++;
+        editor.inVirtualSelectionMode = true;
+        
+        if (shift) {
+            oldRange = null;
+            range = selection.ranges[0];
+            editor.removeSelectionMarker(range);
+        }
+        editor.once("mouseup", function() {
             var tmpSel = selection.toOrientedRange();
 
             if (oldRange && tmpSel.isEmpty() && isSamePoint(oldRange.cursor, tmpSel.cursor))
                 selection.substractPoint(tmpSel.cursor);
             else {
-                if (range) {
+                if (shift) {
+                    selection.substractPoint(range.cursor);
+                } else if (range) {
                     editor.removeSelectionMarker(range);
                     selection.addRange(range);
                 }
                 selection.addRange(tmpSel);
             }
+            editor.$blockScrolling--;
+            editor.inVirtualSelectionMode = false;
         });
 
-    } else if (!shift && alt && button == 0) {
+    } else if (selectionMode == "block") {
         e.stop();
+        editor.inVirtualSelectionMode = true;        
+        var initialRange;
+        var rectSel = [];
+        var blockSelect = function() {
+            var newCursor = editor.renderer.pixelToScreenCoordinates(mouseX, mouseY);
+            var cursor = session.screenToDocumentPosition(newCursor.row, newCursor.column);
+
+            if (isSamePoint(screenCursor, newCursor) && isSamePoint(cursor, selection.lead))
+                return;
+            screenCursor = newCursor;
+            
+            editor.$blockScrolling++;
+            editor.selection.moveToPosition(cursor);
+            editor.renderer.scrollCursorIntoView();
 
-        if (isMultiSelect && !ctrl)
+            editor.removeSelectionMarkers(rectSel);
+            rectSel = selection.rectangularRangeBlock(screenCursor, screenAnchor);
+            if (editor.$mouseHandler.$clickSelection && rectSel.length == 1 && rectSel[0].isEmpty())
+                rectSel[0] = editor.$mouseHandler.$clickSelection.clone();
+            rectSel.forEach(editor.addSelectionMarker, editor);
+            editor.updateSelectionMarkers();
+            editor.$blockScrolling--;
+        };
+        editor.$blockScrolling++;
+        if (isMultiSelect && !accel) {
             selection.toSingleRange();
-        else if (!isMultiSelect && ctrl)
-            selection.addRange();
-
-        selection.moveCursorToPosition(pos);
-        selection.clearSelection();
-
-        var rectSel = [];
+        } else if (!isMultiSelect && accel) {
+            initialRange = selection.toOrientedRange();
+            editor.addSelectionMarker(initialRange);
+        }
+        
+        if (shift)
+            screenAnchor = session.documentToScreenPosition(selection.lead);            
+        else
+            selection.moveToPosition(pos);
+        editor.$blockScrolling--;
+        
+        screenCursor = {row: -1, column: -1};
 
         var onMouseSelectionEnd = function(e) {
             clearInterval(timerId);
             editor.removeSelectionMarkers(rectSel);
+            if (!rectSel.length)
+                rectSel = [selection.toOrientedRange()];
+            editor.$blockScrolling++;
+            if (initialRange) {
+                editor.removeSelectionMarker(initialRange);
+                selection.toSingleRange(initialRange);
+            }
             for (var i = 0; i < rectSel.length; i++)
                 selection.addRange(rectSel[i]);
+            editor.inVirtualSelectionMode = false;
+            editor.$mouseHandler.$clickSelection = null;
+            editor.$blockScrolling--;
         };
 
         var onSelectionInterval = blockSelect;