Permalink
Switch branches/tags
Commits on Jan 22, 2012
  1. Merge pull request #124 from adobe/jason-sanjose/save-working-set

    Use clean, empty preferences for unit test runs
    gruehle committed Jan 22, 2012
  2. Weekend unit test preferences clean up :)

    Use localStorage to store preferences settings. The normal production workflow skips these changes. Our new unit test setup will initialize the PreferencesManager preferencesKey before the new test window is opened. This approach removes the need for _setStorageKey. An optional doLoadPreferences flag is available to allow unit test preferences to persist during a test.
    jasonsanjose committed Jan 22, 2012
  3. Removed redundant module imports

    njx committed Jan 22, 2012
  4. Merge pull request #125 from adobe/tvoliter/file-selection-sync

    Tvoliter/file selection sync
    tvoliter committed Jan 22, 2012
  5. white space cleanup

    tvoliter committed Jan 22, 2012
  6. Closure docs cleanup

    tvoliter committed Jan 22, 2012
  7. Comments cleanup

    tvoliter committed Jan 22, 2012
Commits on Jan 21, 2012
  1. Merge branch 'tvoliter/file-selection-sync' of github.com:adobe/brack…

    …ets into tvoliter/file-selection-sync
    
    * 'tvoliter/file-selection-sync' of github.com:adobe/brackets:
      Peter's comments part 5, fix for issue #121
      moving to a more reasonable directory
      Code review changes: - Move doQuit() into FileCommandHandlers and make it a command - Clean up if/else nesting in two file commands - Change FileCommandHandlers.handleFileCloseAll() to handle its own Deferred,   reducing code duplication. (Similar pattern to doSave()). - Remove empty (comment-only) fail() handlers - Whitespace nits - Remove stray TODO
      adding a test file with cr/lf line terminators
      Peter's comments part 4
      Peter's comments part 3
      Cleanups
      Peter's comments part 2
      Peter's comments part 1
      Update comments
      Style cleanup, fix editor creation
      Continue work on working set persistence
      * Confirm unsaved changes when opening a new project too. * Fix bug from last cleanup where File > Quit (and now project Open too)   would crash if nothing was currently open in the editor.
      Clean up the close-all functionality a bit; move doClose() back to being a narrowly-scoped helper method; and remove its markClean() call after verifying that it's no longer necessary.
      * Initial impementation of "close all" functionality that is the foundation of confirming unsaved changes on quit.
      Add PreferencesManager dependency to DocumentManager
      Begin work on working set persistence
    tvoliter committed Jan 21, 2012
  2. Merge remote-tracking branch 'origin/master' into tvoliter/file-selec…

    …tion-sync
    
    Conflicts:
    	src/DocumentManager.js
    	src/FileCommandHandlers.js
    	src/ProjectManager.js
    
    Many changes (that were not explicit merge conflicts) resulted from the
    refactoring of all file commands to receive args in a bag rather than
    individually.
    
    Also, fixes issue #122 and another undiscovered bug that were both the
    result of WorkingSetView using the wrong name for commandData properties.
    peterflynn committed Jan 21, 2012
  3. Merge pull request #123 from adobe/fix-npe

    Fix npe in ProjectManager.js
    jasonsanjose committed Jan 21, 2012
  4. Use clean, empty preferences for unit test runs

    Updated setStorageKey() to allow unit test preferences to persist within a single test.
    Added working set unit test to verify working set UI is restored after close+reopen
    jasonsanjose committed Jan 21, 2012
  5. Merge branch 'master' into fix-npe

    njx committed Jan 21, 2012
  6. Update CodeMirror SHA

    njx committed Jan 21, 2012
  7. Merge pull request #108 from adobe/jason-sanjose/save-working-set

    Persist working set & fix issue #121
    peterflynn committed Jan 21, 2012
  8. Merge pull request #120 from adobe/add-cr-lf-test-file

    adding a test file with cr/lf line terminators
    gruehle committed Jan 21, 2012
  9. Merge branch 'refs/heads/master' into jason-sanjose/save-working-set

    Conflicts:
    	src/DocumentManager.js
    jasonsanjose committed Jan 21, 2012
  10. Merge pull request #113 from adobe/confirm-multi-unsaved

    Confirm all unsaved changes on quit or switch project
    chrisbank committed Jan 21, 2012
  11. Code review changes:

    - Move doQuit() into FileCommandHandlers and make it a command
    - Clean up if/else nesting in two file commands
    - Change FileCommandHandlers.handleFileCloseAll() to handle its own Deferred,
      reducing code duplication. (Similar pattern to doSave()).
    - Remove empty (comment-only) fail() handlers
    - Whitespace nits
    - Remove stray TODO
    peterflynn committed Jan 21, 2012
  12. Merge branch 'tvoliter/file-selection-sync' of github.com:adobe/brack…

    …ets into tvoliter/file-selection-sync
    
    * 'tvoliter/file-selection-sync' of github.com:adobe/brackets:
      Update the Project file tree when a file is opened by file > open
    
    Conflicts:
    	src/FileViewController.js
    tvoliter committed Jan 21, 2012
  13. Adding more comments to FileViewController for some of the more subtl…

    …e things. Setting _curDocChangedDueToMe using deferred.always
    tvoliter committed Jan 21, 2012