diff --git a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js index 70299753f..d19228864 100644 --- a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js +++ b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js @@ -338,6 +338,24 @@ this.editor.focus() } + // FIX EMMET HTML WHEN SYNTAX IS TWIG + // ================================== + + +function (exports) { + if (exports.ace && typeof exports.ace.require == 'function') { + var emmetExt = exports.ace.require('ace/ext/emmet') + + if (emmetExt && emmetExt.AceEmmetEditor && emmetExt.AceEmmetEditor.prototype.getSyntax) { + var coreGetSyntax = emmetExt.AceEmmetEditor.prototype.getSyntax + + emmetExt.AceEmmetEditor.prototype.getSyntax = function () { + var $syntax = $.proxy(coreGetSyntax, this)() + return $syntax == 'twig' ? 'html' : $syntax + }; + } + } + }(window) + // CODEEDITOR PLUGIN DEFINITION // ============================ diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-emmet.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-emmet.js index 5616386bf..1f463a7ac 100755 --- a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-emmet.js +++ b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-emmet.js @@ -16,7 +16,7 @@ var SnippetManager = function() { (function() { oop.implement(this, EventEmitter); - + this.getTokenizer = function() { function TabstopToken(str, _, stack) { str = str.substr(1); @@ -239,7 +239,7 @@ var SnippetManager = function() { var line = editor.session.getLine(cursor.row); var tabString = editor.session.getTabString(); var indentString = line.match(/^\s*/)[0]; - + if (cursor.column < indentString.length) indentString = indentString.slice(0, cursor.column); @@ -271,7 +271,7 @@ var SnippetManager = function() { return; var value = tokens.slice(i + 1, i1); - var isNested = value.some(function(t) {return typeof t === "object"}); + var isNested = value.some(function(t) {return typeof t === "object"}); if (isNested && !ts.value) { ts.value = value; } else if (value.length && (!ts.value || typeof ts.value !== "string")) { @@ -305,7 +305,7 @@ var SnippetManager = function() { expanding[id] = null; continue; } - + var ts = tabstops[id]; var arg = typeof ts.value == "string" ? [ts.value] : copyValue(ts.value); arg.unshift(i + 1, Math.max(0, i1 - i)); @@ -340,16 +340,16 @@ var SnippetManager = function() { var selectionId = editor.inVirtualSelectionMode && editor.selection.index; tabstopManager.addTabstops(tabstops, range.start, end, selectionId); }; - + this.insertSnippet = function(editor, snippetText) { var self = this; if (editor.inVirtualSelectionMode) return self.insertSnippetForSelection(editor, snippetText); - + editor.forEachSelection(function() { self.insertSnippetForSelection(editor, snippetText); }, null, {keepOrder: true}); - + if (editor.tabstopManager) editor.tabstopManager.tabNext(); }; @@ -358,7 +358,7 @@ var SnippetManager = function() { var scope = editor.session.$mode.$id || ""; scope = scope.split("/").pop(); if (scope === "html" || scope === "php") { - if (scope === "php" && !editor.session.$mode.inlinePhp) + if (scope === "php" && !editor.session.$mode.inlinePhp) scope = "html"; var c = editor.getCursorPosition(); var state = editor.session.getState(c.row); @@ -374,7 +374,7 @@ var SnippetManager = function() { scope = "php"; } } - + return scope; }; @@ -398,7 +398,7 @@ var SnippetManager = function() { editor.tabstopManager.tabNext(); return result; }; - + this.expandSnippetForSelection = function(editor, options) { var cursor = editor.getCursorPosition(); var line = editor.session.getLine(cursor.row); @@ -454,10 +454,10 @@ var SnippetManager = function() { var snippetMap = this.snippetMap; var snippetNameMap = this.snippetNameMap; var self = this; - - if (!snippets) + + if (!snippets) snippets = []; - + function wrapRegexp(src) { if (src && !/^\^?\(.*\)\$?$|^\\b$/.test(src)) src = "(?:" + src + ")"; @@ -514,7 +514,7 @@ var SnippetManager = function() { addSnippet(snippets); else if (Array.isArray(snippets)) snippets.forEach(addSnippet); - + this._signal("registerSnippets", {scope: scope}); }; this.unregister = function(snippets, scope) { @@ -731,9 +731,9 @@ var TabstopManager = function(editor) { ts = this.tabstops[this.index]; if (!ts || !ts.length) return; - + this.selectedTabstop = ts; - if (!this.editor.inVirtualSelectionMode) { + if (!this.editor.inVirtualSelectionMode) { var sel = this.editor.multiSelect; sel.toSingleRange(ts.firstNonLinked.clone()); for (var i = ts.length; i--;) { @@ -746,7 +746,7 @@ var TabstopManager = function(editor) { } else { this.editor.selection.setRange(ts.firstNonLinked); } - + this.editor.keyBinding.addKeyboardHandler(this.keyboardHandler); }; this.addTabstops = function(tabstops, start, end) { @@ -765,7 +765,7 @@ var TabstopManager = function(editor) { var ranges = this.ranges; tabstops.forEach(function(ts, index) { var dest = this.$openTabstops[index] || ts; - + for (var i = ts.length; i--;) { var p = ts[i]; var range = Range.fromPoints(p.start, p.end || p.start); @@ -792,7 +792,7 @@ var TabstopManager = function(editor) { } this.addTabstopMarkers(dest); }, this); - + if (arg.length > 2) { if (this.tabstops.length) arg.push(arg.splice(2, 1)[0]); @@ -860,7 +860,7 @@ changeTracker.setPosition = function(row, column) { }; changeTracker.update = function(pos, delta, $insertRight) { this.$insertRight = $insertRight; - this.pos = pos; + this.pos = pos; this.onChange(delta); }; @@ -961,15 +961,15 @@ AceEmmetEditor.prototype = { if (end == null) end = start == null ? this.getContent().length : start; if (start == null) - start = 0; - + start = 0; + var editor = this.ace; var doc = editor.session.doc; var range = Range.fromPoints(doc.indexToPosition(start), doc.indexToPosition(end)); editor.session.remove(range); - + range.end = range.start; - + value = this.$updateTabstops(value); snippetManager.insertSnippet(editor, value); }, @@ -1061,7 +1061,7 @@ AceEmmetEditor.prototype = { } else if (lastZero) { value = emmet.require('utils').replaceSubstring(value, '${0}', lastZero); } - + return value; } }; @@ -1101,23 +1101,23 @@ exports.runEmmetCommand = function(editor) { if (editorProxy.getSyntax() == "php") return false; var actions = emmet.require("actions"); - + if (this.action == "expand_abbreviation_with_tab") { if (!editor.selection.isEmpty()) return false; } - + if (this.action == "wrap_with_abbreviation") { return setTimeout(function() { actions.run("wrap_with_abbreviation", editorProxy); }, 0); } - + var pos = editor.selection.lead; var token = editor.session.getTokenAt(pos.row, pos.column); if (token && /\btag\b/.test(token.type)) return false; - + var result = actions.run(this.action, editorProxy); } catch(e) { editor._signal("changeStatus", typeof e == "string" ? e : e.message); @@ -1187,4 +1187,3 @@ exports.setCore = function(e) { (function() { ace.require(["ace/ext/emmet"], function() {}); })(); - \ No newline at end of file diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/emmet/emmet.js b/modules/backend/formwidgets/codeeditor/assets/vendor/emmet/emmet.js index e67ec59d7..89260e50c 100644 --- a/modules/backend/formwidgets/codeeditor/assets/vendor/emmet/emmet.js +++ b/modules/backend/formwidgets/codeeditor/assets/vendor/emmet/emmet.js @@ -614,11 +614,11 @@ var _ = (function() { // Retrieve the names of an object's properties. // Delegates to **ECMAScript 5**'s native `Object.keys` _.keys = nativeKeys || function(obj) { - if (obj !== Object(obj)) throw new TypeError('Invalid object'); - var keys = []; - for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key; - return keys; - }; + if (obj !== Object(obj)) throw new TypeError('Invalid object'); + var keys = []; + for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key; + return keys; + }; // Retrieve the values of an object's properties. _.values = function(obj) { @@ -788,8 +788,8 @@ var _ = (function() { // Is a given value an array? // Delegates to ECMA5's native Array.isArray _.isArray = nativeIsArray || function(obj) { - return toString.call(obj) == '[object Array]'; - }; + return toString.call(obj) == '[object Array]'; + }; // Is a given variable an object? _.isObject = function(obj) { @@ -975,8 +975,8 @@ var _ = (function() { if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n'; source = "var __p='';" + - "var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n" + - source + "return __p;\n"; + "var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n" + + source + "return __p;\n"; var render = new Function(settings.variable || 'obj', '_', source); if (data) return render(data, _); @@ -987,7 +987,7 @@ var _ = (function() { // Provide the compiled function source as a convenience for build time // precompilation. template.source = 'function(' + (settings.variable || 'obj') + '){\n' + - source + '}'; + source + '}'; return template; }; @@ -1144,7 +1144,7 @@ var emmet = (function(global) { var moduleLoader = null; /** - * Generic Emmet module loader (actually, it doesn’t load anything, just + * Generic Emmet module loader (actually, it doesn’t load anything, just * returns module reference). Not using `require` name to avoid conflicts * with Node.js and RequireJS */ @@ -1395,7 +1395,7 @@ emmet.define('abbreviationParser', function(require, _) { }, /** - * Removes current node from parent‘s child list + * Removes current node from parent‘s child list * @returns {AbbreviationNode} Current node itself */ remove: function() { @@ -1407,7 +1407,7 @@ emmet.define('abbreviationParser', function(require, _) { }, /** - * Replaces current node in parent‘s children list with passed nodes + * Replaces current node in parent‘s children list with passed nodes * @param {AbbreviationNode} node Replacement node or array of nodes */ replace: function() { @@ -1572,7 +1572,7 @@ emmet.define('abbreviationParser', function(require, _) { }, /** - * Returns index of current node in parent‘s children list + * Returns index of current node in parent‘s children list * @returns {Number} */ index: function() { @@ -1739,7 +1739,7 @@ emmet.define('abbreviationParser', function(require, _) { /** * Returns stripped string: a string without first and last character. - * Used for “unquoting” strings + * Used for “unquoting” strings * @param {String} str * @returns {String} */ @@ -2027,7 +2027,7 @@ emmet.define('abbreviationParser', function(require, _) { } /** - * “Un-rolls“ contents of current node: recursively replaces all repeating + * “Un-rolls“ contents of current node: recursively replaces all repeating * children with their repeated clones * @param {AbbreviationNode} node * @returns {AbbreviationNode} @@ -2110,7 +2110,7 @@ emmet.define('abbreviationParser', function(require, _) { var tree = parseAbbreviation(abbr); if (options.contextNode) { - // add info about context node – + // add info about context node – // a parent XHTML node in editor inside which abbreviation is // expanded tree._name = options.contextNode.name; @@ -2244,7 +2244,7 @@ emmet.exec(function(require, _) { if (_.isString(r)) { child.data('resource', elements.create('snippet', r)); } else if (elements.is(r, 'reference')) { - // it’s a reference to another abbreviation: + // it’s a reference to another abbreviation: // parse it and insert instead of current child /** @type AbbreviationNode */ var subtree = parser.parse(r.data, { @@ -2264,7 +2264,7 @@ emmet.exec(function(require, _) { }); } - // move child‘s children into the deepest child of new subtree + // move child‘s children into the deepest child of new subtree var deepestChild = subtree.deepestChild(); if (deepestChild) { _.each(child.children, function(c) { @@ -2301,7 +2301,7 @@ emmet.exec(function(require, _) { });/** * Pasted content abbreviation processor. A pasted content is a content that * should be inserted into implicitly repeated abbreviation nodes. - * This processor powers “Wrap With Abbreviation” action + * This processor powers “Wrap With Abbreviation” action * @param {Function} require * @param {Underscore} _ */ @@ -2357,7 +2357,7 @@ emmet.exec(function(require, _) { } /** - * Check if parsed node contains output placeholder – a target where + * Check if parsed node contains output placeholder – a target where * pasted content should be inserted * @param {AbbreviationNode} node * @returns {Boolean} @@ -4226,7 +4226,7 @@ emmet.define('handlerList', function(require, _) { * Adds function handler * @param {Function} fn Handler * @param {Object} options Handler options. Possible values are:

- * order : (Number) – order in handler list. Handlers + * order : (Number) – order in handler list. Handlers * with higher order value will be executed earlier. */ add: function(fn, options) { @@ -4527,8 +4527,8 @@ emmet.define('stringStream', function(require, _) { }, /** - * Act like a multi-character eat—if consume is true or - * not given—or a look-ahead that doesn't update the stream position—if + * Act like a multi-character eat—if consume is true or + * not given—or a look-ahead that doesn't update the stream position—if * it is false. pattern can be either a string or a * regular expression starting with ^. When it is a string, * caseInsensitive can be set to true to make the match @@ -4883,7 +4883,6 @@ emmet.define('resources', function(require, _) { sectionKey = section['extends']; } while (sectionKey && !_.include(memo, sectionKey)); - cache[cacheKey] = _.extend.apply(_, stack.reverse()); } @@ -4900,15 +4899,15 @@ emmet.define('actions', function(require, _, zc) { var actions = {}; /** - * “Humanizes” action name, makes it more readable for people + * “Humanizes” action name, makes it more readable for people * @param {String} name Action name (like 'expand_abbreviation') * @return Humanized name (like 'Expand Abbreviation') */ function humanizeActionName(name) { return require('utils').trim(name.charAt(0).toUpperCase() - + name.substring(1).replace(/_[a-z]/g, function(str) { - return ' ' + str.charAt(1).toUpperCase(); - })); + + name.substring(1).replace(/_[a-z]/g, function(str) { + return ' ' + str.charAt(1).toUpperCase(); + })); } return { @@ -4917,9 +4916,9 @@ emmet.define('actions', function(require, _, zc) { * @param {String} name Action name * @param {Function} fn Action function * @param {Object} options Custom action options:
- * label : (String) – Human-readable action name. + * label : (String) – Human-readable action name. * May contain '/' symbols as submenu separators
- * hidden : (Boolean) – Indicates whether action + * hidden : (Boolean) – Indicates whether action * should be displayed in menu (getMenu() method) * * @memberOf actions @@ -5575,7 +5574,7 @@ emmet.define('actionUtils', function(require, _) { }, /** - * Common syntax detection method for editors that doesn’t provide any + * Common syntax detection method for editors that doesn’t provide any * info about current syntax scope. * @param {IEmmetEditor} editor Current editor * @param {String} hint Any syntax hint that editor can provide @@ -5882,7 +5881,7 @@ emmet.define('base64', function(require, _) { });/** * HTML matcher: takes string and searches for HTML tag pairs for given position * - * Unlike “classic” matchers, it parses content from the specified + * Unlike “classic” matchers, it parses content from the specified * position, not from the start, so it may work even outside HTML documents * (for example, inside strings of programming languages like JavaScript, Python * etc.) @@ -6234,23 +6233,23 @@ emmet.define('tabStops', function(require, _) { * @param {String} text Text to process * @param {Object} options List of processor options:
* - * replaceCarets : Boolean — replace all default + * replaceCarets : Boolean — replace all default * caret placeholders (like {%::emmet-caret::%}) with ${0:caret}
* - * escape : Function — function that handle escaped + * escape : Function — function that handle escaped * characters (mostly '$'). By default, it returns the character itself * to be displayed as is in output, but sometimes you will use * extract method as intermediate solution for further * processing and want to keep character escaped. Thus, you should override * escape method to return escaped symbol (e.g. '\\$')
* - * tabstop : Function – a tabstop handler. Receives - * a single argument – an object describing token: its position, number + * tabstop : Function – a tabstop handler. Receives + * a single argument – an object describing token: its position, number * group, placeholder and token itself. Should return a replacement * string that will appear in final output * - * variable : Function – variable handler. Receives - * a single argument – an object describing token: its position, name + * variable : Function – variable handler. Receives + * a single argument – an object describing token: its position, name * and original token itself. Should return a replacement * string that will appear in final output * @@ -6439,7 +6438,7 @@ emmet.define('tabStops', function(require, _) { var placeholderMemo = {}; var res = require('resources'); return function(str, varName) { - // do not mark `child` variable as placeholder – it‘s a reserved + // do not mark `child` variable as placeholder – it‘s a reserved // variable name if (varName == 'child') return str; @@ -6938,13 +6937,13 @@ emmet.define('elements', function(require, _) { return result; });/** * Abstract implementation of edit tree interface. - * Edit tree is a named container of editable “name-value” child elements, + * Edit tree is a named container of editable “name-value” child elements, * parsed from source. This container provides convenient methods * for editing/adding/removing child elements. All these update actions are * instantly reflected in the source code with respect of formatting. *

* For example, developer can create an edit tree from CSS rule and add or - * remove properties from it–all changes will be immediately reflected in the + * remove properties from it–all changes will be immediately reflected in the * original source. *

* All classes defined in this module should be extended the same way as in @@ -7114,7 +7113,7 @@ emmet.define('editTree', function(require, _, core) { return element.value(value); if (!_.isUndefined(value)) { - // no such element — create it + // no such element — create it return this.add(name, value, pos); } }, @@ -7479,7 +7478,7 @@ emmet.define('cssEditTree', function(require, _) { if (token.type == '}' || token.type == ';') { // found value end trimWhitespaceTokens(tokens, WHITESPACE_REMOVE_FROM_START - | (token.type == '}' ? WHITESPACE_REMOVE_FROM_END : 0)); + | (token.type == '}' ? WHITESPACE_REMOVE_FROM_END : 0)); if (tokens.length) { start = tokens[0].start; @@ -7634,7 +7633,7 @@ emmet.define('cssEditTree', function(require, _) { // characters between rules may lead to undesired behavior, // especially when current rule is duplicated or used as a donor // to create new rule. - // To solve this issue, we‘ll take only last newline indentation + // To solve this issue, we‘ll take only last newline indentation var lines = utils.splitByLines(p.styleBefore); if (lines.length > 1) { p.styleBefore = '\n' + _.last(lines); @@ -7982,7 +7981,7 @@ emmet.define('xmlEditTree', function(require, _) { var attribute = new XMLEditElement(this, editTree.createToken(start + styles.styleBefore.length, name), editTree.createToken(start + styles.styleBefore.length + name.length - + styles.styleSeparator.length, value) + + styles.styleSeparator.length, value) ); _.extend(attribute, styles); @@ -8350,7 +8349,7 @@ emmet.define('wrapWithAbbreviation', function(require, _) { });/** * Toggles HTML and CSS comments depending on current caret context. Unlike * the same action in most editors, this action toggles comment on currently - * matched item—HTML tag or CSS selector—when nothing is selected. + * matched item—HTML tag or CSS selector—when nothing is selected. * * @param {Function} require * @param {Underscore} _ @@ -8424,7 +8423,7 @@ emmet.exec(function(require, _) { return _.find(rule.list(), function(item) { if (item.range().end === relPos) { // at the end of property, but outside of it - // if there’s a space character at current position, + // if there’s a space character at current position, // use current property return reSafeChar.test(rule.source.charAt(relPos)); } @@ -8514,9 +8513,9 @@ emmet.exec(function(require, _) { // should add comment // make sure that there's no comment inside selection newContent = commentStart + ' ' + - range.substring(content) - .replace(new RegExp(utils.escapeForRegexp(commentStart) + '\\s*|\\s*' + utils.escapeForRegexp(commentEnd), 'g'), '') + - ' ' + commentEnd; + range.substring(content) + .replace(new RegExp(utils.escapeForRegexp(commentStart) + '\\s*|\\s*' + utils.escapeForRegexp(commentEnd), 'g'), '') + + ' ' + commentEnd; // adjust caret position caretPos += commentStart.length + 1; @@ -8569,7 +8568,7 @@ emmet.exec(function(require, _) { /** * Search for new caret insertion point * @param {IEmmetEditor} editor Editor instance - * @param {Number} inc Search increment: -1 — search left, 1 — search right + * @param {Number} inc Search increment: -1 — search left, 1 — search right * @param {Number} offset Initial offset relative to current caret position * @return {Number} Returns -1 if insertion point wasn't found */ @@ -8949,9 +8948,9 @@ emmet.exec(function(require, _) { // locate parts of complex values. // some examples: - // – 1px solid red: 3 parts - // – arial, sans-serif: enumeration, 2 parts - // – url(image.png): function value part + // – 1px solid red: 3 parts + // – arial, sans-serif: enumeration, 2 parts + // – url(image.png): function value part var value = property.value(); _.each(property.valueParts(), function(r) { // add absolute range @@ -9277,8 +9276,8 @@ emmet.exec(function(require, _) { }); /** * Splits or joins tag, e.g. transforms it into a short notation and vice versa:
- * <div></div> → <div /> : join
- * <div /> → <div></div> : split + * <div></div> → <div /> : join
+ * <div /> → <div></div> : split * @param {Function} require * @param {Underscore} _ * @memberOf __splitJoinTagAction @@ -9435,7 +9434,7 @@ emmet.define('reflectCSSValue', function(require, _) { * Returns value that should be reflected for refName CSS property * from curName property. This function is used for special cases, * when the same result must be achieved with different properties for different - * browsers. For example: opĐ°city:0.5; → filter:alpha(opacity=50);

+ * browsers. For example: opаcity:0.5; → filter:alpha(opacity=50);

* * This function does value conversion between different CSS properties * @@ -9629,10 +9628,10 @@ emmet.exec(function(require, _) { prefs.define('css.closeBraceIndentation', '\n', 'Indentation before closing brace of CSS rule. Some users prefere ' + 'indented closing brace of CSS rule for better readability. ' - + 'This preference’s value will be automatically inserted before ' + + 'This preference’s value will be automatically inserted before ' + 'closing brace when user adds newline in newly created CSS rule ' - + '(e.g. when “Insert formatted linebreak” action will be performed ' - + 'in CSS file). If you’re such user, you may want to write put a value ' + + '(e.g. when “Insert formatted linebreak” action will be performed ' + + 'in CSS file). If you’re such user, you may want to write put a value ' + 'like \\n\\t in this preference.'); /** @@ -9872,7 +9871,7 @@ emmet.exec(function(require, _) { } b64 = 'data:' + (actionUtils.mimeTypes[String(file.getExt(realImgPath))] || defaultMimeType) + - ';base64,' + b64; + ';base64,' + b64; editor.replaceContent('$0' + b64, pos, pos + imgPath.length); }); @@ -10002,7 +10001,7 @@ emmet.exec(function(require, _) { } require('actions').add('update_image_size', function(editor) { - // this action will definitely won’t work in SASS dialect, + // this action will definitely won’t work in SASS dialect, // but may work in SCSS or LESS if (_.include(['css', 'less', 'scss'], String(editor.getSyntax()))) { updateImageSizeCSS(editor); @@ -10134,23 +10133,23 @@ emmet.define('cssResolver', function(require, _) { 'Automatically generate vendor-prefixed copies of expanded CSS ' + 'property. By default, Emmet will generate vendor-prefixed ' + 'properties only when you put dash before abbreviation ' - + '(e.g. -bxsh). With this option enabled, you don’t ' + + '(e.g. -bxsh). With this option enabled, you don’t ' + 'need dashes before abbreviations: Emmet will produce ' + 'vendor-prefixed properties for you.'); var descTemplate = _.template('A comma-separated list of CSS properties that may have ' - + '<%= vendor %> vendor prefix. This list is used to generate ' - + 'a list of prefixed properties when expanding -property ' - + 'abbreviations. Empty list means that all possible CSS values may ' - + 'have <%= vendor %> prefix.'); + + '<%= vendor %> vendor prefix. This list is used to generate ' + + 'a list of prefixed properties when expanding -property ' + + 'abbreviations. Empty list means that all possible CSS values may ' + + 'have <%= vendor %> prefix.'); var descAddonTemplate = _.template('A comma-separated list of additional CSS properties ' - + 'for css.<%= vendor %>Preperties preference. ' - + 'You should use this list if you want to add or remove a few CSS ' - + 'properties to original set. To add a new property, simply write its name, ' - + 'to remove it, precede property with hyphen.
' - + 'For example, to add foo property and remove border-radius one, ' - + 'the preference value will look like this: foo, -border-radius.'); + + 'for css.<%= vendor %>Preperties preference. ' + + 'You should use this list if you want to add or remove a few CSS ' + + 'properties to original set. To add a new property, simply write its name, ' + + 'to remove it, precede property with hyphen.
' + + 'For example, to add foo property and remove border-radius one, ' + + 'the preference value will look like this: foo, -border-radius.'); // properties list is created from cssFeatures.html file var props = { @@ -10166,7 +10165,7 @@ emmet.define('cssResolver', function(require, _) { }); prefs.define('css.unitlessProperties', 'z-index, line-height, opacity, font-weight, zoom', - 'The list of properties whose values ​​must not contain units.'); + 'The list of properties whose values ​​must not contain units.'); prefs.define('css.intUnit', 'px', 'Default unit for integer values'); prefs.define('css.floatUnit', 'em', 'Default unit for float values'); @@ -10391,8 +10390,8 @@ emmet.define('cssResolver', function(require, _) { function formatProperty(property, syntax) { var ix = property.indexOf(':'); property = property.substring(0, ix).replace(/\s+$/, '') - + getSyntaxPreference('valueSeparator', syntax) - + require('utils').trim(property.substring(ix + 1)); + + getSyntaxPreference('valueSeparator', syntax) + + require('utils').trim(property.substring(ix + 1)); return property.replace(/\s*;\s*$/, getSyntaxPreference('propertyEnd', syntax)); } @@ -10776,7 +10775,7 @@ emmet.define('cssResolver', function(require, _) { } if (!snippet && prefs.get('css.fuzzySearch')) { - // let’s try fuzzy search + // let’s try fuzzy search snippet = resources.fuzzyFindSnippet(syntax, abbrData.property, parseFloat(prefs.get('css.fuzzySearchMinScore'))); } @@ -10794,8 +10793,8 @@ emmet.define('cssResolver', function(require, _) { var result = []; if (!value && abbrData.values) { value = _.map(abbrData.values, function(val) { - return this.normalizeValue(val, snippetObj.name); - }, this).join(' ') + ';'; + return this.normalizeValue(val, snippetObj.name); + }, this).join(' ') + ';'; } snippetObj.value = value || snippetObj.value; @@ -11085,7 +11084,7 @@ emmet.define('cssGradient', function(require, _) { direction = textualDirection(direction); if(reDeg.test(direction)) - throw "The direction is an angle that can’t be converted."; + throw "The direction is an angle that can’t be converted."; var v = function(pos) { return ~direction.indexOf(pos) ? '100%' : '0'; @@ -11330,7 +11329,7 @@ emmet.define('cssGradient', function(require, _) { cssProp = cssRule.itemFromPosition(pos, true); if (!cssProp) { // in case user just started writing CSS property - // and didn't include semicolon–try another approach + // and didn't include semicolon–try another approach cssProp = _.find(cssRule.list(), function(elem) { return elem.range(true).end == pos; }); @@ -11672,7 +11671,7 @@ emmet.define('tagName', function(require, _) { }, /** - * Adds new parent–child mapping + * Adds new parent–child mapping * @param {String} parent * @param {String} child */ @@ -11735,11 +11734,11 @@ emmet.define('tagName', function(require, _) { */ emmet.exec(function(require, _) { var prefs = require('preferences'); - prefs.define('bem.elementSeparator', '__', 'Class name’s element separator.'); - prefs.define('bem.modifierSeparator', '_', 'Class name’s modifier separator.'); + prefs.define('bem.elementSeparator', '__', 'Class name’s element separator.'); + prefs.define('bem.modifierSeparator', '_', 'Class name’s modifier separator.'); prefs.define('bem.shortElementPrefix', '-', - 'Symbol for describing short “block-element” notation. Class names ' - + 'prefixed with this symbol will be treated as element name for parent‘s ' + 'Symbol for describing short “block-element” notation. Class names ' + + 'prefixed with this symbol will be treated as element name for parent‘s ' + 'block name. Each symbol instance traverses one level up in parsed ' + 'tree for block name lookup. Empty value will disable short notation.'); @@ -11778,8 +11777,8 @@ emmet.exec(function(require, _) { if (!item.__bem.block) { reBlockName = /^[a-z]/i; item.__bem.block = _.find(classNames, function(name) { - return reBlockName.test(name); - }) || ''; + return reBlockName.test(name); + }) || ''; } classNames = _.chain(classNames) @@ -11937,16 +11936,16 @@ emmet.exec(function(require, _) { * It does several things:
* * @@ -12003,16 +12002,16 @@ emmet.exec(function(require, _) { + 'the following properties and functions are availabe:\n' + ''); @@ -12223,7 +12222,7 @@ emmet.exec(function(require, _){ function processSnippet(item, profile, level) { item.start = item.end = ''; if (!isVeryFirstChild(item) && profile.tag_nl !== false && shouldAddLineBreak(item, profile)) { - // check if we’re not inside inline element + // check if we’re not inside inline element if (isRoot(item.parent) || !require('abbreviationUtils').isInline(item.parent)) { item.start = require('utils').getNewline() + item.start; } @@ -12658,11 +12657,11 @@ emmet.exec(function(require, _) { * https://code.djangoproject.com/browser/django/trunk/django/contrib/webdesign/lorem_ipsum.py *

* Examples to test:
- * lipsum – generates 30 words text.
- * lipsum*6 – generates 6 paragraphs (autowrapped with <p> element) of text.
- * ol>lipsum10*5 — generates ordered list with 5 list items (autowrapped with <li> tag) + * lipsum – generates 30 words text.
+ * lipsum*6 – generates 6 paragraphs (autowrapped with <p> element) of text.
+ * ol>lipsum10*5 — generates ordered list with 5 list items (autowrapped with <li> tag) * with text of 10 words on each line
- * span*3>lipsum20 – generates 3 paragraphs of 20-words text, each wrapped with <span> element . + * span*3>lipsum20 – generates 3 paragraphs of 20-words text, each wrapped with <span> element . * Each paragraph phrase is unique * @param {Function} require * @param {Underscore} _ @@ -12704,33 +12703,33 @@ emmet.define('lorem', function(require, _) { 'maxime', 'corrupti'] }, ru: { - common: ['даНокО-даНокО', 'Са', 'словесными', 'горами', 'в стране', 'гласных', 'и согласных', 'живут', 'рыбные', 'тексты'], - words: ['вдаНи', 'от всех', 'Они', 'буквенных', 'домах', 'на берегу', 'семантика', - 'большого', 'языкового', 'Окоана', 'маленький', 'ручеек', 'даль', - 'журчит', 'пО всоК', 'обеспечивает', 'оо','всоПи', 'необходимыми', - 'правилами', 'эта', 'парадигматическая', 'страна', 'которой', 'жаренные', - 'предложения', 'залетают', 'прямо', 'рот', 'даМо', 'всемогущая', - 'пунктуация', 'но', 'имеет', 'власти', 'над', 'рыбными', 'текстами', - 'ведущими', 'безорфографичный', 'образ', 'МиСни', 'однажды', 'Одна', - 'маленькая', 'строчка','рыбного', 'текста', 'иПони', 'lorem', 'ipsum', - 'решила', 'выйти', 'большой', 'мир', 'грамматики', 'воНикиК', 'ОксПОкс', - 'предупреждал', 'Đž', 'злых', 'запятых', 'диких', 'знаках', 'вопроса', - 'коварных', 'точках', 'запятой', 'нО', 'текст', 'Đ´Đ°Đť', 'сбить', - 'себя', 'толку', 'Он', 'собрал', 'семь', 'своих', 'заглавных', 'йукв', - 'подпоясал', 'инициал', 'Са', 'пояс', 'пустился', 'дорогу', - 'взобравшись', 'первую', 'вершину', 'курсивных', 'гор', 'бросил', - 'пОсНодниК', 'взгляд', 'наСад', 'силуэт', 'свОогО', 'родного', 'города', - 'буквоград', 'СагОНОвОк', 'деревни', 'алфавит', 'пОдСагОНОвОк', 'свОогО', - 'переулка', 'грустный', 'реторический', 'вопрос', 'скатился', 'огО', - 'щеке', 'продолжил', 'свОК', 'путь', 'дороге', 'встретил', 'рукопись', - 'Она', 'предупредила', 'ПОоК', 'всо', 'переписывается', 'несколько', - 'раз', 'единственное', 'что', 'меня', 'осталось', 'это', 'приставка', - 'возвращайся', 'ты', 'лучше', 'свою', 'безопасную', 'страну', 'послушавшись', - 'рукописи', 'наш', 'продолжил', 'свОК', 'путь', 'вскоре', 'оПу', - 'повстречался', 'коварный', 'составитель', 'рекламных', 'текстов', - 'напОившиК', 'языком', 'речью', 'СаПанившиК', 'свОо', 'агенство', - 'которое', 'использовало', 'снОва', 'снОва', 'своих', 'проектах', - 'осНи', 'переписали', 'то', 'живет', 'там', 'Đ´Đž', 'сих', 'пор'] + common: ['далеко-далеко', 'за', 'словесными', 'горами', 'в стране', 'гласных', 'и согласных', 'живут', 'рыбные', 'тексты'], + words: ['вдали', 'от всех', 'они', 'буквенных', 'домах', 'на берегу', 'семантика', + 'большого', 'языкового', 'океана', 'маленький', 'ручеек', 'даль', + 'журчит', 'по всей', 'обеспечивает', 'ее','всеми', 'необходимыми', + 'правилами', 'эта', 'парадигматическая', 'страна', 'которой', 'жаренные', + 'предложения', 'залетают', 'прямо', 'рот', 'даже', 'всемогущая', + 'пунктуация', 'не', 'имеет', 'власти', 'над', 'рыбными', 'текстами', + 'ведущими', 'безорфографичный', 'образ', 'жизни', 'однажды', 'одна', + 'маленькая', 'строчка','рыбного', 'текста', 'имени', 'lorem', 'ipsum', + 'решила', 'выйти', 'большой', 'мир', 'грамматики', 'великий', 'оксмокс', + 'предупреждал', 'о', 'злых', 'запятых', 'диких', 'знаках', 'вопроса', + 'коварных', 'точках', 'запятой', 'но', 'текст', 'дал', 'сбить', + 'себя', 'толку', 'он', 'собрал', 'семь', 'своих', 'заглавных', 'букв', + 'подпоясал', 'инициал', 'за', 'пояс', 'пустился', 'дорогу', + 'взобравшись', 'первую', 'вершину', 'курсивных', 'гор', 'бросил', + 'последний', 'взгляд', 'назад', 'силуэт', 'своего', 'родного', 'города', + 'буквоград', 'заголовок', 'деревни', 'алфавит', 'подзаголовок', 'своего', + 'переулка', 'грустный', 'реторический', 'вопрос', 'скатился', 'его', + 'щеке', 'продолжил', 'свой', 'путь', 'дороге', 'встретил', 'рукопись', + 'она', 'предупредила', 'моей', 'все', 'переписывается', 'несколько', + 'раз', 'единственное', 'что', 'меня', 'осталось', 'это', 'приставка', + 'возвращайся', 'ты', 'лучше', 'свою', 'безопасную', 'страну', 'послушавшись', + 'рукописи', 'наш', 'продолжил', 'свой', 'путь', 'вскоре', 'ему', + 'повстречался', 'коварный', 'составитель', 'рекламных', 'текстов', + 'напоивший', 'языком', 'речью', 'заманивший', 'свое', 'агенство', + 'которое', 'использовало', 'снова', 'снова', 'своих', 'проектах', + 'если', 'переписали', 'то', 'живет', 'там', 'до', 'сих', 'пор'] } };