Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Ui/one line ace--Search&Replace improvements #1608

Merged
merged 54 commits into from
+80,423 −1,428

5 participants

@gjtorikian

From the original PR:

added codebox apf element which contains autoresizing ace, meant to be used in mostly in one line mode
and used it for search dialogs.

This PR also introduces having the search results in ace.

Cannot be merged until:

ajaxorg/ace#760


Also, from #1487:

What is awesomer? Awesomer is using Ace as the search viewer. We can now search in files and present those results both in the console, and the editor itself. Code folding is active, editing, undoing, all that keybinding jazz is in there.

On top of that, the client is now streaming results as well, allowing for quicker (seeming) load times for the user.

There are several other PRs that must be pulled in alongside this:

Ace: ajaxorg/ace#756
APF: ajaxorg/apf#67
jsDAV: ajaxorg/jsDAV#24

To whomever tests this: remember that you need to call make apf ace worker mode first to get everything established


#760 has been split into several PRs.

@nightwing @fjakobs Please review these Ace PRs as soon as possible as there are quite a few changes to search in files that depend on those.

gjtorikian and others added some commits
@gjtorikian gjtorikian Parse string return from jsDAV 83d5073
@gjtorikian gjtorikian Merge branch 'ui/search' of github.com:ajaxorg/cloud9 into ui/search c154dbd
@gjtorikian gjtorikian Merge branch 'ui/search' of github.com:ajaxorg/cloud9 into ui/search 9aea62d
@gjtorikian gjtorikian Update searchinfiles 76a8636
@gjtorikian gjtorikian Merge branch 'ui/search' of github.com:ajaxorg/cloud9 into ui/search 7f50158
@gjtorikian gjtorikian Merge branch 'ui/search' into ui/search_ace 2b6598d
@gjtorikian gjtorikian Merge branch 'master' into ui/search_ace 9eb4956
@gjtorikian gjtorikian Convert search results to ace 75fd213
@gjtorikian gjtorikian Add closing quotemark abbd4f0
@gjtorikian gjtorikian Merge latest ui/search b29727f
@gjtorikian gjtorikian fix for empty finds d6e3115
@gjtorikian gjtorikian fix for empty finds e9fd19a
@gjtorikian gjtorikian fix for empty finds 42ac0c5
@gjtorikian gjtorikian Improve support for editor dcb7576
@gjtorikian gjtorikian Implement editor in tab b3ca2e9
@gjtorikian gjtorikian Merge branch 'master' into ui/search_ace 6501254
@gjtorikian gjtorikian Many, many more updates. 621e062
@gjtorikian gjtorikian Add undo bindings for tab bottom, fix up ui for searchinfiles 528d505
@gjtorikian gjtorikian Remove asterisk from changed Search Results screen 859fdab
@gjtorikian gjtorikian Add ace building 8faee16
@gjtorikian gjtorikian Slight CSS fixes 993d074
@gjtorikian gjtorikian Minor behavior update 8d7f698
@gjtorikian gjtorikian Add search in files to project tree 35e364a
@nightwing nightwing fix searchbar appearance on firefox 5c22906
@nightwing nightwing fix :w/? for vim deec1af
@nightwing nightwing use ace for single line editor in searchreplace 0f171c9
@gjtorikian gjtorikian Revert changes from 8d7f698 f9c3caf
@nightwing nightwing fix stuff
    added codebox and used it in search dialogs
f7857d0
@nightwing nightwing update ace 146235e
@nightwing nightwing ace_ prefix from gutter decorations was removed 4072709
@nightwing nightwing update highlighted text in ace when changing regexp mode d845a8d
Garen Torikian Attempt fix for find swapping 284d7ee
Garen Torikian Merge master 186486e
Garen Torikian Update image dbd48e4
Garen Torikian Add skin file from master e5cbcfb
Garen Torikian Add cancel ability (for client only); update search in files for tree…
…; update mode
b1f78d5
@nightwing nightwing Merge remote-tracking branch 'remotes/origin/ui/search_ace' into 11
Conflicts:
	package.json
	plugins-client/ext.main/style/skins.xml
	plugins-client/ext.searchinfiles/searchinfiles.js
	plugins-client/ext.searchreplace/libsearch.js
c2d3336
@nightwing nightwing show scrollbar when codebox can't grow more 15cd9ef
@nightwing nightwing more tweaks 065298f
@gjtorikian gjtorikian Merge branch 'master' of github.com:ajaxorg/cloud9 into ui/one_line_ace 604ebe1
@gjtorikian gjtorikian Stash for multiline updates e3dd56e
@gjtorikian gjtorikian Fixes for cursor changing 8421ccf
@gjtorikian gjtorikian Disable anims if on Firefox d64b714
@nightwing nightwing more fixes for searchreplace 46ae4e5
@nightwing nightwing Merge remote-tracking branch 'remotes/origin/master' into 11
Conflicts:
	plugins-client/ext.searchinfiles/searchinfiles.js
	plugins-client/ext.searchinfiles/skin.xml
	plugins-client/ext.searchreplace/libsearch.js
	plugins-client/ext.searchreplace/searchreplace.js
0e16531
@nightwing nightwing use ace for commandline 986334e
@nightwing nightwing fix vim mode a9d527c
@fjakobs fjakobs was assigned
@janjongboom

@fjakobs please review

@mattpardee

On merge I get the each error in code.js, @gjtorikian is going to look into it

@nightwing
Owner

each error is because some changes to ace are still not merged into master

@mattpardee mattpardee was assigned
@gjtorikian

@nightwing Can you comment on which changes, so that I can ask @fjakobs to take a look immediately?

@mattpardee mattpardee merged commit 9e4378f into beta
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 8, 2012
  1. @gjtorikian
  2. @gjtorikian
  3. @gjtorikian
  4. @gjtorikian

    Update searchinfiles

    gjtorikian authored
  5. @gjtorikian
  6. @gjtorikian
  7. @gjtorikian
Commits on May 9, 2012
  1. @gjtorikian
  2. @gjtorikian

    Add closing quotemark

    gjtorikian authored
  3. @gjtorikian

    Merge latest ui/search

    gjtorikian authored
  4. @gjtorikian

    fix for empty finds

    gjtorikian authored
  5. @gjtorikian

    fix for empty finds

    gjtorikian authored
  6. @gjtorikian

    fix for empty finds

    gjtorikian authored
  7. @gjtorikian

    Improve support for editor

    gjtorikian authored
Commits on May 10, 2012
  1. @gjtorikian

    Implement editor in tab

    gjtorikian authored
  2. @gjtorikian
Commits on May 11, 2012
  1. @gjtorikian

    Many, many more updates.

    gjtorikian authored
  2. @gjtorikian
  3. @gjtorikian
  4. @gjtorikian

    Add ace building

    gjtorikian authored
Commits on May 12, 2012
  1. @gjtorikian

    Slight CSS fixes

    gjtorikian authored
  2. @gjtorikian

    Minor behavior update

    gjtorikian authored
Commits on May 13, 2012
  1. @gjtorikian
  2. @nightwing
  3. @nightwing

    fix :w/? for vim

    nightwing authored
  4. @nightwing
  5. @gjtorikian

    Revert changes from 8d7f698

    gjtorikian authored
Commits on May 14, 2012
  1. @nightwing

    fix stuff

    nightwing authored
        added codebox and used it in search dialogs
  2. @nightwing

    update ace

    nightwing authored
  3. @nightwing
  4. @nightwing
Commits on May 15, 2012
  1. Attempt fix for find swapping

    Garen Torikian authored
  2. Merge master

    Garen Torikian authored
  3. Update image

    Garen Torikian authored
  4. Add skin file from master

    Garen Torikian authored
  5. Add cancel ability (for client only); update search in files for tree…

    Garen Torikian authored
    …; update mode
  6. @nightwing

    Merge remote-tracking branch 'remotes/origin/ui/search_ace' into 11

    nightwing authored
    Conflicts:
    	package.json
    	plugins-client/ext.main/style/skins.xml
    	plugins-client/ext.searchinfiles/searchinfiles.js
    	plugins-client/ext.searchreplace/libsearch.js
  7. @nightwing
  8. @nightwing

    more tweaks

    nightwing authored
Commits on May 16, 2012
  1. @gjtorikian
  2. @gjtorikian

    Stash for multiline updates

    gjtorikian authored
  3. @gjtorikian

    Fixes for cursor changing

    gjtorikian authored
  4. @gjtorikian

    Disable anims if on Firefox

    gjtorikian authored
Commits on May 19, 2012
  1. @nightwing

    more fixes for searchreplace

    nightwing authored
  2. @nightwing

    Merge remote-tracking branch 'remotes/origin/master' into 11

    nightwing authored
    Conflicts:
    	plugins-client/ext.searchinfiles/searchinfiles.js
    	plugins-client/ext.searchinfiles/skin.xml
    	plugins-client/ext.searchreplace/libsearch.js
    	plugins-client/ext.searchreplace/searchreplace.js
Commits on May 21, 2012
  1. @nightwing

    use ace for commandline

    nightwing authored
  2. @nightwing

    fix vim mode

    nightwing authored
Commits on May 29, 2012
  1. @gjtorikian

    Merge beta

    gjtorikian authored
Commits on May 30, 2012
  1. @gjtorikian
  2. @gjtorikian

    Update hashes

    gjtorikian authored
  3. @gjtorikian

    Update ace themes etc

    gjtorikian authored
  4. @gjtorikian

    Update console image

    gjtorikian authored
  5. @gjtorikian

    Update hash

    gjtorikian authored
  6. @gjtorikian

    merge beta

    gjtorikian authored
Something went wrong with that request. Please try again.