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

Commit d882abd

committed

Merge pull request #15 from WickedSik/master

Fixing Inline Editor for tag-style directives

2 parents 597b677 + acb865e commit d882abdCopy full SHA for d882abd

File tree

3 files changed

+14

-10

lines changed

NGUtils.js
main.js
test.html

3 files changed

+14

-10

lines changed

`‎NGUtils.js`

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`	`/**`

`‎main.js`

Lines changed: 11 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ define(function (require, exports, module) {`
`15`	`15`	`var patterns = {`
`16`	`16`	`directive: /\.directive\(['"]([a-zA-Z-]+)['"]/g,`
`17`	`17`	`controller: /\.controller\(['"](\w+)['"]/g`
`18`		`- }`
	`18`	`+ };`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	`* Return the token string that is at the specified position.`
`@@ -165,30 +165,33 @@ 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`		`- var directiveName, controllerName;`
`180`		`-`
`181`		`- if (controllerName = _getControllerName(hostEditor, sel.start)) {`
`182`		`- return _createInlineEditor(hostEditor, _getControllerName(hostEditor, sel.start), patterns.controller);`
	`181`	`+ var directiveName = _getDirectiveName(hostEditor, sel.start),`
	`182`	`+ controllerName = _getControllerName(hostEditor, sel.start);`
	`183`	`+`
	`184`	`+ if (controllerName) {`
	`185`	`+ return _createInlineEditor(hostEditor, controllerName, patterns.controller);`
`183`	`186`	`}`
`184`	`187`
`185`		`- if (directiveName=_getDirectiveName(hostEditor,sel.start)) {`
	`188`	`+ if (directiveName) {`
`186`	`189`	`return _createInlineEditor(hostEditor, directiveName, patterns.directive);`
`187`	`190`	`}`
`188`	`191`
`189`	`192`	`return null;`
`190`	`193`	`}`
`191`	`194`
`192`	`195`	`// init`
`193`		`- EditorManager.registerInlineEditProvider(provider);`
`194`		`-});`
	`196`	`+ EditorManager.registerInlineEditProvider(provider,10);`
	`197`	`+});`

`‎test.html`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ <h1>Kickass</h1>`
`31`	`31`
`32`	`32`	`<ul ng-controller="Testing">`
`33`	`33`	`<li my-directive></li>`
`34`		`-`
	`34`	`+ <my-directive></my-directive>`
`35`	`35`	`</ul>`
`36`	`36`	`</body>`
`37`	`37`	`</html>`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit d882abd

File tree

3 files changed

3 files changed

`‎NGUtils.js`

`‎main.js`

`‎test.html`

0 commit comments