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

Merge branch 'master' of github.com:ajaxorg/ace

Browse source
This commit is contained in:
Fabian Jakobs 2011-02-28 17:58:02 +01:00
commit c2af3ed374
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
build_support/mini_require.js
View file

@ -59,6 +59,9 @@ var _define = function(module, deps, payload) {
return; return;
} }
if (arguments.length == 2)
payload = deps;
if (!define.modules) if (!define.modules)
define.modules = {}; define.modules = {};

3
build_support/mini_require_textarea.js
View file

@ -55,6 +55,9 @@ var _define = function(module, deps, payload) {
return; return;
} }
if (arguments.length == 2)
payload = deps;
if (!_define.modules) if (!_define.modules)
_define.modules = {}; _define.modules = {};

2
lib/ace/mode/php_highlight_rules.js
View file

@ -449,7 +449,7 @@ var PhpHighlightRules = function() {
); );
var builtinVariables = lang.arrayToMap( var builtinVariables = lang.arrayToMap(
('$_GLOBALS|$_SERVER|$_GET|$_POST|$_FILES|$_REQUEST|$_SESSION|$_ENV|$_COOKIE|$php_errormsg|$HTTP_RAW_POST_DATA|' + ('$GLOBALS|$_SERVER|$_GET|$_POST|$_FILES|$_REQUEST|$_SESSION|$_ENV|$_COOKIE|$php_errormsg|$HTTP_RAW_POST_DATA|' +
'$http_response_header|$argc|$argv').split('|') '$http_response_header|$argc|$argv').split('|')
); );