1
0
mirror of https://github.com/DataTables/DataTables.git synced 2024-11-29 11:24:10 +01:00

Dev: Syntax highlighter - link urls with a comma in them

Dev: Syntax highlighter - show the type label above the code so it doesn't over lap the code
Dev: Syntax highlighter - don't show the `:after` option in highlighted code
This commit is contained in:
Allan Jardine 2015-07-24 11:45:26 +01:00
parent 11dbd3ca52
commit fa9fa2e296
4 changed files with 7 additions and 3 deletions

View File

@ -1 +1 @@
8bbe3332c9d5b5c51908814c1af6ccca9c597877
1ea587a68521fd3b09701a255111f379b4d4b491

View File

@ -261,6 +261,10 @@ code.multiline {
width: 95%;
}
div.syntaxhighlighter code:after {
display: none;
}
ul.tabs {
position: relative;

View File

@ -134,7 +134,7 @@
.syntaxhighlighter .toolbar {
position: absolute !important;
right: 1px !important;
top: 1px !important;
top: -18px !important;
font-size: 10px !important;
z-index: 7 !important;
}

View File

@ -120,7 +120,7 @@ var sh = {
multiLineDoubleQuotedString : XRegExp('"([^\\\\"]|\\\\.)*"', 'gs'),
multiLineSingleQuotedString : XRegExp("'([^\\\\']|\\\\.)*'", 'gs'),
xmlComments : XRegExp('(&lt;|<)!--.*?--(&gt;|>)', 'gs'),
url : /\w+:\/\/[\w-.\/?%&=:@;#]*/g,
url : /\w+:\/\/[\w-.\/?%&=:@;#,]*/g,
phpScriptTags : { left: /(&lt;|<)\?(?:=|php)?/g, right: /\?(&gt;|>)/g, 'eof' : true },
aspScriptTags : { left: /(&lt;|<)%=?/g, right: /%(&gt;|>)/g },
scriptScriptTags : { left: /(&lt;|<)\s*script.*?(&gt;|>)/gi, right: /(&lt;|<)\/\s*script\s*(&gt;|>)/gi }