Spring/spring-flo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to scope functions rather than service names

Browse Source
This commit is contained in:
BoykoAlex
2016-09-12 15:57:51 -04:00
parent 21ff8d8972
commit f1d37eb7cd
3 changed files with 56 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
dist/spring-flo.js vendored
View File

@@ -28764,22 +28764,17 @@ define('directives/graph-editor',['controllers/graph-editor'],function () {
* See the License for the specific language governing permissions and
* limitations under the License.
*/
define('directives/generic-dsl-editor',['angular','underscore','codemirror','codemirror/addon/lint/lint','codemirror/addon/hint/show-hint','codemirror/addon/display/placeholder'],function () {
define('directives/generic-dsl-editor',['underscore','codemirror','codemirror/addon/lint/lint','codemirror/addon/hint/show-hint','codemirror/addon/display/placeholder'],function () {
var angular = require('angular');
var _ = require('underscore');
return ['$injector', function($injector) {
return [ function() {
var CodeMirror = require('codemirror');
var doc;
var contentAssistService;
var lintService;
var debounce;
require('codemirror/addon/lint/lint');
@@ -28789,43 +28784,42 @@ define('directives/generic-dsl-editor',['angular','underscore','codemirror','cod
return {
restrict: 'A',
scope: {
dsl: '='
dsl: '=',
hint: '=',
lint: '='
},
link: function (scope, element, attrs) {
if (attrs.contentAssistServiceName) {
contentAssistService = $injector.get(attrs.contentAssistServiceName);
}
if (attrs.lintServiceName) {
lintService = $injector.get(attrs.lintServiceName);
}
if (attrs.debounce) {
debounce = parseInt(attrs.debounce);
}
doc = CodeMirror.fromTextArea(element.context, {
var options = {
value: scope.dsl,
gutters: ['CodeMirror-lint-markers'],
lint: lintService && angular.isFunction(lintService.getAnnotations) ? {
async: true,
getAnnotations: lintService.getAnnotations
} : undefined,
extraKeys: {'Ctrl-Space': 'autocomplete'},
hintOptions: {
async: 'true',
hint: contentAssistService && angular.isFunction(contentAssistService.complete) ? contentAssistService.complete : undefined
},
lineNumbers: attrs.lineNumbers && attrs.lineNumbers.toLowerCase() === 'true',
lineWrapping: attrs.lineWrapping && attrs.lineWrapping.toLowerCase() === 'true'
});
};
if (scope.lint) {
options.lint = scope.lint;
}
if (scope.hint) {
options.hintOptions = scope.hint;
}
doc = CodeMirror.fromTextArea(element.context, options);
var dslChangedHandler = function () {
scope.$apply(function() {
scope.dsl = doc.getValue();
});
};
doc.on('change', debounce ? _.debounce(dslChangedHandler, debounce) : dslChangedHandler);
scope.$watch('dsl', function (newValue) {
if (newValue!==doc.getValue()) {
var cursorPosition = doc.getCursor();
@@ -28833,6 +28827,14 @@ define('directives/generic-dsl-editor',['angular','underscore','codemirror','cod
doc.setCursor(cursorPosition);
}
});
scope.$watch('hint', function(newValue) {
doc.setOption('hintOptions', newValue);
});
scope.$watch('lint', function(newValue) {
doc.setOption('lint', newValue);
});
}
};
}];

2
dist/spring-flo.min.js vendored
View File

File diff suppressed because one or more lines are too long

52
src/directives/generic-dsl-editor.js
View File

@@ -16,19 +16,14 @@
define(function () {
'use strict';
var angular = require('angular');
var _ = require('underscore');
return ['$injector', function($injector) {
return [ function() {
var CodeMirror = require('codemirror');
var doc;
var contentAssistService;
var lintService;
var debounce;
require('codemirror/addon/lint/lint');
@@ -38,43 +33,42 @@ define(function () {
return {
restrict: 'A',
scope: {
dsl: '='
dsl: '=',
hint: '=',
lint: '='
},
link: function (scope, element, attrs) {
if (attrs.contentAssistServiceName) {
contentAssistService = $injector.get(attrs.contentAssistServiceName);
}
if (attrs.lintServiceName) {
lintService = $injector.get(attrs.lintServiceName);
}
if (attrs.debounce) {
debounce = parseInt(attrs.debounce);
}
doc = CodeMirror.fromTextArea(element.context, {
var options = {
value: scope.dsl,
gutters: ['CodeMirror-lint-markers'],
lint: lintService && angular.isFunction(lintService.getAnnotations) ? {
async: true,
getAnnotations: lintService.getAnnotations
} : undefined,
extraKeys: {'Ctrl-Space': 'autocomplete'},
hintOptions: {
async: 'true',
hint: contentAssistService && angular.isFunction(contentAssistService.complete) ? contentAssistService.complete : undefined
},
lineNumbers: attrs.lineNumbers && attrs.lineNumbers.toLowerCase() === 'true',
lineWrapping: attrs.lineWrapping && attrs.lineWrapping.toLowerCase() === 'true'
});
};
if (scope.lint) {
options.lint = scope.lint;
}
if (scope.hint) {
options.hintOptions = scope.hint;
}
doc = CodeMirror.fromTextArea(element.context, options);
var dslChangedHandler = function () {
scope.$apply(function() {
scope.dsl = doc.getValue();
});
};
doc.on('change', debounce ? _.debounce(dslChangedHandler, debounce) : dslChangedHandler);
scope.$watch('dsl', function (newValue) {
if (newValue!==doc.getValue()) {
var cursorPosition = doc.getCursor();
@@ -82,6 +76,14 @@ define(function () {
doc.setCursor(cursorPosition);
}
});
scope.$watch('hint', function(newValue) {
doc.setOption('hintOptions', newValue);
});
scope.$watch('lint', function(newValue) {
doc.setOption('lint', newValue);
});
}
};
}];