jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small cleanup

Browse source
This commit is contained in:
nightwing 2013-07-31 17:54:44 +04:00
commit c80ae070f7
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/ace/ext/emmet.js
View file

@ -264,13 +264,14 @@ AceEmmetEditor.prototype = {
// by default, abbreviation parser generates all unlinked (un-mirrored) // by default, abbreviation parser generates all unlinked (un-mirrored)
// tabstops as ${0}, so we have upgrade all caret tabstops with unique // tabstops as ${0}, so we have upgrade all caret tabstops with unique
// positions but make sure that all other tabstops are not linked accidentally // positions but make sure that all other tabstops are not linked accidentally
// based on https://github.com/sergeche/emmet-sublime/blob/master/editor.js#L119-L171
$updateTabstops: function(value) { $updateTabstops: function(value) {
var base = 1000; var base = 1000;
var zeroBase = 0; var zeroBase = 0;
var lastZero = null; var lastZero = null;
var range = emmet.require('range'); var range = emmet.require('range');
var ts = emmet.require('tabStops'); var ts = emmet.require('tabStops');
var settings = emmet.require('resources').getVocabulary("user");
var tabstopOptions = { var tabstopOptions = {
tabstop: function(data) { tabstop: function(data) {
var group = parseInt(data.group, 10); var group = parseInt(data.group, 10);
@ -303,7 +304,7 @@ AceEmmetEditor.prototype = {
value = ts.processText(value, tabstopOptions); value = ts.processText(value, tabstopOptions);
if (/*sublimeGetOption('insert_final_tabstop', false)*/ false && !/\$\{0\}$/.test(value)) { if (settings.variables['insert_final_tabstop'] && !/\$\{0\}$/.test(value)) {
value += '${0}'; value += '${0}';
} else if (lastZero) { } else if (lastZero) {
value = emmet.require('utils').replaceSubstring(value, '${0}', lastZero); value = emmet.require('utils').replaceSubstring(value, '${0}', lastZero);