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

Fix #9363: Code hints popup dismisses prematurely #9548

Merged
merged 3 commits into from
Oct 20, 2014
Merged

Fix #9363: Code hints popup dismisses prematurely #9548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63271d8
Move the restore collapsed files logic to the template
TomMalbran Oct 14, 2014
397d747
Remove the collapsed class
TomMalbran Oct 19, 2014
6a07e87
Remove unwanted change
TomMalbran Oct 20, 2014
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
4 changes: 2 additions & 2 deletions src/htmlContent/search-results.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<tr class="file-section" data-file-index="{{fileIndex}}">
{{#replace}}<td class="checkbox-column"><input type="checkbox" class="check-one-file" {{#isChecked}}checked="true"{{/isChecked}} /></td>{{/replace}}
<td colspan="2">
<span class="disclosure-triangle expanded" title="{{Strings.FIND_IN_FILES_EXPAND_COLLAPSE}}"></span>
<span class="disclosure-triangle {{^isCollapsed}}expanded{{/isCollapsed}}" title="{{Strings.FIND_IN_FILES_EXPAND_COLLAPSE}}"></span>
{{{filename}}}
</td>
</tr>
{{#items}}
<tr data-file-index="{{fileIndex}}" data-item-index="{{itemIndex}}" data-match-index="{{matchIndex}}">
<tr data-file-index="{{fileIndex}}" data-item-index="{{itemIndex}}" data-match-index="{{matchIndex}}" {{#isCollapsed}}style="display:none;"{{/isCollapsed}}>
{{#replace}}<td class="checkbox-column"><input type="checkbox" class="check-one" {{#isChecked}}checked="true"{{/isChecked}} /></td>{{/replace}}
<td class="line-number">{{line}}</td>
<td class="line-text">{{pre}}<span class="highlight">{{highlight}}</span>{{post}}</td>
Expand Down
2 changes: 1 addition & 1 deletion src/language/CodeInspection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ define(function (require, exports, module) {
$selectedRow.nextUntil(".inspector-section").toggle();

var $triangle = $(".disclosure-triangle", $selectedRow);
$triangle.toggleClass("expanded").toggleClass("collapsed");
$triangle.toggleClass("expanded");
} else {
// This is a problem marker row, show the result on click
// Grab the required position data
Expand Down
47 changes: 20 additions & 27 deletions src/search/SearchResultsView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ define(function (require, exports, module) {
if (searchItem.collapsed !== collapsed) {
searchItem.collapsed = collapsed;
$(this).nextUntil(".file-section").toggle();
$(this).find(".disclosure-triangle").toggleClass("expanded").toggleClass("collapsed");
$(this).find(".disclosure-triangle").toggleClass("expanded");
}
});

Expand Down Expand Up @@ -385,7 +385,7 @@ define(function (require, exports, module) {
self = this;

this._showSummary();
this._searchList = [];
this._searchList = [];

// Iterates throuh the files to display the results sorted by filenamess. The loop ends as soon as
// we filled the results for one page
Expand Down Expand Up @@ -427,16 +427,17 @@ define(function (require, exports, module) {
multiLine = match.start.line !== match.end.line;

searchItems.push({
fileIndex: self._searchList.length,
itemIndex: searchItems.length,
matchIndex: i,
line: match.start.line + 1,
pre: match.line.substr(0, match.start.ch),
highlight: match.line.substring(match.start.ch, multiLine ? undefined : match.end.ch),
post: multiLine ? "\u2026" : match.line.substr(match.end.ch),
start: match.start,
end: match.end,
isChecked: match.isChecked
fileIndex: self._searchList.length,
itemIndex: searchItems.length,
matchIndex: i,
line: match.start.line + 1,
pre: match.line.substr(0, match.start.ch),
highlight: match.line.substring(match.start.ch, multiLine ? undefined : match.end.ch),
post: multiLine ? "\u2026" : match.line.substr(match.end.ch),
start: match.start,
end: match.end,
isChecked: match.isChecked,
isCollapsed: item.collapsed
});
if (!match.isChecked) {
allInFileChecked = false;
Expand All @@ -456,11 +457,12 @@ define(function (require, exports, module) {
);

self._searchList.push({
fileIndex: self._searchList.length,
filename: displayFileName,
fullPath: fullPath,
isChecked: allInFileChecked,
items: searchItems
fileIndex: self._searchList.length,
filename: displayFileName,
fullPath: fullPath,
isChecked: allInFileChecked,
items: searchItems,
isCollapsed: item.collapsed
});
}
});
Expand All @@ -473,16 +475,7 @@ define(function (require, exports, module) {
replace: this._model.isReplace,
searchList: this._searchList,
Strings: Strings
}))
// Restore the collapsed files
.find(".file-section").each(function () {
var fullPath = self._searchList[$(this).data("file-index")].fullPath;

if (self._model.results[fullPath].collapsed) {
self._model.results[fullPath].collapsed = false;
$(this).trigger("click");
}
});
}));

if (this._$selectedRow) {
this._$selectedRow.removeClass("selected");
Expand Down
5 changes: 1 addition & 4 deletions src/styles/brackets.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,15 +1327,12 @@ a, img {
#problems-panel .disclosure-triangle {
.jstree-sprite;
display: inline-block;
background-position: 7px 5px;
&.expanded {
// Unfortunately, the way jsTree sprites are aligned within their 18px boxes doesn't look good in
// other contexts, so we need some tweaks here instead of straight multiples of @jstree-sprite-size
background-position: 7px 5px;
-webkit-transform: translateZ(0) rotate(90deg);
}
&.collapsed {
background-position: 7px 5px;
}
}

/* Modal bar for Find/Quick Open */
Expand Down