Merge branch 'master' of git://github.com/colosa/processmaker into BUG-0000
This commit is contained in:
2
gulliver/js/codemirror/lib/codemirror.css
vendored
2
gulliver/js/codemirror/lib/codemirror.css
vendored
@@ -3,7 +3,7 @@
|
||||
.CodeMirror {
|
||||
/* Set height, width, borders, and global font properties here */
|
||||
font-family: monospace;
|
||||
height: 300px;
|
||||
height: '95%';
|
||||
}
|
||||
.CodeMirror-scroll {
|
||||
/* Set scrolling behaviour here */
|
||||
|
||||
1
gulliver/js/codemirror/mode/php/php.js
vendored
1
gulliver/js/codemirror/mode/php/php.js
vendored
@@ -81,7 +81,6 @@
|
||||
state.pending = null;
|
||||
var cur = stream.current(), openPHP = cur.search(/<\?/);
|
||||
if (openPHP != -1) {
|
||||
alert("openPHP");
|
||||
if (style == "string" && /\"$/.test(cur) && !/\?>/.test(cur)) state.pending = '"';
|
||||
else state.pending = {end: stream.pos, style: style};
|
||||
stream.backUp(cur.length - openPHP);
|
||||
|
||||
Reference in New Issue
Block a user