Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: adobe/brackets
base: sprint-20
...
head fork: adobe/brackets
compare: sprint-21
This comparison is big! We're only showing the most recent 250 commits
Commits on Feb 20, 2013
@jasonsanjose jasonsanjose update config.json sprint number 0ac98a2
@jasonsanjose jasonsanjose remove dead code 94ef112
@peterflynn peterflynn Code review: use more standard triggerHandler() instead of trigger();…
… fix Closure

docs typo.
48bcd11
@joelrbrandt joelrbrandt Merge remote-tracking branch 'origin/master' into jrb/node-connection dd15184
@joelrbrandt joelrbrandt add debugging helpers for node aba5d36
@DennisKehrig DennisKehrig Bugfix: directory renames were not propagated 3d1e09b
@DennisKehrig DennisKehrig Bugfix: renaming file "foo" should not affect file "foobar/baz" even …
…though "foo" is a prefix of "foobar".
2f45848
@jasonsanjose jasonsanjose Merge pull request #2898 from adobe/pflynn/preserve-scroll-pos
Remember selection/cursor and scroll position per file
ec8aafd
@njx njx Merge pull request #2891 from adobe/pflynn/remove-1994-workaround
Remove unit test's workaround
b455002
@gruehle gruehle Merge pull request #2894 from DennisKehrig/dk/issue-1744-2
Disable the cache before every reload
ecab3d5
@gruehle gruehle Merge pull request #2819 from jdiehl/live-development-bugfixes
Live development bugfixes
b11394a
@gruehle gruehle Merge pull request #2896 from jbalsas/fix-2895
Add check for broken symlinks to hacking scripts (#2895)
52da880
Commits on Feb 21, 2013
@joelrbrandt joelrbrandt Fixes for code review of client-side node connection implementation 0de41b7
@gruehle gruehle Merge pull request #2880 from adobe/jrb/node-connection
Adds NodeConnection class to connect to node server, as well as unit tests
7a6fabb
@walfgithub walfgithub Updated by ALF automation. 1460fe9
@jasonsanjose jasonsanjose Merge pull request #2922 from adobe/alf
ALF Automation
e366eb2
@walfgithub walfgithub Updated by ALF automation. 3b7c8aa
@jasonsanjose jasonsanjose Merge pull request #2928 from adobe/alf
ALF Automation
6021bef
@joelrbrandt joelrbrandt initial prototype of a static webserver extension using connect and node 1daa889
@iwehrman iwehrman Address initial comments and suggestions from code review by @rlim. 27b7dce
@iwehrman iwehrman Make Scope.member constant-time instead of linear in the number of de…
…clarations.
eb85fb6
@njx njx Update CodeMirror to latest upstream (3.1) 3c79364
@DennisKehrig DennisKehrig Fixed a typo d3e8c1f
@DennisKehrig DennisKehrig Allow setting which strings to use for line and block comments (bad, …
…but simple API for now)
7674e1e
@DennisKehrig DennisKehrig Support for MORE, a renamed version of LESS, as an extension 0781d8b
@DennisKehrig DennisKehrig Removed journal, it's in the wiki now: https://github.com/adobe/brack… da92090
@DennisKehrig DennisKehrig LESS extension: reloading the editors is no longer necessary since ex…
…tensions are now loaded before the project is restored
2547cca
@DennisKehrig DennisKehrig Added the Languages module to have a centralized place for adding new…
… languages

The LESS extension now uses this exclusively (after manually loading the CodeMirror mode)
ec5efa0
@DennisKehrig DennisKehrig Redesigned the language API with a fluent interface to allow for late…
…r refinement of language definitions.

Setting a CodeMirror mode is now optional.
Also, in alignment with the rest of the Brackets API, there is no explicit mention of CodeMirror anymore since we directly refer to modes as such.
3c3764f
@DennisKehrig DennisKehrig The MoreSupport extension now show cases more of the API features b62be1e
@DennisKehrig DennisKehrig Documents and editor now provide more direct APIs to access the used …
…language.

This also allows overriding the language used in a document. Furthermore, that language is used to disambiguate the language that belongs to a submode.
Finally, the status bar entry that displays the language name now uses the Language API.
6912ba7
@DennisKehrig DennisKehrig Added a default language with ID "unknown" so that documents always h…
…ave a language.

Also refactored support for HTML, JavaScript, CSS and LESS to Languages.js (to the extent the language API allows).
87183a3
@DennisKehrig DennisKehrig Remove LESS parser, this would be needed for LiveDevelopment later, b…
…ut goes beyond refactoring LESS support
f64a9d0
@DennisKehrig DennisKehrig Stripped out existing LESS support and renamed MORE extension to LESS d830642
@DennisKehrig DennisKehrig Added on comment and fixed a couple of JSLint complains 5dc6907
@DennisKehrig DennisKehrig Language API: removed MIME type property 3661fed
@DennisKehrig DennisKehrig Renamed LessSupport to LESSSupport since the other extensions are cap…
…italized in the same way
0b26e09
@DennisKehrig DennisKehrig Removed Document.setLanguage c913e39
@DennisKehrig DennisKehrig Removed Editor.getLanguageForDocument ba0426d
@DennisKehrig DennisKehrig Removed Editor.setModeForDocument - when renaming the current documen…
…t, the full editor will be re-opened, thereby updating more than just its mode
68e596a
@DennisKehrig DennisKehrig Default languages are now defined via language/languages.json a59ed7c
@DennisKehrig DennisKehrig Removed a debugging statement 0b9f572
@DennisKehrig DennisKehrig Restrict refining languages to setting the mode
Let Languages.js return the default language, not Document.getLanguage
Define the default languages in Languages.js instead of languages.json so its always available right away
Move loadBuiltinMode from ExtensionUtils.js to Languages.js
486b699
@DennisKehrig DennisKehrig Removed EditorUtils#getModeFromFileExtension (and therefore EditorUti…
…ls.js)
7484ca7
@DennisKehrig DennisKehrig Set the document language in the constructor b49ac8a
@DennisKehrig DennisKehrig Removed StatusBar/getModeDisplayString fbd3f77
@DennisKehrig DennisKehrig Don't expose the defaultLanguage anymore, also making it read-only th…
…is way
b9d4883
@DennisKehrig DennisKehrig Bugfix: delete the document's language cache when its file is renamed 3fa1b02
@DennisKehrig DennisKehrig Added documentation to Languages.js 35c93d9
@DennisKehrig DennisKehrig Fixed a couple of JSLint complains b5c46cd
@DennisKehrig DennisKehrig Use the require.js text plugin to load languages.json seemingly synch…
…ronously
dd708d1
@DennisKehrig DennisKehrig Added a convenience function to load and set a built-in mode for a la…
…nguage
be7b8cb
@DennisKehrig DennisKehrig Use 4 spaces instead of tabs everywhere 093856c
@DennisKehrig DennisKehrig Make setLineComment and setBlockComment public after all, since those…
… are queried on demand and won't likely ever need listeners
c1a6e28
@DennisKehrig DennisKehrig Load modes via require after all, allowing language.setMode to be pri…
…vate since now the mode is already available when defining a language
c590931
@DennisKehrig DennisKehrig Allow extensions to be dependent on other extensions d63fe7d
@DennisKehrig DennisKehrig Bugfix: error during merge 56df18d
@DennisKehrig DennisKehrig Reflect the transition from modes to languages with regards to the st…
…atus bar and when initializing editors
4c3d51e
@DennisKehrig DennisKehrig Bugfix: directory renames were not propagated 40dee60
@DennisKehrig DennisKehrig Bugfix: renaming file "foo" should not affect file "foobar/baz" even …
…though "foo" is a prefix of "foobar".
59cf95f
@DennisKehrig DennisKehrig The language is now detected when constructing the document and when …
…the underlying file is renamed. If the language changes, a languageChanged event is fired. Editors now determine their mode themselves by consulting the document's language and responding to languageChanged events. To save the editor state, editors are n longer closed and reopened when renaming a file. This brings back the problem with JSLint not opening when changing the extension to ".js".
c00bfb1
@DennisKehrig DennisKehrig Fix JSDoc syntax 7ccdbfa
@DennisKehrig DennisKehrig Restore separation of commands that are just proxies for CM behavior …
…vs. commands whose implementations actually live here (https://github.com/adobe/brackets/pull/2844/files#r3074809)

Fix typos in the comments
Reflect a change in a function's signature
cb5e41a
@DennisKehrig DennisKehrig Document the "extension" plugin for require.js
Document the contexts and entryPoints variables
Improve formatting
bc499ef
@DennisKehrig DennisKehrig Removed JSLint's reference to CodeMirror in ExtensionUtils.js c69a8e6
@DennisKehrig DennisKehrig Allow language IDs like foo_bar for package-style naming 70d8028
@DennisKehrig DennisKehrig Removed the require.js to allow extension dependencies. A better appr…
…oach is to wait until a language is defined, rather than depending on a specific extension to define that language.
0949dc0
@DennisKehrig DennisKehrig Renamed language/Languages.js to languages/LanguageManager.js
Added top-level documentation
Moved all mode-loading code to _setMode
Added promise modeReady
Added documentation for the mode parameter
Added a check to make sure that only MIME modes defined by the given mode are used
Changed the mode parameter to either take a string or an array of two strings - i.e. "mode" or ["mode", "mimeMode"]
Removed the require.js "mode" alias to the CodeMirror mode directory - it's enough that LanguageManager loads these modes and it might cause conflicts if a language extension decides to add a mode.js
Renamed cs to csharp
b14a9b3
@DennisKehrig DennisKehrig Check properly whether an object is a string and cite thine sources d3579a2
@DennisKehrig DennisKehrig User lower case file extensions 69b14b9
@DennisKehrig DennisKehrig Better naming of variables 87494b4
@DennisKehrig DennisKehrig Removed language aliases because the special "html" case was actually…
… artificially introduced by us via TokenUtils.getModeAt and can be removed once we use the language API in more places
ccaccd1
@joelrbrandt joelrbrandt add node_modules inside extensions to grunt ignore list 327784b
@jasonsanjose jasonsanjose code review comments ee2dcd0
@DennisKehrig DennisKehrig Adjust the tests to reflect that EditorUtils is now gone 1b286c1
@jasonsanjose jasonsanjose missing semicolon 2f959d0
@jasonsanjose jasonsanjose Merge pull request #2888 from TomMalbran/tom/fix-issue-2877
Fix Issue #2877: Debug menu shortcuts are enabled even when Debug menu is hidden
4c42b81
@DennisKehrig DennisKehrig Added new MIME mode text/x-brackets-html for HTML files 41f72a1
@DennisKehrig DennisKehrig Bring the unit tests up to speed with the language API 7049c60
@DennisKehrig DennisKehrig Forgot to finish a sentence d7411eb
@jasonsanjose jasonsanjose Merge pull request #2905 from jbalsas/fix-2255
Trigger scroll on project files container to reposition scroller shadows (#2255)
c95cec1
@iwehrman iwehrman Use a binary instead of a linear search in findChild and containsPosi…
…tionImmediate
1c52d2e
@iwehrman iwehrman Address more suggestions and bugs from @rlim's code review. 91487e3
Commits on Feb 22, 2013
@jasonsanjose jasonsanjose rename set-sprint subtask to update-sprint-number db5f7ae
@peterflynn peterflynn Merge pull request #2889 from adobe/jasonsanjose/sprint21
Add grunt task for updating sprint number. Update to sprint 21.
e0ae992
@TomMalbran TomMalbran Adding the brackets contributor list to the about dialog 9e204b9
@TomMalbran TomMalbran Adding the template ff36310
@jasonsanjose jasonsanjose Merge branch 'dk/less-refactoring' into jasonsanjose/language-tests 3c3fb17
Commits on Feb 23, 2013
@TomMalbran TomMalbran Use render instead of to_html e36617e
@TomMalbran TomMalbran Move the Update List information to a template 0619fb8
@redmunds redmunds implement HttpServerManager, HttpServerProvider 3f7fbd9
@TomMalbran TomMalbran Refactor the debug menu and commands as an extension 1d58a34
@TomMalbran TomMalbran Removing the Debug commands from the test file 1e6036e
Commits on Feb 24, 2013
@WebsiteDeveloper WebsiteDeveloper Extracted default menus into extra file 908bb1a
@iwehrman iwehrman Add remaining JSDoc annotations c0e75bc
@iwehrman iwehrman Typos and clarifications 3d66c59
Commits on Feb 25, 2013
@DennisKehrig DennisKehrig Code cleanup after reading @jasonsanjose's helpful suggestions 1c8a15d
@joelrbrandt joelrbrandt have static server request root after creation bddb4a6
@jasonsanjose jasonsanjose Merge remote-tracking branch 'origin/dk/less-refactoring' into jasons…
…anjose/language-tests
4ce9438
@TomMalbran TomMalbran Changes after first review 2bc1510
@TomMalbran TomMalbran Fixing Tabs 3a567b4
Commits on Feb 26, 2013
@jasonsanjose jasonsanjose LanguageManager unit tests 9e93e5a
@gruehle gruehle Disable JSLint for HTML files. d34d6ad
@jasonsanjose jasonsanjose Fix headless test failure by adding polyfill for Function.bind for Ph…
…antom.js
d1818aa
@jasonsanjose jasonsanjose fix jshint whitespace error 757a355
@RaymondLim RaymondLim Merge pull request #2950 from adobe/glenn/issue-2930
Disable JSLint for HTML files
6d941bc
@TomMalbran TomMalbran Addressing review requests c3eaea7
@TomMalbran TomMalbran Fixing comments 0600c7f
@iwehrman iwehrman type capitalization typos and additional JSDoc annotations c8b53c7
@TomMalbran TomMalbran Replacing $.each with forEach d82c112
@redmunds redmunds keep url filtering and mapping separate 7e37d28
@redmunds redmunds update placeholder text 37093b2
@redmunds redmunds only need to keep track of server url for current project 966739a
@TomMalbran TomMalbran Removed the unneeded Strings in the contributors template 0365cb0
@joelrbrandt joelrbrandt more fixes to jsdocs bc8d9d8
@gruehle gruehle Merge pull request #2914 from DennisKehrig/dk/rename-prefix-conflicts
Prevent prefix based conflicts when renaming
f50c02e
@joelrbrandt joelrbrandt more doc fixups 1f1d074
@redmunds redmunds merge with master 0ef8e00
@jasonsanjose jasonsanjose update grunt deps after 0.4 release. fix jshint 1.0.0 errors. b13ac1c
@jasonsanjose jasonsanjose reset height to auto to allow inline editor to layout 2c64448
@jasonsanjose jasonsanjose remove use of ems. not necessary to fix the vscrollbar bug in #2830. d04bdd0
@RaymondLim RaymondLim Merge pull request #2956 from adobe/jasonsanjose/jshint-version
update grunt deps after 0.4 release. fix jshint 1.0.0 errors.
567c5bf
@jasonsanjose jasonsanjose remove height auto 79ee9c6
@jasonsanjose jasonsanjose Merge branch 'master' into jasonsanjose/issue-2830 8cd4632
@RaymondLim RaymondLim Merge pull request #2873 from adobe/iwehrman/javascript-code-hinting
JavaScript code hinting
3159b92
@TomMalbran TomMalbran Merge remote-tracking branch 'upstream/master' into tom/debug-extension e977879
@TomMalbran TomMalbran Backed changes added to Global.js and changed handleReload e17662a
@TomMalbran TomMalbran Tab fix c674bf7
@TomMalbran TomMalbran Cleanning Global.js 1e509ea
@TomMalbran TomMalbran Commands IDs moved and key binding fixed 17383cd
@redmunds redmunds return promise from startServer so server can't be used before it's r…
…eady
434f821
@jasonsanjose jasonsanjose Merge pull request #2942 from TomMalbran/tom/debug-extension
Fix #2902: Externalize debug menu as an extension
30c2751
@jasonsanjose jasonsanjose Merge branch 'master' into dk/less-refactoring
Conflicts:
	src/file/FileUtils.js
bebb6cf
@redmunds redmunds onDisconnect get called at unpredictable times, so don't clear provider 8423f70
@peterflynn peterflynn Update JS code hints (including unit tests) to work with new language…
… and

Editor APIs.
5a026ec
Commits on Feb 27, 2013
@jasonsanjose jasonsanjose Merge branch 'dk/less-refactoring' into jasonsanjose/language-tests 6b0d48d
@peterflynn peterflynn Merge pull request #2844 from adobe/dk/less-refactoring
Add language extensibility APIs; refactor LESS support out into a default extension using those APIs
fee1311
@jasonsanjose jasonsanjose Merge branch 'master' into jasonsanjose/language-tests 26401fe
@jasonsanjose jasonsanjose Left over code review comments from #2844 81aa896
@njx njx Rename ConnectDomain to StaticServerDomain and make it keep alive ser…
…vers for each requested project
b9dcff7
@gruehle gruehle Use getRemoteDebuggingPort() 0340f92
@TomMalbran TomMalbran Adding language, extensions and comments supports e0b47b2
@joelrbrandt joelrbrandt minor updates to StaticServer comments 35e867f
@TomMalbran TomMalbran Splittinig C and C++ languages 77623a8
@RaymondLim RaymondLim Use "Meiryo UI" as Japanese UI font when it is available. 312fc2d
@jasonsanjose jasonsanjose code review comments. change haxe to erlang due to #2968. 9e2c4e7
@jasonsanjose jasonsanjose Merge pull request #2970 from adobe/glenn/issue-2918-take-two
Use getRemoteDebuggingPort() API to disable cache on reload
9cd9d02
@joelrbrandt joelrbrandt implement readyToServe function for StaticServers and make live devel…
…opment launching even more asynchronous
c04c97e
@redmunds redmunds rename HttpServerManager to LiveDevServerManager d9e3702
@redmunds redmunds updates for code review 4a780e2
@redmunds redmunds Merge remote-tracking branch 'origin/master' into randy/http-server-l…
…ive-dev
483f0cf
@gruehle gruehle Merge pull request #2963 from adobe/jasonsanjose/language-tests
LanguageManager unit tests
91ac3c5
@DennisKehrig DennisKehrig When defining a language, setting a mode is now required. In addition…
…, defineLanguage now returns a promise that resolves once the mode has been loaded and set, instead of returning the language directly. To make things more consistent both within LanguageManager and with the rest of the code base, chaining support has been removed.
6139528
@DennisKehrig DennisKehrig Fix: language IDs were documented as foo_bar, but validated as foo.bar 3dceb96
@DennisKehrig DennisKehrig Normalize file extensions by also removing leading dots if necessary 38a015c
@DennisKehrig DennisKehrig Use CollectionUtils instead of $.each 37be3d9
@jasonsanjose jasonsanjose update CodeMirror SHA for #2810 71d8957
@DennisKehrig DennisKehrig Language now encapsulates its properties and makes them accessible ex…
…clusively through getters and setters

Adjust the unit tests accordingly
Added documentation to Language's properties
Refined the comment about our special HTML MIME mode
Renamed fileExtensionsToLanguageMap to fileExtensionToLanguageMap
8793b2a
@jasonsanjose jasonsanjose fix broken Editor unit tests 1483b4a
@jasonsanjose jasonsanjose Merge pull request #2975 from adobe/jasonsanjose/issue-2810
update CodeMirror SHA for #2810
09240b2
@jasonsanjose jasonsanjose Merge branch 'master' into jasonsanjose/issue-2830 904b6dd
@DennisKehrig DennisKehrig Documentation cleanup
Call result.reject in a few places instead of throwing exceptions
b582655
@njx njx Re-add directory middleware to static live dev server e00e0b3
@njx njx Guard against key collisions in _servers object 7b38fa8
@jasonsanjose jasonsanjose Merge pull request #2971 from TomMalbran/tom/language-supports
Adding language, extensions and comments supports
1207755
@RaymondLim RaymondLim Merge pull request #2978 from adobe/jasonsanjose/fix-editor-tests
fix broken Editor unit tests
88cf9c4
@redmunds redmunds fix unit test + some code cleanup b91f7a9
@redmunds redmunds Merge branch 'randy/http-server-live-dev' of https://github.com/adobe…
…/brackets into randy/http-server-live-dev
7e35954
@jasonsanjose jasonsanjose Merge remote-tracking branch 'origin/master' into dk/language-api
Conflicts:
	test/spec/Editor-test.js
2eaf956
@TomMalbran TomMalbran Merge remote-tracking branch 'upstream/master' into tom/contributors-…
…list
0fca970
@jbalsas jbalsas Merge pull request #2972 from adobe/rlim/update-Japanese-font
Use "Meiryo UI" as Japanese UI font when it is available.
dde9848
@redmunds redmunds cleanup readyToServe function 019b61c
@TomMalbran TomMalbran forEach fixed. Grey background-color removed. Loading spinner added. …
…Cache removed.
5949dd4
@TomMalbran TomMalbran I need an indentation preference per project/folder 0f5c15c
Commits on Feb 28, 2013
@redmunds redmunds more changes for code review 9cee8c7
@joelrbrandt joelrbrandt make sure we set up the server even on the first project open f6d1a74
@joelrbrandt joelrbrandt Merge branch 'randy/http-server-live-dev' of https://github.com/adobe…
…/brackets into randy/http-server-live-dev
876a8f5
@jasonsanjose jasonsanjose code review comments pull #2980 fc829e9
@RaymondLim RaymondLim Merge pull request #2938 from TomMalbran/tom/update-list
Move the Update List information to a template
9c8d62f
@redmunds redmunds fall-back to file:// protocol branch got dropped with refactoring e076ea9
@peterflynn peterflynn Fix bug #2961 (Documents may leak due to listeners left on FileEntry) -
Simplify by just directly pinging refcounted documents from
DocumentManager.notifyPathNameChanged(). FileUtils no longer triggers a
"rename" event on FileEntry objects and we no longer have a per-Document
listener.

Also, enable block comments in XML files.
47018dc
@joelrbrandt joelrbrandt add http caching to address #2982 bb03501
@peterflynn peterflynn Update unit test to account for the #2961 fix. Previously, the test was
emulating rename by doing less than ProjectManager.renameItem() does in the
real world. Due to the memory leak fix, the now need a closer imitation.
8d54418
@redmunds redmunds cleanup promise handling a517c5e
@njx njx Update CodeMirror SHA 2ccf715
@njx njx Merge branch 'master' into randy/http-server-live-dev 04947cd
@njx njx Merge pull request #2955 from adobe/randy/http-server-live-dev
HTTP Server and Live Development
9eccb6e
@TomMalbran TomMalbran Make the update dialog text selectable 8227681
@njx njx Unit tests for StaticServerDomain c67c681
@jasonsanjose jasonsanjose fix tab indentation 5bf9d15
@TomMalbran TomMalbran Review comments fixed fa22529
@joelrbrandt joelrbrandt move starting of static server to live dev start time and fix up some…
… comments
2dc566b
@jbalsas jbalsas Spanish Strings for Sprint 21 3a62fa9
@jasonsanjose jasonsanjose Merge pull request #2994 from adobe/jbalsas/spanish-loc-sprint21
Spanish Strings for Sprint 21
ce157e9
@WebsiteDeveloper WebsiteDeveloper Merged with master fe09212
@WebsiteDeveloper WebsiteDeveloper adressed minor remark 4b8d0b2
@TomMalbran TomMalbran Removed unused dependency ea93581
@walfgithub walfgithub Updated by ALF automation. 6bfe423
@joelrbrandt joelrbrandt Merge remote-tracking branch 'origin/master' into nj/http-server-unit 004c9b6
@joelrbrandt joelrbrandt code cleanup after unit test review 84b1767
@joelrbrandt joelrbrandt Merge pull request #2992 from adobe/nj/http-server-unit
Unit tests for StaticServerDomain
86594b4
@joelrbrandt joelrbrandt Merge remote-tracking branch 'origin/master' into jrb/issue-2987-2988
Conflicts:
	src/extensions/default/StaticServer/main.js
f200050
@joelrbrandt joelrbrandt move node connection to init code b33f2a4
@joelrbrandt joelrbrandt update docs, make it so unit test code can always get the _staticServ…
…erProvider
f77c513
@joelrbrandt joelrbrandt minor fixes from code review ee4c225
@redmunds redmunds Merge pull request #2993 from adobe/jrb/issue-2987-2988
move starting of static server to live dev start time and fix up some comments
b823d5a
@jasonsanjose jasonsanjose update CodeMirror SHA for #2974 34f6412
@jasonsanjose jasonsanjose Merge pull request #2995 from adobe/alf
ALF Automation
695b7ee
@gruehle gruehle Merge pull request #2940 from WebsiteDeveloper/DefaultMenus
Extracted default menus into extra file
96cdc87
@jasonsanjose jasonsanjose Merge branch 'master' into jasonsanjose-dk/language-api 8a04dc1
@jasonsanjose jasonsanjose fixed mode handling for text/plain and validation of mode 513e4e0
@jasonsanjose jasonsanjose fix language unit tests ce7fd4b
@gruehle gruehle Merge pull request #2958 from adobe/jasonsanjose/issue-2830
Fix vscrollbar in inline editor when increasing font size
abbad78
@joelrbrandt joelrbrandt add unit tests for StaticServerProvider 76fd296
@TomMalbran TomMalbran Merge remote-tracking branch 'upstream/master' into tom/fix-issue-1399 12a5e16
@TomMalbran TomMalbran Make only the update info selectable f8cd209
Commits on Mar 01, 2013
@joelrbrandt joelrbrandt increase connection timeouts because connecting takes longer on windows be6499d
@joelrbrandt joelrbrandt fix code review nits, add a few tests for readyToServe and getBaseUrl 7c50041
@redmunds redmunds Merge pull request #3001 from adobe/jrb/static-server-provider-tests
add unit tests for StaticServerProvider
c42ddbb
@walfgithub walfgithub Updated by ALF automation. ccc54fa
@jasonsanjose jasonsanjose Merge pull request #3006 from adobe/alf
ALF Automation
4056886
@jasonsanjose jasonsanjose code review comments part 1 53e4686
@peterflynn peterflynn Fix bug #2910 (Find doesn't show orange highlight in inline editors) &
fix bug #2960 (Find shows wrong orange in placed if opened with selection
containing newlines)
- Strip newlines from prepopulated Find text
- Add a selector to match the specificity of the inline-editor-specific
selection color rules in brackets_codemirror_override.less
81dfd1a
@gruehle gruehle Merge pull request #2990 from TomMalbran/tom/fix-issue-1399
Fix #1399: Make the update dialog text selectable
72bedf8
@jasonsanjose jasonsanjose code review comments part 2. Track _pendingLanguages while loading. U…
…se special null string for plain text mode. Update unit tests.
90cb5c5
@gruehle gruehle Merge pull request #3008 from adobe/pflynn/find-highlighting-fixes
Fix Find highlighting bugs
eb919b9
@jasonsanjose jasonsanjose Merge pull request #2984 from adobe/pflynn/document-listener-leak
Fix #2961 (Documents may leak due to listeners left on FileEntry)
9985b84
@peterflynn peterflynn Code review: share 'doc' var a little more; comment clarification in …
…unit test
67321c7
@peterflynn peterflynn Fix typo in comment 567ec04
@jasonsanjose jasonsanjose Merge pull request #3011 from adobe/pflynn/document-listener-leak
Code review responses from #2961
a31649d
@jasonsanjose jasonsanjose update language id validation 3a4ca20
@jasonsanjose jasonsanjose update defineLanguage jsdoc b42ac95
@jasonsanjose jasonsanjose wait for LanguageManager to load before finish init 6fce307
@njx njx Merge pull request #2934 from TomMalbran/tom/contributors-list
Contributors List on the About Dialog
d4d81e3
@peterflynn peterflynn Merge pull request #2980 from adobe/jasonsanjose-dk/language-api
Continued Language API work
4e44a07
@TuckerWhitehouse TuckerWhitehouse Update _getContributorsInformation & add fail
Update the _getContributorsInformation function to return the $.getJSON call which is basically the deferred being returned anyway.

Add a "graceful" fail statement that hides the spinner and add a message for the user.
81ea23d
@jasonsanjose jasonsanjose dispatch languageAdded event from LanguageManager. Update all open do…
…cuments for matching language.
32ed73f
@TuckerWhitehouse TuckerWhitehouse Remove _getContributorsInformation 0209dd6
@TuckerWhitehouse TuckerWhitehouse Include Text for contributors load fail. cf2b968
@TuckerWhitehouse TuckerWhitehouse Move $dlg and $contributors to higher scope 0c81ca0
@TuckerWhitehouse TuckerWhitehouse Render fail message with Mustache 8292355
@jasonsanjose jasonsanjose add unit test for async call to defineLanguage while a document is open f67cfcd
@TuckerWhitehouse TuckerWhitehouse Wrap fail text in .dialog-message 2029905
@TomMalbran TomMalbran Merge pull request #3014 from TuckerWhitehouse/master
Fix About Dialog Contributors (Issue 3012 from Pull 2934)
0e3fa80
Commits on Mar 02, 2013
@jasonsanjose jasonsanjose fix jsdoc for CollectionUtils forEach cb60b5a
@gruehle gruehle Merge pull request #3015 from adobe/jasonsanjose/issue-2962
Dispatch languageAdded event from LanguageManager
8d3915a
@peterflynn peterflynn Fix bug #2951 (Many commands [including save] apply to wrong file after
using Quick Open) - Block re-entrant focus attempts. This bug occurs with
any blur handlers that call EditorManager.focusEditor(), since that can
cause such re-entrant focus attempts (with two different editors).

Blur handlers run synchronously while an editor is in the middle of
getting focus, so the state is a little funny - activeEditor hasn't been
updated yet (blur fires before focus), so focusEditor() tries to focus the
old Editor that's in the process of losing focus. Webkit seems to ignore
tht attempt; but CodeMirror assumes that programmatic focus requests always
succeed, so CodeMirror's state.focused flag becomes wrong. This has a
delayed effect the NEXT time that editor gains focus: it doesn't dispatch a
focus event since CM thought it already had focus; as a result, activeEditor
never updates and any code that uses activeEditor gets the wrong value.

I think we could fix this by triggering stuff on focusIn instead of blur
(which is how ModalBar works and why the Find bar doesn't have a similar
bug). But it seems safer just to cut it off at the root: re-entrant attempts
to focus Editors.
1407aba
Commits on Mar 03, 2013
@dangoor dangoor Merge pull request #3023 from adobe/pflynn/fix-activeeditor-desync
Fix #2985 (Many commands [including save] apply to wrong file after using Quick Open)
17ad5a5
@peterflynn peterflynn Fix old references to Language.name -> Languages.getName(). This caused
the status bar language display to disappear and several LanguageManager
error strings to display incorrectly.
fef44aa
@RaymondLim RaymondLim Merge pull request #3026 from adobe/pflynn/fix-statusbar-language
Fix bug #3025 (Status bar no longer shows language)
d4a5491