Permalink
Commits on Dec 19, 2012
  1. Merge pull request #78 from iwehrman/iwehrman/global-hinting

    njx committed Dec 19, 2012
    Iwehrman/global hinting
Commits on Oct 2, 2012
  1. Merge pull request #76 from deemeetar/master

    RaymondLim committed Oct 2, 2012
    Fix to use closeTag in brackets and addon for closeElement
Commits on Sep 14, 2012
  1. removed new file

    spiroski committed Sep 14, 2012
Commits on Aug 27, 2012
  1. cleaning up

    spiroski committed Aug 27, 2012
  2. fix to use closeTag in brackets

    spiroski committed Aug 27, 2012
Commits on Aug 24, 2012
  1. Merge pull request #75 from alltom/alltom/measureLine-fix

    njx committed Aug 24, 2012
    fix exception when adding inline widgets to blank lines
Commits on Aug 23, 2012
  1. Merge pull request #74 from adobe/pflynn/merge-selection-width-fix

    njx committed Aug 23, 2012
    Fix bugs with selection width
  2. Force lineSpace width when in non-wrapping mode

    marijnh committed with peterflynn Jul 18, 2012
    Closes #643
    (cherry picked from commit b38776d)
Commits on Jul 19, 2012
  1. Merge pull request #73 from adobe/pflynn/issue-1123

    redmunds committed Jul 19, 2012
    Fix #1123 (Dragging text in editor breaks dirty flag)
  2. Fix bug adobe/brackets#1123 (Dragging text in editor breaks dirty fla…

    peterflynn committed Jul 19, 2012
    …g) -
    
    the introduction of compoundChange() introduced a new codepath in History.addChange()
    that was not present when the original dirty bit enhancement (pull #56) was
    written. It needs to be handled the same as the case below it since it too
    generates an additional undo step (i.e. an additional call to unredoHelper(),
    where the counter is decremented, at undo time).
Commits on Jul 14, 2012
  1. Merge pull request #69 from adobe/pflynn/merge-upstream-sprint-11

    gruehle committed Jul 14, 2012
    Fix MultiRangeInlineEditor-test
Commits on Jul 13, 2012
  1. Fix a second case of the recently exposed NPE that my original fix (a…

    peterflynn committed Jul 13, 2012
    …325b53)
    
    did not cover: when the very last line visited has an inline open, we were
    using the wrong index for normalNode. This case arises when running
    MultiRangeInlineEditor-test.
  2. Merge pull request #67 from adobe/pflynn/merge-upstream-sprint-11

    gruehle committed Jul 13, 2012
    Merge from CodeMirror upstream
Commits on Jul 12, 2012
  1. Remove scrollPos() added in Bracket's fork now that CodeMirror has an

    peterflynn committed Jul 12, 2012
    official getScrollInfo() API. (Requires a corresponding change in Brackets).
  2. * Fix a diff from upstream that was lost in the merge (removal of

    peterflynn committed Jul 12, 2012
    maxLengthChanged var)
    
    * Fix bug where CM crashes when opening an inline editor near the bottom of
    a file / bottom of the viewport (anytime the last rendered line has an inline
    open?). There was an incorrect assumption in updateGutter() that indices in
    gutterText.childNodes[] correspond one-to-one with line numbers, which isn't
    true when inline editor placeholders are present. This wasn't usually a
    problem until marijnh/CodeMirror2#548 landed, which gives an NPE when it
    grabs an inline placeholder and assumes it has children (although, it looks
    like there would also have been subtler bugs if we ever started using gutter
    markers for anything). The fix is to track line numbers separately from
    child indices (we could instead track the number of inlines and use that
    to offset the old "i" counter when setting normalNode, but it means 1 extra
    var maintained by the loop either way, and this seems clearer).
Commits on Jun 27, 2012
  1. Merge remote-tracking branch 'upstream/master' into pflynn/merge-upst…

    peterflynn committed Jun 27, 2012
    …ream-sprint-11
    
    * upstream/master: (52 commits)
      use default cursor on gutter text
      Add Brackets to real-world uses
      Re-sort real-world uses by sexiness
      Add Light Table and prose.io to real-world uses
      treat mac+ctrl+click as right-click
      #589 Address problems with improper identification of tag to be closed following a void tag.
      Make multiplexing mode combinator more powerful
      [clike mode] Add support for builtins, extend c# mode
      Fix fullscreen demo for new scrolling model
      Add multiplexer demo to front page
      Mark release 2.3
      Fix description in demo/multiplex.html
      Fix mistake in getScrollInfo
      Added more readable selection color.
      Make themes lesse-dark and ambiance *less big* when switching between themes.
      Add visible selection color.
      Add getScrollInfo() method
      Add vibrant-ink theme
      Accept namespaces in XML tag folder
      Fix typo in manual section id
      ...
    
    Conflicts:
    	lib/codemirror.js
Commits on Jun 26, 2012
  1. Add Brackets to real-world uses

    marijnh committed Jun 26, 2012
Commits on Jun 25, 2012
  1. #589 Address problems with improper identification of tag to be close…

    nlwillia committed with marijnh Jun 22, 2012
    …d following a void tag.
    
    - Changed to read the tagName from state.htmlState instead of state.htmlState.context on '>'.  xml.js has expanded its awareness of void html tags and is popping its context when it doesn't expect a close tag.
    - Added an option defining a list of void tags.
Commits on Jun 22, 2012
  1. Mark release 2.3

    marijnh committed Jun 22, 2012
  2. Fix mistake in getScrollInfo

    marijnh committed Jun 22, 2012