|
@@ -9,13 +9,11 @@ define [
|
|
|
"ide/editor/directives/aceEditor/highlights/HighlightsManager"
|
|
"ide/editor/directives/aceEditor/highlights/HighlightsManager"
|
|
|
"ide/editor/directives/aceEditor/cursor-position/CursorPositionManager"
|
|
"ide/editor/directives/aceEditor/cursor-position/CursorPositionManager"
|
|
|
"ide/editor/directives/aceEditor/track-changes/TrackChangesManager"
|
|
"ide/editor/directives/aceEditor/track-changes/TrackChangesManager"
|
|
|
- # "ide/editor/directives/aceEditor/labels/LabelsManager"
|
|
|
|
|
- "ide/editor/directives/aceEditor/metadata/MetadataManager"
|
|
|
|
|
- # "ide/labels/services/labels"
|
|
|
|
|
- "ide/metadata/services/metadata"
|
|
|
|
|
|
|
+ "ide/editor/directives/aceEditor/labels/LabelsManager"
|
|
|
|
|
+ "ide/labels/services/labels"
|
|
|
"ide/graphics/services/graphics"
|
|
"ide/graphics/services/graphics"
|
|
|
"ide/preamble/services/preamble"
|
|
"ide/preamble/services/preamble"
|
|
|
-], (App, Ace, SearchBox, ModeList, UndoManager, AutoCompleteManager, SpellCheckManager, HighlightsManager, CursorPositionManager, TrackChangesManager, MetadataManager) ->
|
|
|
|
|
|
|
+], (App, Ace, SearchBox, ModeList, UndoManager, AutoCompleteManager, SpellCheckManager, HighlightsManager, CursorPositionManager, TrackChangesManager, LabelsManager) ->
|
|
|
EditSession = ace.require('ace/edit_session').EditSession
|
|
EditSession = ace.require('ace/edit_session').EditSession
|
|
|
ModeList = ace.require('ace/ext/modelist')
|
|
ModeList = ace.require('ace/ext/modelist')
|
|
|
|
|
|
|
@@ -37,7 +35,9 @@ define [
|
|
|
url = ace.config._moduleUrl(args...) + "?fingerprint=#{window.aceFingerprint}"
|
|
url = ace.config._moduleUrl(args...) + "?fingerprint=#{window.aceFingerprint}"
|
|
|
return url
|
|
return url
|
|
|
|
|
|
|
|
- App.directive "aceEditor", ($timeout, $compile, $rootScope, event_tracking, localStorage, $cacheFactory, metadata, graphics, preamble) ->
|
|
|
|
|
|
|
+ # console.log 'making it to right before aceEditor'
|
|
|
|
|
+
|
|
|
|
|
+ App.directive "aceEditor", ($timeout, $compile, $rootScope, event_tracking, localStorage, $cacheFactory, labels, graphics, preamble) ->
|
|
|
monkeyPatchSearch($rootScope, $compile)
|
|
monkeyPatchSearch($rootScope, $compile)
|
|
|
|
|
|
|
|
return {
|
|
return {
|
|
@@ -104,9 +104,8 @@ define [
|
|
|
highlightsManager = new HighlightsManager(scope, editor, element)
|
|
highlightsManager = new HighlightsManager(scope, editor, element)
|
|
|
cursorPositionManager = new CursorPositionManager(scope, editor, element, localStorage)
|
|
cursorPositionManager = new CursorPositionManager(scope, editor, element, localStorage)
|
|
|
trackChangesManager = new TrackChangesManager(scope, editor, element)
|
|
trackChangesManager = new TrackChangesManager(scope, editor, element)
|
|
|
- metadataManager = new metadataManager(scope, editor, element, metadata)
|
|
|
|
|
- # labelsManager = new LabelsManager(scope, editor, element, labels)
|
|
|
|
|
- autoCompleteManager = new AutoCompleteManager(scope, editor, element, metadataManager, graphics, preamble)
|
|
|
|
|
|
|
+ labelsManager = new LabelsManager(scope, editor, element, labels)
|
|
|
|
|
+ autoCompleteManager = new AutoCompleteManager(scope, editor, element, labelsManager, graphics, preamble)
|
|
|
|
|
|
|
|
|
|
|
|
|
# Prevert Ctrl|Cmd-S from triggering save dialog
|
|
# Prevert Ctrl|Cmd-S from triggering save dialog
|