From aca80b09c07eaf7b8e24ed175e73e51a57ec564d Mon Sep 17 00:00:00 2001 From: mafoo Date: Fri, 11 Mar 2016 13:29:29 +0000 Subject: [PATCH] WhitespaceClean-resources/edit_area whitespace pass over files for reference regex that was used s/[ \t]+(\r?\n)/\1/ --- .../edit_area/plugins/charmap/charmap.js | 52 ++++++------ .../edit_area/plugins/charmap/css/charmap.css | 4 +- .../edit_area/plugins/charmap/jscripts/map.js | 10 +-- resources/edit_area/plugins/test/test.js | 36 ++++---- resources/edit_area/reg_syntax/coldfusion.js | 84 +++++++++---------- resources/edit_area/reg_syntax/css.js | 4 +- resources/edit_area/reg_syntax/html.js | 4 +- resources/edit_area/reg_syntax/js.js | 36 ++++---- resources/edit_area/reg_syntax/php.js | 20 ++--- resources/edit_area/reg_syntax/python.js | 24 +++--- resources/edit_area/reg_syntax/robotstxt.js | 2 +- resources/edit_area/reg_syntax/ruby.js | 16 ++-- resources/edit_area/reg_syntax/sql.js | 6 +- resources/edit_area/reg_syntax/tsql.js | 10 +-- resources/edit_area/reg_syntax/xml.js | 4 +- 15 files changed, 156 insertions(+), 156 deletions(-) diff --git a/resources/edit_area/plugins/charmap/charmap.js b/resources/edit_area/plugins/charmap/charmap.js index 631e92ed3e..83822e3144 100644 --- a/resources/edit_area/plugins/charmap/charmap.js +++ b/resources/edit_area/plugins/charmap/charmap.js @@ -2,39 +2,39 @@ * Charmap plugin * by Christophe Dolivet * v0.1 (2006/09/22) - * - * + * + * * This plugin allow to use a visual keyboard allowing to insert any UTF-8 characters in the text. - * + * * - plugin name to add to the plugin list: "charmap" - * - plugin name to add to the toolbar list: "charmap" - * - possible parameters to add to EditAreaLoader.init(): + * - plugin name to add to the toolbar list: "charmap" + * - possible parameters to add to EditAreaLoader.init(): * "charmap_default": (String) define the name of the default character range displayed on popup display * (default: "arrows") - * - * + * + * */ - + var EditArea_charmap= { /** * Get called once this file is loaded (editArea still not initialized) * - * @return nothing - */ - init: function(){ + * @return nothing + */ + init: function(){ this.default_language="Arrows"; } - + /** * Returns the HTML code for a specific control string or false if this plugin doesn't have that control. * A control can be a button, select list or any other HTML item to present in the EditArea user interface. * Language variables such as {$lang_somekey} will also be replaced with contents from * the language packs. - * - * @param {string} ctrl_name: the name of the control to add + * + * @param {string} ctrl_name: the name of the control to add * @return HTML code for a specific control or false. * @type string or boolean - */ + */ ,get_control_html: function(ctrl_name){ switch(ctrl_name){ case "charmap": @@ -45,32 +45,32 @@ var EditArea_charmap= { } /** * Get called once EditArea is fully loaded and initialised - * + * * @return nothing - */ - ,onload: function(){ + */ + ,onload: function(){ if(editArea.settings["charmap_default"] && editArea.settings["charmap_default"].length>0) this.default_language= editArea.settings["charmap_default"]; } - + /** * Is called each time the user touch a keyboard key. - * + * * @param (event) e: the keydown event * @return true - pass to next handler in chain, false - stop chain execution - * @type boolean + * @type boolean */ ,onkeydown: function(e){ - + } - + /** * Executes a specific command, this function handles plugin commands. * * @param {string} cmd: the name of the command being executed - * @param {unknown} param: the parameter of the command + * @param {unknown} param: the parameter of the command * @return true - pass to next handler in chain, false - stop chain execution - * @type boolean + * @type boolean */ ,execCommand: function(cmd, param){ // Handle commands @@ -83,7 +83,7 @@ var EditArea_charmap= { // Pass to next handler in chain return true; } - + }; // Adds the plugin class to the list of available EditArea plugins diff --git a/resources/edit_area/plugins/charmap/css/charmap.css b/resources/edit_area/plugins/charmap/css/charmap.css index c447509184..e20f521244 100644 --- a/resources/edit_area/plugins/charmap/css/charmap.css +++ b/resources/edit_area/plugins/charmap/css/charmap.css @@ -1,5 +1,5 @@ body{ - background-color: #F0F0EE; + background-color: #F0F0EE; font: 12px monospace, sans-serif; } @@ -50,7 +50,7 @@ a.char:hover{ padding: 2px 5px; height: 35px; line-height: 35px; - text-align:center; + text-align:center; background-color: #CCCCCC; font-size: 2em; float: right; diff --git a/resources/edit_area/plugins/charmap/jscripts/map.js b/resources/edit_area/plugins/charmap/jscripts/map.js index e6008473f8..52e8759518 100644 --- a/resources/edit_area/plugins/charmap/jscripts/map.js +++ b/resources/edit_area/plugins/charmap/jscripts/map.js @@ -2,9 +2,9 @@ var editArea; /** - * UTF-8 list taken from http://www.utf8-chartable.de/unicode-utf8-table.pl?utf8=dec - */ - + * UTF-8 list taken from http://www.utf8-chartable.de/unicode-utf8-table.pl?utf8=dec + */ + /* var char_range_list={ @@ -324,10 +324,10 @@ function map_load(){ document.title= editArea.get_translation(document.title, "template"); document.body.innerHTML= editArea.get_translation(document.body.innerHTML, "template"); //document.title= editArea.get_translation(document.getElementBytitle, "template"); - + var selected_lang=opener.EditArea_charmap.default_language.toLowerCase(); var selected=0; - + var select= document.getElementById("select_range") for(var i in char_range_list){ if(i.toLowerCase()==selected_lang) diff --git a/resources/edit_area/plugins/test/test.js b/resources/edit_area/plugins/test/test.js index 43626e4ae1..4aa9759b70 100644 --- a/resources/edit_area/plugins/test/test.js +++ b/resources/edit_area/plugins/test/test.js @@ -1,14 +1,14 @@ /** * Plugin designed for test prupose. It add a button (that manage an alert) and a select (that allow to insert tags) in the toolbar. * This plugin also disable the "f" key in the editarea, and load a CSS and a JS file - */ + */ var EditArea_test= { /** * Get called once this file is loaded (editArea still not initialized) * - * @return nothing - */ - init: function(){ + * @return nothing + */ + init: function(){ // alert("test init: "+ this._someInternalFunction(2, 3)); editArea.load_css(this.baseURL+"css/test.css"); editArea.load_script(this.baseURL+"test2.js"); @@ -18,11 +18,11 @@ var EditArea_test= { * A control can be a button, select list or any other HTML item to present in the EditArea user interface. * Language variables such as {$lang_somekey} will also be replaced with contents from * the language packs. - * - * @param {string} ctrl_name: the name of the control to add + * + * @param {string} ctrl_name: the name of the control to add * @return HTML code for a specific control or false. * @type string or boolean - */ + */ ,get_control_html: function(ctrl_name){ switch(ctrl_name){ case "test_but": @@ -44,19 +44,19 @@ var EditArea_test= { } /** * Get called once EditArea is fully loaded and initialised - * + * * @return nothing - */ - ,onload: function(){ + */ + ,onload: function(){ alert("test load"); } - + /** * Is called each time the user touch a keyboard key. - * + * * @param (event) e: the keydown event * @return true - pass to next handler in chain, false - stop chain execution - * @type boolean + * @type boolean */ ,onkeydown: function(e){ var str= String.fromCharCode(e.keyCode); @@ -66,14 +66,14 @@ var EditArea_test= { } return false; } - + /** * Executes a specific command, this function handles plugin commands. * * @param {string} cmd: the name of the command being executed - * @param {unknown} param: the parameter of the command + * @param {unknown} param: the parameter of the command * @return true - pass to next handler in chain, false - stop chain execution - * @type boolean + * @type boolean */ ,execCommand: function(cmd, param){ // Handle commands @@ -82,7 +82,7 @@ var EditArea_test= { var val= document.getElementById("test_select").value; if(val!=-1) parent.editAreaLoader.insertTags(editArea.id, "<"+val+">", ""); - document.getElementById("test_select").options[0].selected=true; + document.getElementById("test_select").options[0].selected=true; return false; case "test_cmd": alert("user clicked on test_cmd"); @@ -91,7 +91,7 @@ var EditArea_test= { // Pass to next handler in chain return true; } - + /** * This is just an internal plugin method, prefix all internal methods with a _ character. * The prefix is needed so they doesn't collide with future EditArea callback functions. diff --git a/resources/edit_area/reg_syntax/coldfusion.js b/resources/edit_area/reg_syntax/coldfusion.js index 2092f50674..5fa701f0ed 100644 --- a/resources/edit_area/reg_syntax/coldfusion.js +++ b/resources/edit_area/reg_syntax/coldfusion.js @@ -12,48 +12,48 @@ editAreaLoader.load_syntax["coldfusion"] = { 'return', 'break', 'continue' ] ,'reserved' : [ - 'AND', 'break', 'case', 'CONTAIN', 'CONTAINS', 'continue', 'default', 'do', - 'DOES', 'else', 'EQ', 'EQUAL', 'EQUALTO', 'EQV', 'FALSE', 'for', 'GE', - 'GREATER', 'GT', 'GTE', 'if', 'IMP', 'in', 'IS', 'LE', 'LESS', 'LT', 'LTE', - 'MOD', 'NEQ', 'NOT', 'OR', 'return', 'switch', 'THAN', 'TO', 'TRUE', 'var', + 'AND', 'break', 'case', 'CONTAIN', 'CONTAINS', 'continue', 'default', 'do', + 'DOES', 'else', 'EQ', 'EQUAL', 'EQUALTO', 'EQV', 'FALSE', 'for', 'GE', + 'GREATER', 'GT', 'GTE', 'if', 'IMP', 'in', 'IS', 'LE', 'LESS', 'LT', 'LTE', + 'MOD', 'NEQ', 'NOT', 'OR', 'return', 'switch', 'THAN', 'TO', 'TRUE', 'var', 'while', 'XOR' ] ,'functions' : [ - 'Abs', 'ACos', 'ArrayAppend', 'ArrayAvg', 'ArrayClear', 'ArrayDeleteAt', 'ArrayInsertAt', - 'ArrayIsEmpty', 'ArrayLen', 'ArrayMax', 'ArrayMin', 'ArrayNew', 'ArrayPrepend', 'ArrayResize', - 'ArraySet', 'ArraySort', 'ArraySum', 'ArraySwap', 'ArrayToList', 'Asc', 'ASin', 'Atn', 'AuthenticatedContext', - 'AuthenticatedUser', 'BitAnd', 'BitMaskClear', 'BitMaskRead', 'BitMaskSet', 'BitNot', 'BitOr', - 'BitSHLN', 'BitSHRN', 'BitXor', 'Ceiling', 'Chr', 'CJustify', 'Compare', 'CompareNoCase', 'Cos', - 'CreateDate', 'CreateDateTime', 'CreateODBCDate', 'CreateODBCDateTime', 'CreateODBCTime', - 'CreateTime', 'CreateTimeSpan', 'DateAdd', 'DateCompare', 'DateConvert', 'DateDiff', - 'DateFormat', 'DatePart', 'Day', 'DayOfWeek', 'DayOfWeekAsString', 'DayOfYear', 'DaysInMonth', - 'DaysInYear', 'DE', 'DecimalFormat', 'DecrementValue', 'Decrypt', 'DeleteClientVariable', - 'DirectoryExists', 'DollarFormat', 'Duplicate', 'Encrypt', 'Evaluate', 'Exp', 'ExpandPath', - 'FileExists', 'Find', 'FindNoCase', 'FindOneOf', 'FirstDayOfMonth', 'Fix', 'FormatBaseN', - 'GetBaseTagData', 'GetBaseTagList', 'GetBaseTemplatePath', 'GetClientVariablesList', - 'GetCurrentTemplatePath', 'GetDirectoryFromPath', 'GetException', 'GetFileFromPath', - 'GetFunctionList', 'GetHttpTimeString', 'GetHttpRequestData', 'GetLocale', 'GetMetricData', - 'GetProfileString', 'GetTempDirectory', 'GetTempFile', 'GetTemplatePath', 'GetTickCount', - 'GetTimeZoneInfo', 'GetToken', 'Hash', 'Hour', 'HTMLCodeFormat', 'HTMLEditFormat', 'IIf', - 'IncrementValue', 'InputBaseN', 'Insert', 'Int', 'IsArray', 'IsAuthenticated', 'IsAuthorized', - 'IsBoolean', 'IsBinary', 'IsCustomFunction', 'IsDate', 'IsDebugMode', 'IsDefined', 'IsLeapYear', - 'IsNumeric', 'IsNumericDate', 'IsProtected', 'IsQuery', 'IsSimpleValue', 'IsStruct', 'IsWDDX', - 'JavaCast', 'JSStringFormat', 'LCase', 'Left', 'Len', 'ListAppend', 'ListChangeDelims', - 'ListContains', 'ListContainsNoCase', 'ListDeleteAt', 'ListFind', 'ListFindNoCase', 'ListFirst', - 'ListGetAt', 'ListInsertAt', 'ListLast', 'ListLen', 'ListPrepend', 'ListQualify', 'ListRest', - 'ListSetAt', 'ListSort', 'ListToArray', 'ListValueCount', 'ListValueCountNoCase', 'LJustify', - 'Log', 'Log10', 'LSCurrencyFormat', 'LSDateFormat', 'LSEuroCurrencyFormat', 'LSIsCurrency', - 'LSIsDate', 'LSIsNumeric', 'LSNumberFormat', 'LSParseCurrency', 'LSParseDateTime', 'LSParseNumber', - 'LSTimeFormat', 'LTrim', 'Max', 'Mid', 'Min', 'Minute', 'Month', 'MonthAsString', 'Now', 'NumberFormat', - 'ParagraphFormat', 'ParameterExists', 'ParseDateTime', 'Pi', 'PreserveSingleQuotes', 'Quarter', - 'QueryAddRow', 'QueryNew', 'QuerySetCell', 'QuotedValueList', 'Rand', 'Randomize', 'RandRange', - 'REFind', 'REFindNoCase', 'RemoveChars', 'RepeatString', 'Replace', 'ReplaceList', 'ReplaceNoCase', - 'REReplace', 'REReplaceNoCase', 'Reverse', 'Right', 'RJustify', 'Round', 'RTrim', 'Second', 'SetLocale', - 'SetProfileString', 'SetVariable', 'Sgn', 'Sin', 'SpanExcluding', 'SpanIncluding', 'Sqr', 'StripCR', - 'StructAppend', 'StructClear', 'StructCopy', 'StructCount', 'StructDelete', 'StructFind', 'StructFindKey', - 'StructFindValue', 'StructGet', 'StructInsert', 'StructIsEmpty', 'StructKeyArray', 'StructKeyExists', - 'StructKeyList', 'StructNew', 'StructSort', 'StructUpdate', 'Tan', 'TimeFormat', 'ToBase64', 'ToBinary', - 'ToString', 'Trim', 'UCase', 'URLDecode', 'URLEncodedFormat', 'Val', 'ValueList', 'Week', 'WriteOutput', + 'Abs', 'ACos', 'ArrayAppend', 'ArrayAvg', 'ArrayClear', 'ArrayDeleteAt', 'ArrayInsertAt', + 'ArrayIsEmpty', 'ArrayLen', 'ArrayMax', 'ArrayMin', 'ArrayNew', 'ArrayPrepend', 'ArrayResize', + 'ArraySet', 'ArraySort', 'ArraySum', 'ArraySwap', 'ArrayToList', 'Asc', 'ASin', 'Atn', 'AuthenticatedContext', + 'AuthenticatedUser', 'BitAnd', 'BitMaskClear', 'BitMaskRead', 'BitMaskSet', 'BitNot', 'BitOr', + 'BitSHLN', 'BitSHRN', 'BitXor', 'Ceiling', 'Chr', 'CJustify', 'Compare', 'CompareNoCase', 'Cos', + 'CreateDate', 'CreateDateTime', 'CreateODBCDate', 'CreateODBCDateTime', 'CreateODBCTime', + 'CreateTime', 'CreateTimeSpan', 'DateAdd', 'DateCompare', 'DateConvert', 'DateDiff', + 'DateFormat', 'DatePart', 'Day', 'DayOfWeek', 'DayOfWeekAsString', 'DayOfYear', 'DaysInMonth', + 'DaysInYear', 'DE', 'DecimalFormat', 'DecrementValue', 'Decrypt', 'DeleteClientVariable', + 'DirectoryExists', 'DollarFormat', 'Duplicate', 'Encrypt', 'Evaluate', 'Exp', 'ExpandPath', + 'FileExists', 'Find', 'FindNoCase', 'FindOneOf', 'FirstDayOfMonth', 'Fix', 'FormatBaseN', + 'GetBaseTagData', 'GetBaseTagList', 'GetBaseTemplatePath', 'GetClientVariablesList', + 'GetCurrentTemplatePath', 'GetDirectoryFromPath', 'GetException', 'GetFileFromPath', + 'GetFunctionList', 'GetHttpTimeString', 'GetHttpRequestData', 'GetLocale', 'GetMetricData', + 'GetProfileString', 'GetTempDirectory', 'GetTempFile', 'GetTemplatePath', 'GetTickCount', + 'GetTimeZoneInfo', 'GetToken', 'Hash', 'Hour', 'HTMLCodeFormat', 'HTMLEditFormat', 'IIf', + 'IncrementValue', 'InputBaseN', 'Insert', 'Int', 'IsArray', 'IsAuthenticated', 'IsAuthorized', + 'IsBoolean', 'IsBinary', 'IsCustomFunction', 'IsDate', 'IsDebugMode', 'IsDefined', 'IsLeapYear', + 'IsNumeric', 'IsNumericDate', 'IsProtected', 'IsQuery', 'IsSimpleValue', 'IsStruct', 'IsWDDX', + 'JavaCast', 'JSStringFormat', 'LCase', 'Left', 'Len', 'ListAppend', 'ListChangeDelims', + 'ListContains', 'ListContainsNoCase', 'ListDeleteAt', 'ListFind', 'ListFindNoCase', 'ListFirst', + 'ListGetAt', 'ListInsertAt', 'ListLast', 'ListLen', 'ListPrepend', 'ListQualify', 'ListRest', + 'ListSetAt', 'ListSort', 'ListToArray', 'ListValueCount', 'ListValueCountNoCase', 'LJustify', + 'Log', 'Log10', 'LSCurrencyFormat', 'LSDateFormat', 'LSEuroCurrencyFormat', 'LSIsCurrency', + 'LSIsDate', 'LSIsNumeric', 'LSNumberFormat', 'LSParseCurrency', 'LSParseDateTime', 'LSParseNumber', + 'LSTimeFormat', 'LTrim', 'Max', 'Mid', 'Min', 'Minute', 'Month', 'MonthAsString', 'Now', 'NumberFormat', + 'ParagraphFormat', 'ParameterExists', 'ParseDateTime', 'Pi', 'PreserveSingleQuotes', 'Quarter', + 'QueryAddRow', 'QueryNew', 'QuerySetCell', 'QuotedValueList', 'Rand', 'Randomize', 'RandRange', + 'REFind', 'REFindNoCase', 'RemoveChars', 'RepeatString', 'Replace', 'ReplaceList', 'ReplaceNoCase', + 'REReplace', 'REReplaceNoCase', 'Reverse', 'Right', 'RJustify', 'Round', 'RTrim', 'Second', 'SetLocale', + 'SetProfileString', 'SetVariable', 'Sgn', 'Sin', 'SpanExcluding', 'SpanIncluding', 'Sqr', 'StripCR', + 'StructAppend', 'StructClear', 'StructCopy', 'StructCount', 'StructDelete', 'StructFind', 'StructFindKey', + 'StructFindValue', 'StructGet', 'StructInsert', 'StructIsEmpty', 'StructKeyArray', 'StructKeyExists', + 'StructKeyList', 'StructNew', 'StructSort', 'StructUpdate', 'Tan', 'TimeFormat', 'ToBase64', 'ToBinary', + 'ToString', 'Trim', 'UCase', 'URLDecode', 'URLEncodedFormat', 'Val', 'ValueList', 'Week', 'WriteOutput', 'XMLFormat', 'Year', 'YesNoFormat' ] } @@ -112,8 +112,8 @@ editAreaLoader.load_syntax["coldfusion"] = { ,'tags': 'color: #000099;' ,'doctype': 'color: #8DCFB5;' ,'test': 'color: #00FF00;' - } - } + } + } }; - + diff --git a/resources/edit_area/reg_syntax/css.js b/resources/edit_area/reg_syntax/css.js index b8131ccdd5..9b37e7fb53 100644 --- a/resources/edit_area/reg_syntax/css.js +++ b/resources/edit_area/reg_syntax/css.js @@ -36,7 +36,7 @@ editAreaLoader.load_syntax["css"] = { ,'values' : [ 'above', 'absolute', 'always', 'armenian', 'aural', 'auto', 'avoid', 'baseline', 'behind', 'below', 'bidi-override', 'black', 'blue', 'blink', 'block', 'bold', 'bolder', 'both', - 'capitalize', 'center-left', 'center-right', 'center', 'circle', 'cjk-ideographic', + 'capitalize', 'center-left', 'center-right', 'center', 'circle', 'cjk-ideographic', 'close-quote', 'collapse', 'condensed', 'continuous', 'crop', 'crosshair', 'cross', 'cursive', 'dashed', 'decimal-leading-zero', 'decimal', 'default', 'digits', 'disc', 'dotted', 'double', 'e-resize', 'embed', 'extra-condensed', 'extra-expanded', 'expanded', @@ -79,6 +79,6 @@ editAreaLoader.load_syntax["css"] = { } ,'OPERATORS' : 'color: #FF00FF;' ,'DELIMITERS' : 'color: #60CA00;' - + } }; diff --git a/resources/edit_area/reg_syntax/html.js b/resources/edit_area/reg_syntax/html.js index cc2a90e6ec..043b92075d 100644 --- a/resources/edit_area/reg_syntax/html.js +++ b/resources/edit_area/reg_syntax/html.js @@ -45,6 +45,6 @@ editAreaLoader.load_syntax["html"] = { ,'tags': 'color: #E62253;' ,'doctype': 'color: #8DCFB5;' ,'test': 'color: #00FF00;' - } - } + } + } }; diff --git a/resources/edit_area/reg_syntax/js.js b/resources/edit_area/reg_syntax/js.js index eaa7a036cc..53c6ab22d6 100644 --- a/resources/edit_area/reg_syntax/js.js +++ b/resources/edit_area/reg_syntax/js.js @@ -13,30 +13,30 @@ editAreaLoader.load_syntax["js"] = { ,'keywords' : [ 'class', 'const', 'default', 'debugger', 'export', 'extends', 'false', 'function', 'import', 'namespace', 'new', 'null', 'package', 'private', - 'protected', 'public', 'super', 'true', 'use', 'var', 'window', 'document', + 'protected', 'public', 'super', 'true', 'use', 'var', 'window', 'document', // the list below must be sorted and checked (if it is a keywords or a function and if it is not present twice - 'Link ', 'outerHeight ', 'Anchor', 'FileUpload', - 'location', 'outerWidth', 'Select', 'Area', 'find', 'Location', 'Packages', 'self', - 'arguments', 'locationbar', 'pageXoffset', 'Form', - 'Math', 'pageYoffset', 'setTimeout', 'assign', 'Frame', 'menubar', 'parent', 'status', - 'blur', 'frames', 'MimeType', 'parseFloat', 'statusbar', 'Boolean', 'Function', 'moveBy', - 'parseInt', 'stop', 'Button', 'getClass', 'moveTo', 'Password', 'String', 'callee', 'Hidden', - 'name', 'personalbar', 'Submit', 'caller', 'history', 'NaN', 'Plugin', 'sun', 'captureEvents', - 'History', 'navigate', 'print', 'taint', 'Checkbox', 'home', 'navigator', 'prompt', 'Text', - 'Image', 'Navigator', 'prototype', 'Textarea', 'clearTimeout', 'Infinity', - 'netscape', 'Radio', 'toolbar', 'close', 'innerHeight', 'Number', 'ref', 'top', 'closed', - 'innerWidth', 'Object', 'RegExp', 'toString', 'confirm', 'isFinite', 'onBlur', 'releaseEvents', - 'unescape', 'constructor', 'isNan', 'onError', 'Reset', 'untaint', 'Date', 'java', 'onFocus', - 'resizeBy', 'unwatch', 'defaultStatus', 'JavaArray', 'onLoad', 'resizeTo', 'valueOf', 'document', - 'JavaClass', 'onUnload', 'routeEvent', 'watch', 'Document', 'JavaObject', 'open', 'scroll', 'window', - 'Element', 'JavaPackage', 'opener', 'scrollbars', 'Window', 'escape', 'length', 'Option', 'scrollBy' + 'Link ', 'outerHeight ', 'Anchor', 'FileUpload', + 'location', 'outerWidth', 'Select', 'Area', 'find', 'Location', 'Packages', 'self', + 'arguments', 'locationbar', 'pageXoffset', 'Form', + 'Math', 'pageYoffset', 'setTimeout', 'assign', 'Frame', 'menubar', 'parent', 'status', + 'blur', 'frames', 'MimeType', 'parseFloat', 'statusbar', 'Boolean', 'Function', 'moveBy', + 'parseInt', 'stop', 'Button', 'getClass', 'moveTo', 'Password', 'String', 'callee', 'Hidden', + 'name', 'personalbar', 'Submit', 'caller', 'history', 'NaN', 'Plugin', 'sun', 'captureEvents', + 'History', 'navigate', 'print', 'taint', 'Checkbox', 'home', 'navigator', 'prompt', 'Text', + 'Image', 'Navigator', 'prototype', 'Textarea', 'clearTimeout', 'Infinity', + 'netscape', 'Radio', 'toolbar', 'close', 'innerHeight', 'Number', 'ref', 'top', 'closed', + 'innerWidth', 'Object', 'RegExp', 'toString', 'confirm', 'isFinite', 'onBlur', 'releaseEvents', + 'unescape', 'constructor', 'isNan', 'onError', 'Reset', 'untaint', 'Date', 'java', 'onFocus', + 'resizeBy', 'unwatch', 'defaultStatus', 'JavaArray', 'onLoad', 'resizeTo', 'valueOf', 'document', + 'JavaClass', 'onUnload', 'routeEvent', 'watch', 'Document', 'JavaObject', 'open', 'scroll', 'window', + 'Element', 'JavaPackage', 'opener', 'scrollbars', 'Window', 'escape', 'length', 'Option', 'scrollBy' ] ,'functions' : [ // common functions for Window object 'alert', 'Array', 'back', 'blur', 'clearInterval', 'close', 'confirm', 'eval ', 'focus', 'forward', 'home', 'name', 'navigate', 'onblur', 'onerror', 'onfocus', 'onload', 'onmove', 'onresize', 'onunload', 'open', 'print', 'prompt', 'scroll', 'scrollTo', 'setInterval', 'status', - 'stop' + 'stop' ] } ,'OPERATORS' :[ @@ -55,7 +55,7 @@ editAreaLoader.load_syntax["js"] = { } ,'OPERATORS' : 'color: #FF00FF;' ,'DELIMITERS' : 'color: #0038E1;' - + } ,'AUTO_COMPLETION' : { "default": { // the name of this definition group. It's posisble to have different rules inside the same definition file diff --git a/resources/edit_area/reg_syntax/php.js b/resources/edit_area/reg_syntax/php.js index a1c5883afa..2db31b9a53 100644 --- a/resources/edit_area/reg_syntax/php.js +++ b/resources/edit_area/reg_syntax/php.js @@ -24,7 +24,7 @@ editAreaLoader.load_syntax["php"] = { 'PHP_OUTPUT_HANDLER_END', 'E_ERROR', 'E_WARNING', 'E_PARSE', 'E_NOTICE', 'E_CORE_ERROR', 'E_CORE_WARNING', 'E_COMPILE_ERROR', 'E_COMPILE_WARNING', 'E_USER_ERROR', 'E_USER_WARNING', 'E_USER_NOTICE', 'E_ALL' - + ] ,'functions' : [ 'func_num_args', 'func_get_arg', 'func_get_args', 'strlen', 'strcmp', 'strncmp', 'strcasecmp', 'strncasecmp', 'each', 'error_reporting', 'define', 'defined', @@ -70,7 +70,7 @@ editAreaLoader.load_syntax["php"] = { ,'DELIMITERS' : 'color: #2B60FF;' ,'REGEXPS' : { 'variables' : 'color: #E0BD54;' - } + } } ,'AUTO_COMPLETION' : { "default": { // the name of this definition group. It's posisble to have different rules inside the same definition file @@ -129,16 +129,16 @@ editAreaLoader.load_syntax["php"] = { ] } } - ,"live": { - + ,"live": { + // class NAME: /class\W+([a-z]+)\W+/gi // method: /^(public|private|protected)?\s*function\s+([a-z][a-z0-9\_]*)\s*(\([^\{]*\))/gmi - // static: /^(public|private|protected)?\s+static\s+(public|private|protected)?\s*function\s+([a-z][a-z0-9\_]*)\s*(\([^\{]*\))/gmi - // attributes: /(\$this\-\>|(?:var|public|protected|private)\W+\$)([a-z0-9\_]+)(?!\()\b/gi - // v1 : /(\$this\-\>|var\W+|public\W+|protected\W+|private\W+)([a-z0-9\_]+)\W*(=|;)/gi - // var type: /(\$(this\-\>)?[a-z0-9\_]+)\s*\=\s*new\s+([a-z0-9\_])+/gi - - + // static: /^(public|private|protected)?\s+static\s+(public|private|protected)?\s*function\s+([a-z][a-z0-9\_]*)\s*(\([^\{]*\))/gmi + // attributes: /(\$this\-\>|(?:var|public|protected|private)\W+\$)([a-z0-9\_]+)(?!\()\b/gi + // v1 : /(\$this\-\>|var\W+|public\W+|protected\W+|private\W+)([a-z0-9\_]+)\W*(=|;)/gi + // var type: /(\$(this\-\>)?[a-z0-9\_]+)\s*\=\s*new\s+([a-z0-9\_])+/gi + + "REGEXP": { "before_word": "[^a-zA-Z0-9_]|^" // \\s|\\.| ,"possible_words_letters": "[a-zA-Z0-9_\$]+" ,"letter_after_word_must_match": "[^a-zA-Z0-9_]|$" diff --git a/resources/edit_area/reg_syntax/python.js b/resources/edit_area/reg_syntax/python.js index 456b27e976..cbf72c9412 100644 --- a/resources/edit_area/reg_syntax/python.js +++ b/resources/edit_area/reg_syntax/python.js @@ -1,8 +1,8 @@ /** - * Python syntax v 1.1 - * + * Python syntax v 1.1 + * * v1.1 by Andre Roberge (2006/12/27) - * + * **/ editAreaLoader.load_syntax["python"] = { 'COMMENT_SINGLE' : {1 : '#'} @@ -17,7 +17,7 @@ editAreaLoader.load_syntax["python"] = { */ 'reserved' : [ 'and', 'as', 'assert', 'break', 'class', 'continue', 'def', 'del', 'elif', - 'else', 'except', 'exec', 'finally', 'for', 'from', 'global', 'if', + 'else', 'except', 'exec', 'finally', 'for', 'from', 'global', 'if', 'import', 'is', 'in', 'lambda', 'not', 'or', 'pass', 'print', 'raise', 'return', 'try', 'while', 'with', 'yield' //the following are *almost* reserved; we'll treat them as such @@ -26,15 +26,15 @@ editAreaLoader.load_syntax["python"] = { /* ** Set 2: builtins ** http://python.org/doc/current/lib/built-in-funcs.html - */ + */ ,'builtins' : [ - '__import__', 'abs', 'basestring', 'bool', 'callable', 'chr', 'classmethod', 'cmp', - 'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'execfile', + '__import__', 'abs', 'basestring', 'bool', 'callable', 'chr', 'classmethod', 'cmp', + 'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'execfile', 'file', 'filter', 'float', 'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help', 'hex', 'id', 'input', 'int', 'isinstance', 'issubclass', 'iter', 'len', 'list', 'locals', 'long', 'map', 'max', 'min', 'object', 'oct', 'open', 'ord', 'pow', 'property', 'range', 'raw_input', 'reduce', 'reload', 'repr', 'reversed', 'round', 'set', 'setattr', 'slice', - 'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr', 'unicode', + 'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr', 'unicode', 'vars', 'xrange', 'zip', // Built-in constants: http://www.python.org/doc/2.4.1/lib/node35.html //'False', 'True', 'None' have been included in 'reserved' @@ -48,7 +48,7 @@ editAreaLoader.load_syntax["python"] = { 'UnboundlocalError', 'UnicodeError', 'UnicodeEncodeError', 'UnicodeDecodeError', 'UnicodeTranslateError', 'ValueError', 'WindowsError', 'ZeroDivisionError', 'Warning', 'UserWarning', 'DeprecationWarning', 'PendingDeprecationWarning', 'SyntaxWarning', - 'RuntimeWarning', 'FutureWarning', + 'RuntimeWarning', 'FutureWarning', // we will include the string methods as well // http://python.org/doc/current/lib/string-methods.html 'capitalize', 'center', 'count', 'decode', 'encode', 'endswith', 'expandtabs', @@ -100,14 +100,14 @@ editAreaLoader.load_syntax["python"] = { */ ,'special' : [ // Basic customization: http://python.org/doc/current/ref/customization.html - '__new__', '__init__', '__del__', '__repr__', '__str__', + '__new__', '__init__', '__del__', '__repr__', '__str__', '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__', '__cmp__', '__rcmp__', '__hash__', '__nonzero__', '__unicode__', '__dict__', // Attribute access: http://python.org/doc/current/ref/attribute-access.html '__setattr__', '__delattr__', '__getattr__', '__getattribute__', '__get__', '__set__', '__delete__', '__slots__', // Class creation, callable objects - '__metaclass__', '__call__', + '__metaclass__', '__call__', // Container types: http://python.org/doc/current/ref/sequence-types.html '__len__', '__getitem__', '__setitem__', '__delitem__', '__iter__', '__contains__', '__getslice__', '__setslice__', '__delslice__', @@ -139,6 +139,6 @@ editAreaLoader.load_syntax["python"] = { } ,'OPERATORS' : 'color: #993300;' ,'DELIMITERS' : 'color: #993300;' - + } }; diff --git a/resources/edit_area/reg_syntax/robotstxt.js b/resources/edit_area/reg_syntax/robotstxt.js index eab451d039..bc48efa222 100644 --- a/resources/edit_area/reg_syntax/robotstxt.js +++ b/resources/edit_area/reg_syntax/robotstxt.js @@ -19,6 +19,6 @@ editAreaLoader.load_syntax["robotstxt"] = { 'specials' : 'color: #FF0000;' }, 'OPERATORS' : 'color: #FF00FF;', - 'DELIMITERS' : 'color: #60CA00;' + 'DELIMITERS' : 'color: #60CA00;' } }; diff --git a/resources/edit_area/reg_syntax/ruby.js b/resources/edit_area/reg_syntax/ruby.js index 1f94ecc9ef..229e78fc61 100644 --- a/resources/edit_area/reg_syntax/ruby.js +++ b/resources/edit_area/reg_syntax/ruby.js @@ -1,8 +1,8 @@ /** - * Ruby syntax v 1.0 - * + * Ruby syntax v 1.0 + * * v1.0 by Patrice De Saint Steban (2007/01/03) - * + * **/ editAreaLoader.load_syntax["ruby"] = { 'COMMENT_SINGLE' : {1 : '#'} @@ -12,7 +12,7 @@ editAreaLoader.load_syntax["ruby"] = { ,'KEYWORDS' : { 'reserved' : [ 'alias', 'and', 'BEGIN', 'begin', 'break', 'case', 'class', 'def', 'defined', 'do', 'else', - 'elsif', 'END', 'end', 'ensure', 'false', 'for', 'if', + 'elsif', 'END', 'end', 'ensure', 'false', 'for', 'if', 'in', 'module', 'next', 'not', 'or', 'redo', 'rescue', 'retry', 'return', 'self', 'super', 'then', 'true', 'undef', 'unless', 'until', 'when', 'while', 'yield' ] @@ -28,19 +28,19 @@ editAreaLoader.load_syntax["ruby"] = { 'search' : '()([A-Z]\\w*)()' ,'class' : 'constants' ,'modifiers' : 'g' - ,'execute' : 'before' + ,'execute' : 'before' } ,'variables' : { 'search' : '()([\$\@\%]+\\w+)()' ,'class' : 'variables' ,'modifiers' : 'g' - ,'execute' : 'before' + ,'execute' : 'before' } ,'numbers' : { 'search' : '()(-?[0-9]+)()' ,'class' : 'numbers' ,'modifiers' : 'g' - ,'execute' : 'before' + ,'execute' : 'before' } ,'symbols' : { 'search' : '()(:\\w+)()' @@ -62,6 +62,6 @@ editAreaLoader.load_syntax["ruby"] = { ,'numbers' : 'color: green;' ,'constants' : 'color: #00AA00;' ,'symbols' : 'color: #879EFA;' - } + } } }; diff --git a/resources/edit_area/reg_syntax/sql.js b/resources/edit_area/reg_syntax/sql.js index f4530a99c7..37dffa26c2 100644 --- a/resources/edit_area/reg_syntax/sql.js +++ b/resources/edit_area/reg_syntax/sql.js @@ -6,12 +6,12 @@ editAreaLoader.load_syntax["sql"] = { ,'KEYWORDS' : { 'statements' : [ 'select', 'SELECT', 'where', 'order', 'by', - 'insert', 'from', 'update', 'grant', 'left join', 'right join', + 'insert', 'from', 'update', 'grant', 'left join', 'right join', 'union', 'group', 'having', 'limit', 'alter', 'LIKE','IN','CASE' ] ,'reserved' : [ 'null', 'enum', 'int', 'boolean', 'add', 'varchar' - + ] ,'functions' : [ 'ABS','ACOS','ADDDATE','ADDTIME','AES_DECRYPT','AES_ENCRYPT','ASCII','ASIN','ATAN2 ATAN','ATAN','AVG','BENCHMARK','DISTINCT','BIN','BIT_AND','BIT_COUNT','BIT_LENGTH','BIT_OR','BIT_XOR','CAST','CEILING CEIL','CHAR_LENGTH','CHAR', @@ -50,6 +50,6 @@ editAreaLoader.load_syntax["sql"] = { ,'DELIMITERS' : 'color: #2B60FF;' ,'REGEXPS' : { 'variables' : 'color: #E0BD54;' - } + } } }; diff --git a/resources/edit_area/reg_syntax/tsql.js b/resources/edit_area/reg_syntax/tsql.js index 0c5c9ee8ac..b2f65abdc5 100644 --- a/resources/edit_area/reg_syntax/tsql.js +++ b/resources/edit_area/reg_syntax/tsql.js @@ -12,17 +12,17 @@ editAreaLoader.load_syntax["tsql"] = { 'RECONFIGURE', 'BROWSE', 'FROM', 'REFERENCES', 'BULK', 'FULL', 'REPLICATION', 'BY', 'FUNCTION', 'RESTORE', 'CASCADE', 'GOTO', 'RESTRICT', 'CASE', 'GRANT', 'RETURN', 'CHECK', 'GROUP', 'REVOKE', 'CHECKPOINT', 'HAVING', 'RIGHT', 'CLOSE', 'HOLDLOCK', 'ROLLBACK', - 'CLUSTERED', 'IDENTITY', 'ROWCOUNT', 'IDENTITY_INSERT', 'ROWGUIDCOL', 'COLLATE', + 'CLUSTERED', 'IDENTITY', 'ROWCOUNT', 'IDENTITY_INSERT', 'ROWGUIDCOL', 'COLLATE', 'IDENTITYCOL', 'RULE', 'COLUMN', 'IF', 'SAVE', 'COMMIT', 'SCHEMA', 'COMPUTE', 'INDEX', 'SELECT', 'CONSTRAINT', 'CONTAINS', 'INSERT', 'SET', 'CONTAINSTABLE', 'INTERSECT', 'SETUSER', 'CONTINUE', 'INTO', 'SHUTDOWN', 'SOME', 'CREATE', 'STATISTICS', 'KEY', 'CURRENT', 'KILL', 'TABLE', 'CURRENT_DATE', 'TEXTSIZE', 'CURRENT_TIME', 'THEN', 'LINENO', - 'TO', 'LOAD', 'TOP', 'CURSOR', 'NATIONAL', 'TRAN', 'DATABASE', 'NOCHECK', + 'TO', 'LOAD', 'TOP', 'CURSOR', 'NATIONAL', 'TRAN', 'DATABASE', 'NOCHECK', 'TRANSACTION', 'DBCC', 'NONCLUSTERED', 'TRIGGER', 'DEALLOCATE', 'TRUNCATE', 'DECLARE', 'TSEQUAL', 'DEFAULT', 'UNION', 'DELETE', 'OF', 'UNIQUE', 'DENY', 'OFF', 'UPDATE', 'DESC', 'OFFSETS', 'UPDATETEXT', 'DISK', 'ON', 'USE', 'DISTINCT', 'OPEN', - 'DISTRIBUTED', 'OPENDATASOURCE', 'VALUES', 'DOUBLE', 'OPENQUERY', 'VARYING', 'DROP', + 'DISTRIBUTED', 'OPENDATASOURCE', 'VALUES', 'DOUBLE', 'OPENQUERY', 'VARYING', 'DROP', 'OPENROWSET', 'VIEW', 'DUMMY', 'OPENXML', 'WAITFOR', 'DUMP', 'OPTION', 'WHEN', 'ELSE', 'WHERE', 'END', 'ORDER', 'WHILE', 'ERRLVL', 'WITH', 'ESCAPE', 'OVER', 'WRITETEXT' ], @@ -80,8 +80,8 @@ editAreaLoader.load_syntax["tsql"] = { ,'DELIMITERS' : 'color: #FF8000;' ,'REGEXPS' : { 'variables' : 'color: #E0BD54;' - } + } } }; - + diff --git a/resources/edit_area/reg_syntax/xml.js b/resources/edit_area/reg_syntax/xml.js index a043dd63ad..c2e92f2638 100644 --- a/resources/edit_area/reg_syntax/xml.js +++ b/resources/edit_area/reg_syntax/xml.js @@ -51,6 +51,6 @@ editAreaLoader.load_syntax["xml"] = { ,'tags': 'color: #E62253;' ,'xml': 'color: #8DCFB5;' ,'cdata': 'color: #50B020;' - } - } + } + } };