Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Merge post 1.7 release changes to release #12844

Merged
merged 202 commits into from
Oct 26, 2016
Merged
Changes from 1 commit
Commits
Show all changes
202 commits
Select commit Hold shift + click to select a range
56d139b
Attach editor to LiveCSSDocument during creation
sebaslv Feb 4, 2015
b729799
Fix: Find in Files results don't update to reflect external changes u…
Aug 17, 2015
66b91df
Only add padding-left to main tree UL. Fix padding-bottom assignment …
Sep 17, 2015
b718127
1) Added / to be an invalid file name character for mac platform
Oct 28, 2015
5d2693a
1) Added / to be an invalid file name character for mac platform
Oct 29, 2015
2c8b8da
Added / to be invalid character
Oct 29, 2015
24d4564
Reuse parseQueryInfo defined in FindUtils for the FindReplace feature.
ficristo Dec 26, 2015
530f830
Merge remote-tracking branch 'adobe/master'
Mar 15, 2016
d579f67
Added Latvian translation
Apr 17, 2016
77672f0
Fix FindReplace Integration tests
May 20, 2016
f466dba
Bumping version Number to 1.8
nethip May 23, 2016
8093791
Merge pull request #12446 from adobe/prashant/VersionUpdate
nethip May 23, 2016
466355d
Latvian translation corrections
May 26, 2016
d267588
minor fix
May 26, 2016
959ecd9
Merge pull request #12367 from liidzcelim/master
abose May 28, 2016
3df542c
Update translations for zh_CN
michaeljayt May 26, 2016
86aaf5c
Merge pull request #12458 from michaeljayt/master
Jun 1, 2016
0e606b6
Merge pull request #12440 from adobe/marcel/fix-find-tests
abose Jun 4, 2016
77e6343
Addresses #12456 where code folding triangles in the gutter were not …
thehogfather Jun 14, 2016
a166e00
Update strings.js
diomed Jun 14, 2016
2bd9135
Removed unnecessary prefixed property
AllThingsSmitty Jun 15, 2016
399e78c
Merge pull request #12523 from diomed/patch-1
abose Jul 2, 2016
6e9f9e6
Merge pull request #12563 from adobe/release
Jul 2, 2016
42bfe88
fix some pt-br words
jorgelealbr Jul 8, 2016
8f28182
removed unused parameters from onFold and onUnfold functions
thehogfather Jul 9, 2016
0cc5302
Replace the URL in URLCodeHints even if it is the current content of …
Jun 16, 2015
90c878c
Add test case
May 3, 2016
361e81d
Merge pull request #11284 from adobe/marcel/url-hints-replace
Jul 23, 2016
7f740f6
Close CSS Code Hints after inputting property value
Feb 4, 2015
5145e53
Merge pull request #10524 from MarcelGerber/css-hints-after-value
Jul 23, 2016
04c4a14
Fix FindInFiles tests
Jul 23, 2016
0c58ca2
Fix SVG Code Hints test
Jul 23, 2016
75b4ff0
Show "Confirm Delete" dialog for files, too
Dec 21, 2014
0bc1d05
Add new pref: lineWiseCopyCut
Sep 15, 2015
78548a5
Merge pull request #11706 from adobe/marcel/pref-linewise-copy
Jul 24, 2016
f376d89
Merge pull request #10258 from MarcelGerber/confirm-delete-dialog
Jul 24, 2016
7a5d99c
Merge pull request #12582 from jorgelealbr/patch-1
Jul 24, 2016
634eb70
Merge remote-tracking branch 'upstream/master' into fix-tests
Jul 24, 2016
6ba17d3
Check that all results are collapsed
Jul 24, 2016
aa5bead
Merge pull request #12615 from adobe/marcel/fix-tests
Jul 24, 2016
5c9d29f
Update CodeMirror -> post-5.17.0
Jul 26, 2016
1053768
Merge pull request #12613 from adobe/marcel/update-cm
Jul 26, 2016
e1ceedf
added html test file and restructured unit test to easily work with a…
thehogfather Jul 26, 2016
5dd3918
Merge branch 'Code-folding-issue-12456' of https://github.com/thehogf…
thehogfather Jul 26, 2016
6da3ed8
Improve search tick mark positioning
Jul 27, 2016
ed9edd3
Merge pull request #11293 from adobe/marcel/scroll-marks-fixes
Jul 27, 2016
fb7b4a1
cleaned up tests.
thehogfather Jul 28, 2016
6e4278a
Compress all .png files using Zopfli
Jul 28, 2016
78b0612
Merge branch 'master' of https://github.com/adobe/brackets into Code-…
thehogfather Jul 29, 2016
af7906f
Addressed CR comments and merged with master.
thehogfather Jul 29, 2016
07fca23
Addresses failing tests
thehogfather Jul 30, 2016
966b466
Remove basePadding from indent-wrapping hack
petetnt Jul 31, 2016
ffed040
Remove code-padding from Codemirror pre's. Fixes #12630
petetnt Jul 31, 2016
fcecf9f
Rework tree selection backgrounds to be CSS-positioned
Aug 1, 2016
618d49e
Immediately render the tree on panel resize
Aug 1, 2016
190fdcd
Use opn instead of open.
Aug 2, 2016
6fe6585
CSS: remove unneeded prefixes, add standard properties, remove `px` f…
valtlai Aug 4, 2016
0858f84
Merge pull request #12648 from valtlai/valtlai/css-prefixes-units
Aug 8, 2016
41f6d66
Merge branch 'master' of https://github.com/adobe/brackets into Code-…
thehogfather Aug 8, 2016
93ee0a7
Merge pull request #12628 from adobe/marcel/zopfli-png
Aug 10, 2016
a8fe878
Merge pull request #12521 from thehogfather/Code-folding-issue-12456
ficristo Aug 10, 2016
453cb57
Merge pull request #12641 from ficristo/opn
Aug 10, 2016
074382a
Move most inline jslint directives to config files
ficristo Aug 9, 2016
7814da1
Merge pull request #12661 from ficristo/jslint-directives
Aug 13, 2016
762d2b7
Avoid the edit icon to move in the file exclusion set
ficristo Aug 12, 2016
eba3d47
Merge pull request #12671 from ficristo/fix-filter-pencil-pos
Aug 14, 2016
653ac8c
Fix crawlComplete exception when running tests
Aug 9, 2016
c395259
Merge pull request #12659 from adobe/marcel/crawl-complete-exception
Aug 14, 2016
1a417de
Add another assertion to be on the safe side
sprintr Aug 15, 2016
ca8b283
Merge pull request #12676 from sprintr/issue-12399
Aug 15, 2016
1b006e2
Merge pull request #11862 from tallandroid/master
zaggino Aug 16, 2016
1cd8d9c
Merge pull request #12635 from petetnt/petetnt/no-code-padding
zaggino Aug 16, 2016
9a3d80f
get latest codemirror fixes
zaggino Aug 16, 2016
271943a
Merge pull request #12636 from adobe/marcel/rework-tree-selection
zaggino Aug 16, 2016
424d808
Merge pull request #12679 from adobe/zaggino/update-code-mirror
ficristo Aug 16, 2016
86c037f
do nothing when trying to reset with the same content which is alread…
zaggino Aug 17, 2016
e5596f5
Merge pull request #12533 from AllThingsSmitty/master
Aug 17, 2016
795abda
Add -webkit-filter to @keyframes (without prefix) so newer versions o…
Aug 17, 2016
b0f0dc2
Merge pull request #12683 from adobe/marcel/fix-samples-css
ficristo Aug 17, 2016
c688d86
Enable "Click Through" for the file tree shadow
Aug 17, 2016
2f1d7b2
Merge pull request #11717 from stowball/lessen-tree-indenting
Aug 18, 2016
d68a4a5
Merge pull request #12685 from adobe/marcel/tree-shadow-click-through
petetnt Aug 18, 2016
b1a24ba
Merge pull request #12027 from ficristo/parseQuery-cleanup
Aug 18, 2016
5141df2
Merge pull request #10522 from sebaslv/fix-for-10516
Aug 18, 2016
c16e34f
Rename CONFIRM_FOLDER_DELETE_TITLE -> CONFIRM_DELETE_TITLE (#12693)
Aug 20, 2016
bf9b07d
Merge pull request #12110 from petetnt/petetnt/indent-wrap-minor-fix
ficristo Aug 20, 2016
1dda74c
Simulate indentation of the project tree using some divs
ficristo Jan 3, 2016
ef80a26
Review comments
ficristo Jul 29, 2016
de1f63f
Remove thickness class, add stopPropagation in rename, fix order of l…
ficristo Aug 18, 2016
80aeead
fix folder behaviour
ficristo Aug 18, 2016
dc8cb32
Rework folder code and fix bouncing effect
ficristo Aug 20, 2016
23f3eb6
Merge pull request #12047 from ficristo/fix-folders-tree
Aug 20, 2016
f2d82ac
Use the global RequireJS config for ExtensionLoader. Fixes #1087 (#12…
petetnt Aug 21, 2016
1c2a74d
Update tests after #12047
ficristo Aug 21, 2016
9f0825d
Merge pull request #12700 from ficristo/fix-filetreeview-tests
Aug 21, 2016
8959405
Fix Inline Editor file name underline
Aug 21, 2016
4be34b6
Fix the bug where errors during installation of a local .zip file wer…
Aug 22, 2016
d974228
Live Dev MultiBrowser: Convert url()s so they reference the correct file
Aug 22, 2016
5502d2e
Fix failing test
Aug 22, 2016
7976f33
Add test case
Aug 22, 2016
cc1d350
Use chokidar instead of the fsevents/fsevents_win combo
Feb 3, 2016
c0aa471
Add 'depth' parameter
Feb 4, 2016
61888e6
Add some logs
ficristo Feb 7, 2016
2e3210b
Use the stats from chokidar
ficristo Apr 18, 2016
adfd64d
Prepared preferences for the paths to ignore during watching
ficristo May 14, 2016
68f6c37
Make tests pass
Aug 3, 2016
a34d926
do not commit node_modules to the project
zaggino Aug 3, 2016
63f58f8
do not ignore stuff by default in the domain
zaggino Aug 4, 2016
7733f4a
propagate ignores from FileSystem.js
zaggino Aug 4, 2016
2dc6a70
stats are not always available (deletes)
zaggino Aug 4, 2016
c9758b4
chokidar allows recursive watching in linux
zaggino Aug 4, 2016
7163ff7
watchedRoot.filter should be used to ignore files from watching
zaggino Aug 4, 2016
b59f7b8
fix project switching blocker
zaggino Aug 5, 2016
0d5c9dc
do not hide true event names from shell file system
zaggino Aug 5, 2016
49c82fb
correctly transfer stats from watcher domain
zaggino Aug 5, 2016
e8117a0
make stuff slightly faster using test instead of match
zaggino Aug 16, 2016
412e5ed
add node side filter to the watched root class
zaggino Aug 16, 2016
26301f5
pass exclusionGlob to WatchedRoot
zaggino Aug 16, 2016
3fe4876
implemented and tested ignoring
zaggino Aug 16, 2016
65bc4f8
exclude node_modules too
zaggino Aug 18, 2016
c9b9dbb
added npm-shrinkwrap
zaggino Aug 23, 2016
b54781a
more readable condition
zaggino Aug 23, 2016
9a6d16e
use simplified group of watch events
zaggino Aug 23, 2016
be4c7c8
explain better
zaggino Aug 23, 2016
b431042
add c# file watcher executables from vscode
zaggino Aug 23, 2016
c4a226f
add useful options to chokidar
zaggino Aug 23, 2016
2b2bfc1
add glob
zaggino Aug 23, 2016
48c200e
refactoring
zaggino Aug 23, 2016
8b7c0b1
implement CSharpWatcher
zaggino Aug 23, 2016
23f687e
avoid circular dependency errors
zaggino Aug 23, 2016
68fe2f1
do not notify about terminations when closing watcher
zaggino Aug 23, 2016
1096f74
optimize: do not call domain function with an empty list
zaggino Aug 23, 2016
3cf15ea
ensure _hash is present in file system stats
zaggino Aug 23, 2016
9c78e36
fix the bug with shell rounding the stats mtime causing false blind w…
zaggino Aug 23, 2016
84b5fa7
add MS license for CodeHelper.exe
zaggino Aug 23, 2016
9077970
add adobe license headers to new files
zaggino Aug 24, 2016
4e17c98
add npm install --production script to grunt build
zaggino Aug 24, 2016
be62881
Merge pull request #12647 from adobe/shell-node6
ficristo Aug 25, 2016
2913061
Move npm-shrinkwrap in dist folder too
ficristo Aug 25, 2016
219f856
Clean up a bit npm-install file
ficristo Aug 25, 2016
5249a4e
Use node env only in node scripts (and not globally)
ficristo Aug 25, 2016
8370a08
ESLint: enable strict rule
ficristo Aug 25, 2016
ad8e1ed
Merge pull request #12718 from ficristo/strict
zaggino Aug 25, 2016
af423b4
Merge remote-tracking branch 'ficristo/shrinkwrap-cleanup'
zaggino Aug 25, 2016
452911a
Merge pull request #12705 from adobe/marcel/ld-css-relative-url
zaggino Aug 25, 2016
8cce5ec
Merge pull request #12701 from adobe/marcel/fix-10027
zaggino Aug 25, 2016
63962ce
Fix for issue #8142: "Ctrl + Space" should move to the next entry whe…
bmax Aug 26, 2016
1ed6c04
Update Tern & Acorn (#11569)
Aug 26, 2016
259c0fd
ESLint: enable no-bitwise rule
ficristo Aug 26, 2016
a0a0a54
Merge pull request #12719 from ficristo/bitwise
zaggino Aug 26, 2016
30bbf5f
Use strict equal of length of added and removed sets against zero
Aug 26, 2016
fc5d8e8
Adds autofill detail tokens to the autocomplete attribute
Dandandans Aug 27, 2016
57b5131
Merge pull request #11602 from amrelnaggar/findinfiles-bugfix
zaggino Aug 27, 2016
5727863
Ensures fold-gutter is always inserted after the line-number gutter (…
thehogfather Aug 27, 2016
812111e
Revert "Ensures fold-gutter is always inserted after the line-number …
petetnt Aug 28, 2016
9aeb2fb
Merge pull request #12727 from adobe/revert-12673-fold-gutter-position
zaggino Aug 29, 2016
4cf67af
fix invalid filename (passes on windows due to fs being case insensit…
zaggino Aug 29, 2016
1342b4c
Merge pull request #12732 from adobe/zaggino/fix-codehints-tests
Aug 29, 2016
4e94128
Monkeypatch ternServer.normalizeFilename so it doesn't break Mac/Linu…
Aug 29, 2016
b9539bf
Rename ecma5 to ecmascript
ficristo Aug 29, 2016
70a7f00
Merge pull request #12736 from ficristo/rename-ecmascript
Aug 29, 2016
5522f60
Resequence autosuggestions for CSS 'list-style'
albell Aug 29, 2016
5ab3c78
Add parens to 'url()' in CSS code hints
albell Aug 30, 2016
2e43c63
Resequence autosuggestions for CSS 'list-style' (#12738)
petetnt Aug 31, 2016
300f3d0
Merge pull request #12734 from adobe/marcel/fix-tern-linux-mac
Sep 1, 2016
d93ccc5
Add cut/copy/paste to the context menu
ficristo Aug 14, 2016
fd2b884
Merge pull request #12674 from ficristo/context-menu
Sep 1, 2016
69e1407
update CM before release
zaggino Sep 5, 2016
377560e
Merge pull request #12753 from adobe/zaggino/update-cm
Sep 5, 2016
e2020ca
Travis: test against node 6
ficristo Sep 5, 2016
191d12f
Merge pull request #12755 from ficristo/travis-node-6
zaggino Sep 5, 2016
1ad12c4
Add an ISSUE_TEMPLATE
ficristo Aug 29, 2016
f2f000e
Merge pull request #12737 from ficristo/issue-template
ficristo Sep 6, 2016
fc81b30
Add link to Linux Guide for frequent problems overreported in GitHub …
NathanJPlummer Sep 7, 2016
b9cae25
Merge pull request #12761 from NathanJPlummer/master
zaggino Sep 7, 2016
dedd539
Fixed leak in menujs file
Sep 9, 2016
970d69a
Added test case for detaching menu items' event listeners
Sep 10, 2016
3b40948
Fixed removeMenuItemListeners test case.
Sep 10, 2016
26bb4c9
Cleaned up removeMenuItemListeners test case.
Sep 10, 2016
7bce131
Applied suggested fixes.
daytonjallen Sep 10, 2016
5328b47
Merge remote-tracking branch 'daytonallen/menujs-leak'
zaggino Sep 10, 2016
d89738d
set eslints max-len to 120
zaggino Sep 14, 2016
f028b3e
Merge pull request #12780 from adobe/zaggino/max-len
zaggino Sep 14, 2016
2286cd1
Adds `on` `off` values
Dandandans Sep 14, 2016
16d7eda
Fixes missing comma
Dandandans Sep 14, 2016
147e945
Merge pull request #12721 from Dandandans/autofill-detail-tokens
zaggino Sep 15, 2016
8c2d00e
add font-display property
samuelcarreira Sep 16, 2016
a340c30
Merge pull request #12785 from samuelcarreira/patch-1
ficristo Sep 17, 2016
0aba2e0
Italian translation, correct sintax (#12800)
dennybiasiolli Sep 22, 2016
fb7d64d
added variable for modal-body in context
mansimarkaur Sep 27, 2016
b407256
Added scrollTop in Extension Manager
mansimarkaur Sep 28, 2016
9f50163
Merge pull request #12805 from mansimarkaur/var_for_modal_in_dlg
zaggino Sep 28, 2016
36f8346
Don't let ESC key bubble in CodeHintList. Fixes #12799 (#12802)
petetnt Sep 29, 2016
0d1630c
Handle an edge case where an filetree item is an MacOS folder icon (#…
petetnt Sep 29, 2016
3367997
Add ARIA Code Hints
Coder206 Oct 2, 2016
f57c991
Merge pull request #12471 from Coder206/patch-1
zaggino Oct 3, 2016
281a4df
Adds code folding support for handlebars template files (#12675)
thehogfather Oct 5, 2016
dd6eb4a
Update CSSProperties.json
Ollie-w Oct 9, 2016
9d25dcd
Merge pull request #12822 from Ollie-w/patch-2
petetnt Oct 9, 2016
4b26e9d
Dialog returns focus to previous element after closing (#12824)
Jerhamre Oct 16, 2016
ab1396b
Fix #11416: Enter key behaviour on Extension Manager Search Box (#12839)
sahildua2305 Oct 18, 2016
1cfb24f
Allow omitted optional close tags in HTMLSimpleDOM (#12057)
jscissr Oct 25, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/extensions/default/CodeFolding/foldhelpers/foldcode.js
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ define(function (require, exports, module) {
lastMark,
foldMarks;
for (i = 0; i < marks.length; ++i) {
if (marks[i].__isFold && force !== "fold") {
if (marks[i].__isFold) {
if (!allowFolded) {
return null;
}
@@ -90,18 +90,24 @@ define(function (require, exports, module) {
});

textRange.on("clear", function (from, to) {
delete cm._lineFolds[pos.line];
CodeMirror.signal(cm, "unfold", cm, from, to, pos.line);
delete cm._lineFolds[from.line];
CodeMirror.signal(cm, "unfold", cm, from, to);
});

if (force === "fold") {
delete range.cleared;
cm._lineFolds[pos.line] = range;
// in some cases such as in xml style files, the start of line folds can span multiple lines
// render a gutter marker for both the beginning and end of the line
if (pos.line < range.from.line) {
cm._lineFolds[range.from.line] = range;
} else {
cm._lineFolds[pos.line] = range;
}
} else {
delete cm._lineFolds[pos.line];
}

CodeMirror.signal(cm, force, cm, range.from, range.to, pos.line);
CodeMirror.signal(cm, force, cm, range.from, range.to);
return range;
}

16 changes: 7 additions & 9 deletions src/extensions/default/CodeFolding/foldhelpers/foldgutter.js
Original file line number Diff line number Diff line change
@@ -100,6 +100,7 @@ define(function (require, exports, module) {
i = sr.to.line + 1;
} else {
range = cm._lineFolds[i] || (func && func(cm, pos));

if (!fade || (fade && $gutter.is(":hover"))) {
if (cm.isFolded(i)) {
// expand fold if invalid
@@ -355,13 +356,11 @@ define(function (require, exports, module) {
* @param {!CodeMirror} cm the CodeMirror instance for the active editor
* @param {!Object} from the ch and line position that designates the start of the region
* @param {!Object} to the ch and line position that designates the end of the region
* @param {?Number} gutterLineNumber the gutter line number that was clicked to signal the fold event
*/
function onFold(cm, from, to, gutterLineNumber) {
var state = cm.state.foldGutter,
line = isNaN(gutterLineNumber) ? from.line : gutterLineNumber;
if (line >= state.from && line < state.to) {
updateFoldInfo(cm, line, line + 1);
function onFold(cm, from, to) {
var state = cm.state.foldGutter;
if (from.line >= state.from && from.line < state.to) {
updateFoldInfo(cm, from.line, from.line + 1);
}
}

@@ -370,14 +369,13 @@ define(function (require, exports, module) {
* @param {!CodeMirror} cm the CodeMirror instance for the active editor
* @param {!{line:number, ch:number}} from the ch and line position that designates the start of the region
* @param {!{line:number, ch:number}} to the ch and line position that designates the end of the region
* @param {?Number} gutterLineNumber the gutter line number that was clicked to signal the fold event
*/
function onUnFold(cm, from, to, gutterLineNumber) {
function onUnFold(cm, from, to) {
var state = cm.state.foldGutter;
var vp = cm.getViewport();
delete cm._lineFolds[from.line];
if (from.line >= state.from && from.line < state.to) {
updateFoldInfo(cm, from.line, Math.min(vp.to, to.line));
updateFoldInfo(cm, vp.from, Math.min(vp.to, to.line));
}
}