This repository was archived by the owner on May 25, 2019. It is now read-only.

Commit 646738f

committed

1. Fixed CodeMirror bug

2. Increased priority of provider to put it before the CSS Inline Editor

1 parent 0864c38 commit 646738fCopy full SHA for 646738f

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* https://github.com/adobe/brackets/blob/master/src/language/JSUtils.js */`
	`1`	`+/* https://github.com/adobe/brackets/blob/master/src/language/JSUtils.js */`
`2`	`2`
`3`	`3`	`/jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 /`
`4`	`4`	`/global define, ,ドル brackets, CodeMirror /`
`@@ -14,6 +14,7 @@ define(function (require, exports, module) {`
`14`	`14`	`DocumentManager = brackets.getModule("document/DocumentManager"),`
`15`	`15`	`FileUtils = brackets.getModule("file/FileUtils"),`
`16`	`16`	`_ = brackets.getModule("thirdparty/lodash"),`
	`17`	`+ CodeMirror = brackets.getModule("thirdparty/CodeMirror2/lib/codemirror"),`
`17`	`18`	`StringUtils = brackets.getModule("utils/StringUtils");`
`18`	`19`
`19`	`20`	`/**`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -165,19 +165,24 @@ define(function (require, exports, module) {`
`165`	`165`	`function provider(hostEditor, pos) {`
`166`	`166`	`// Only provide an editor when cursor is in HTML content`
`167`	`167`	`if (hostEditor.getModeForSelection() !== "html") {`
	`168`	`+ console.info('AJS: No HTML');`
`168`	`169`	`return null;`
`169`	`170`	`}`
`170`	`171`
`171`	`172`	`// Only provide an editor if the selection is within a single line`
`172`	`173`	`var sel = hostEditor.getSelection();`
`173`	`174`	`if (sel.start.line !== sel.end.line) {`
	`175`	`+ console.info('AJS: Multi Selection');`
`174`	`176`	`return null;`
`175`	`177`	`}`
`176`	`178`
`177`	`179`	`// Always use the selection start for determining the function name. The pos`
`178`	`180`	`// parameter is usually the selection end.`
`179`	`181`	`var directiveName = _getDirectiveName(hostEditor, sel.start),`
`180`	`182`	`controllerName = _getControllerName(hostEditor, sel.start);`
	`183`	`+`
	`184`	`+ console.info('Directive: ', directiveName);`
	`185`	`+ console.info('Controller: ', controllerName);`
`181`	`186`
`182`	`187`	`if (controllerName) {`
`183`	`188`	`return _createInlineEditor(hostEditor, controllerName, patterns.controller);`
`@@ -191,5 +196,5 @@ define(function (require, exports, module) {`
`191`	`196`	`}`
`192`	`197`
`193`	`198`	`// init`
`194`		`- EditorManager.registerInlineEditProvider(provider);`
	`199`	`+ EditorManager.registerInlineEditProvider(provider,10);`
`195`	`200`	`});`

Lines changed: 1 addition & 1 deletion

Comments

(0)