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

Commit fcff599

Browse files
busykaibusykai
committed
Merge remote-tracking branch 'upstream/master' into allow-custom-appshells
2 parents 426fd63 + 1f915d4 commit fcff599

File tree

11 files changed

+61
-24
lines changed

11 files changed

+61
-24
lines changed

‎src/brackets.config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"app_title" : "Brackets",
55
"app_name_about" : "Brackets",
66
"about_icon" : "styles/images/brackets_icon.svg",
7-
"update_info_url" : "http://dev.brackets.io/updates/stable/",
7+
"update_info_url" : "http://s3.amazonaws.com/files.brackets.io/updates/stable/",
88
"how_to_use_url" : "https://github.com/adobe/brackets/wiki/How-to-Use-Brackets",
99
"support_url" : "https://github.com/adobe/brackets/wiki/Troubleshooting",
1010
"suggest_feature_url" : "https://github.com/adobe/brackets/wiki/Suggest-a-Feature",

‎src/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"app_title": "Brackets",
44
"app_name_about": "Brackets",
55
"about_icon": "styles/images/brackets_icon.svg",
6-
"update_info_url": "http://brackets.io/updates/stable/",
6+
"update_info_url": "http://s3.amazonaws.com/files.brackets.io/updates/stable/",
77
"how_to_use_url": "https://github.com/adobe/brackets/wiki/How-to-Use-Brackets",
88
"support_url": "https://github.com/adobe/brackets/wiki/Troubleshooting",
99
"suggest_feature_url": "https://github.com/adobe/brackets/wiki/Suggest-a-Feature",

‎src/editor/EditorCommandHandlers.js‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -763,14 +763,16 @@ define(function (require, exports, module) {
763763
return;
764764
}
765765

766-
var doc = editor.document,
767-
lineSelections = editor.convertToLineSelections(editor.getSelections()),
768-
isInlineWidget = !!EditorManager.getFocusedInlineWidget(),
769-
firstLine = editor.getFirstVisibleLine(),
770-
lastLine = editor.getLastVisibleLine(),
771-
totalLines = editor.lineCount(),
772-
lineLength = 0,
773-
edits = [];
766+
var doc = editor.document,
767+
lineSelections = editor.convertToLineSelections(editor.getSelections()),
768+
isInlineWidget = !!EditorManager.getFocusedInlineWidget(),
769+
firstLine = editor.getFirstVisibleLine(),
770+
lastLine = editor.getLastVisibleLine(),
771+
totalLines = editor.lineCount(),
772+
lineLength = 0,
773+
edits = [],
774+
newSels = [],
775+
pos = {};
774776

775777
_.each(lineSelections, function (lineSel) {
776778
var sel = lineSel.selectionForEdit,
@@ -836,11 +838,24 @@ define(function (require, exports, module) {
836838
break;
837839
}
838840
});
841+
842+
// Make sure selections are correct and primary selection is scrolled into view
839843
if (edits.length) {
840-
var newSels = doc.doMultipleEdits(edits);
844+
newSels = doc.doMultipleEdits(edits);
845+
846+
pos.ch = 0;
847+
841848
if (direction === DIRECTION_UP) {
842849
editor.setSelections(newSels);
850+
pos.line = editor.getSelection().start.line;
851+
} else if (direction === DIRECTION_DOWN) {
852+
pos.line = editor.getSelection().end.line;
853+
} else {
854+
console.error("EditorCommandHandler.moveLine() called with invalid argument 'direction' = %d", direction);
855+
pos = null;
843856
}
857+
858+
editor._codeMirror.scrollIntoView(pos);
844859
}
845860
}
846861

‎src/extensibility/ExtensionManagerViewModel.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ define(function (require, exports, module) {
439439
var self = this;
440440
this.notifyCount = 0;
441441
this.sortedFullSet.forEach(function (key) {
442-
if (self.extensions[key].installInfo.updateCompatible) {
442+
if (self.extensions[key].installInfo.updateCompatible && !ExtensionManager.isMarkedForUpdate(key)) {
443443
self.notifyCount++;
444444
}
445445
});

‎src/language/languages.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
"clojure": {
151151
"name": "Clojure",
152152
"mode": "clojure",
153-
"fileExtensions": ["clj"],
153+
"fileExtensions": ["clj", "cljs", "cljx"],
154154
"lineComment": [";", ";;"]
155155
},
156156

‎src/nls/fr/strings.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ define({
4141
"FILE_EXISTS_ERR": "Le fichier ou le répertoire existe déjà.",
4242
"FILE": "fichier",
4343
"DIRECTORY": "répertoire",
44-
"DIRECTORY_NAMES_LEDE": "Noms de répertoire",
45-
"FILENAMES_LEDE": "Noms de fichier",
46-
"FILENAME": "nom de fichier",
47-
"DIRECTORY_NAME": "nom de répertoire",
44+
"DIRECTORY_NAMES_LEDE": "noms de répertoires",
45+
"FILENAMES_LEDE": "noms de fichiers",
46+
"FILENAME": "Nom de fichier",
47+
"DIRECTORY_NAME": "Nom de répertoire",
4848

4949

5050
// Project error strings
@@ -66,7 +66,7 @@ define({
6666
"ERROR_DELETING_FILE_TITLE": "Erreur lors de la suppression du fichier",
6767
"ERROR_DELETING_FILE": "Une erreur s’est produite lors de la tentative de suppression du fichier <span class='dialog-filename'>{0}</span>. {1}",
6868
"INVALID_FILENAME_TITLE": "{0} non valide",
69-
"INVALID_FILENAME_MESSAGE": "Le {0} ne peut pas utiliser de termes réservés au système, finir par un point (.) ou contenir l’un des caractères suivants : <code class='emphasized'>{1}</code>",
69+
"INVALID_FILENAME_MESSAGE": "Les {0} ne peuvent pas utiliser de termes réservés au système, finir par un point (.) ou contenir l’un des caractères suivants : <code class='emphasized'>{1}</code>",
7070
"ENTRY_WITH_SAME_NAME_EXISTS": "Il existe déjà un fichier ou un répertoire portant le nom <span class='dialog-filename'>{0}</span>.",
7171
"ERROR_CREATING_FILE_TITLE": "Erreur lors de la création du {0}",
7272
"ERROR_CREATING_FILE": "Une erreur s’est produite lors de la tentative de création du {0} <span class='dialog-filename'>{1}</span>. {2}",

‎src/styles/bootstrap/tables.less‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ table {
154154

155155
// Default zebra-stripe styles (alternating gray and transparent backgrounds)
156156
.table-striped {
157-
tbody {
157+
> tbody {
158158
> tr:nth-child(odd) > td,
159159
> tr:nth-child(odd) > th {
160160
background-color: @tableBackgroundAccent;
@@ -167,7 +167,7 @@ table {
167167
// ------------
168168
// Placed here since it has to come after the potential zebra striping
169169
.table-hover {
170-
tbody {
170+
> tbody {
171171
tr:hover > td,
172172
tr:hover > th {
173173
background-color: @tableBackgroundHover;

‎test/BootstrapReporterView.css‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,11 @@ pre {
3838
/* De-emphasize source links to Jasmine framework code (vs. links to test spec & Brackets core code) */
3939
.testframework-link {
4040
opacity: 0.45;
41-
}
41+
}
42+
43+
@media (min-width: 728px) and (max-width: 1199px) {
44+
.navbar-fixed-top .container,
45+
.navbar-fixed-bottom .container {
46+
width: 800px;
47+
}
48+
}

‎test/SpecRunner.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,11 @@
6262
<li><a id="all" href="?suite=all">All</a></li>
6363
<li><a id="unit" href="?suite=unit">Unit</a></li>
6464
<li><a id="integration" href="?suite=integration">Integration</a></li>
65+
<li><a id="livepreview" href="?suite=livepreview">Live&nbsp;Preview</a></li>
6566
<li><a id="performance" href="?suite=performance">Performance</a></li>
6667
<li><a id="extension" href="?suite=extension">Extensions</a></li>
6768
<li><a id="reload" href="#">Reload</a></li>
68-
<li><a id="show-dev-tools" href="#">Show Developer Tools</a></li>
69+
<li><a id="show-dev-tools" href="#">Show&nbsp;Developer&nbsp;Tools</a></li>
6970
</ul>
7071
</div>
7172
</div>

‎test/spec/LiveDevelopment-test.js‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ define(function (require, exports, module) {
179179

180180
describe("Inspector", function () {
181181

182-
this.category = "integration";
182+
this.category = "livepreview";
183183

184184
it("should return a ready socket on Inspector.connect and close the socket on Inspector.disconnect", function () {
185185
var id = Math.floor(Math.random() * 100000),
@@ -232,6 +232,8 @@ define(function (require, exports, module) {
232232

233233
describe("URL Mapping", function () {
234234

235+
this.category = "livepreview";
236+
235237
it("should validate base urls", function () {
236238
expect(PreferencesDialogs._validateBaseUrl("http://localhost"))
237239
.toBe("");
@@ -264,6 +266,8 @@ define(function (require, exports, module) {
264266

265267
describe("HighlightAgent", function () {
266268

269+
this.category = "livepreview";
270+
267271
describe("Highlighting elements in browser from a CSS rule", function () {
268272

269273
var testDocument,
@@ -514,7 +518,7 @@ define(function (require, exports, module) {
514518

515519
describe("Live Development", function () {
516520

517-
this.category = "integration";
521+
this.category = "livepreview";
518522

519523
beforeFirst(function () {
520524
SpecRunnerUtils.createTempDirectory();
@@ -937,6 +941,9 @@ define(function (require, exports, module) {
937941
});
938942

939943
describe("Servers", function () {
944+
945+
this.category = "livepreview";
946+
940947
// Define testing parameters, files do not need to exist on disk
941948
// File paths used in tests:
942949
// * file1 - file inside project
@@ -997,6 +1004,9 @@ define(function (require, exports, module) {
9971004
});
9981005

9991006
describe("Default HTML Document", function () {
1007+
1008+
this.category = "livepreview";
1009+
10001010
var brackets,
10011011
LiveDevelopment,
10021012
ProjectManager,
@@ -1030,6 +1040,7 @@ define(function (require, exports, module) {
10301040
}
10311041

10321042
describe("Find static page for Live Development", function () {
1043+
10331044
it("should return the same HTML document like the currently open document", function () {
10341045
var promise,
10351046
document,
@@ -1202,6 +1213,7 @@ define(function (require, exports, module) {
12021213
});
12031214

12041215
describe("Find dynamic page for Live Development", function () {
1216+
12051217
it("should return the same index.php document like the currently opened document", function () {
12061218
var promise,
12071219
document,

0 commit comments

Comments
 (0)