Merge pull request #1015 from ajaxorg/build

fix build

lib/ace/ace.js

@@ -53,8 +53,8 @@ var MultiSelect = require("./multi_select").MultiSelect;
 // The following require()s are for inclusion in the built ace file
 require("./worker/worker_client");
 require("./keyboard/hash_handler");
-require("./keyboard/state_handler");
 require("./placeholder");
+require("./mode/folding/fold_mode");
 exports.config = require("./config");
     /**
      * Ace.edit(el) -> Editor

lib/ace/ext/textarea.js

@@ -36,7 +36,7 @@ var UA = require("../lib/useragent");
 var net = require("../lib/net");
 var ace = require("../ace");
 
-require("ace/theme/textmate");
+require("../theme/textmate");
 
 module.exports = exports = ace;
 

lib/ace/keyboard/vim/maps/motions.js

@@ -127,7 +127,7 @@ var StringStream = function(editor, cursor) {
     };
 };
 
-var Search = require("ace/search").Search;
+var Search = require("../../../search").Search;
 var search = new Search();
 
 function find(editor, needle, dir) {
@@ -136,7 +136,7 @@ function find(editor, needle, dir) {
     return search.find(editor.session);
 }
 
-var Range = require("ace/range").Range;
+var Range = require("../../../range").Range;
 
 module.exports = {
     "w": new Motion(function(editor) {

lib/ace/mode/jade.js

@@ -40,8 +40,8 @@ var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
 var Tokenizer = require("../tokenizer").Tokenizer;
 var JadeHighlightRules = require("./jade_highlight_rules").JadeHighlightRules;
-// var JavascriptMode = require("ace/mode/javascript").Mode;
-// var CssMode = require("ace/mode/css").Mode;
+// var JavascriptMode = require("../mode/javascript").Mode;
+// var CssMode = require("../mode/css").Mode;
 
 var Mode = function() {
     var highlighter = new JadeHighlightRules();

lib/ace/placeholder.js

@@ -30,7 +30,7 @@
 define(function(require, exports, module) {
 "use strict";
 
-var Range = require('./range').Range;
+var Range = require("./range").Range;
 var EventEmitter = require("./lib/event_emitter").EventEmitter;
 var oop = require("./lib/oop");
 

lib/ace/placeholder_test.js

@@ -41,8 +41,8 @@ var Editor = require("./editor").Editor;
 var MockRenderer = require("./test/mockrenderer").MockRenderer;
 var assert = require("./test/assertions");
 var JavaScriptMode = require("./mode/javascript").Mode;
-var PlaceHolder = require('./placeholder').PlaceHolder;
-var UndoManager = require('./undomanager').UndoManager;
+var PlaceHolder = require("./placeholder").PlaceHolder;
+var UndoManager = require("./undomanager").UndoManager;
 
 module.exports = {
 

lib/ace/requirejs/text.js

@@ -44,7 +44,7 @@ define(function (require, exports, module) {
         if (globalRequire && globalRequire.nodeRequire)
             onLoad(globalRequire.nodeRequire('fs').readFileSync(req.toUrl(name), 'utf8'));
         else
-            require("ace/lib/net").get(req.toUrl(name), onLoad);
+            require("../lib/net").get(req.toUrl(name), onLoad);
     };
 });
 

lib/ace/theme/ambiance.js

@@ -25,7 +25,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-ambiance";
-exports.cssText = require("ace/requirejs/text!./ambiance.css");
+exports.cssText = require("../requirejs/text!./ambiance.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/chrome.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-chrome";
-exports.cssText = require('ace/requirejs/text!./chrome.css');
+exports.cssText = require("../requirejs/text!./chrome.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/clouds.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-clouds";
-exports.cssText = require('ace/requirejs/text!./clouds.css');
+exports.cssText = require("../requirejs/text!./clouds.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/clouds_midnight.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-clouds-midnight";
-exports.cssText = require('ace/requirejs/text!./clouds_midnight.css');
+exports.cssText = require("../requirejs/text!./clouds_midnight.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/cobalt.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-cobalt";
-exports.cssText = require('ace/requirejs/text!./cobalt.css');
+exports.cssText = require("../requirejs/text!./cobalt.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/crimson_editor.js

@@ -30,7 +30,7 @@
 
 define(function(require, exports, module) {
 exports.isDark = false;
-exports.cssText = require('ace/requirejs/text!./crimson_editor.css');
+exports.cssText = require("../requirejs/text!./crimson_editor.css");
 
 exports.cssClass = "ace-crimson-editor";
 

lib/ace/theme/dawn.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-dawn";
-exports.cssText = require('ace/requirejs/text!./dawn.css');
+exports.cssText = require("../requirejs/text!./dawn.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/dreamweaver.js

@@ -31,7 +31,7 @@
 define(function(require, exports, module) {
 exports.isDark = false;
 exports.cssClass = "ace-dreamweaver";
-exports.cssText = require('ace/requirejs/text!./dreamweaver.css');
+exports.cssText = require("../requirejs/text!./dreamweaver.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/eclipse.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 "use strict";
 
 exports.isDark = false;
-exports.cssText = require('ace/requirejs/text!./eclipse.css');
+exports.cssText = require("../requirejs/text!./eclipse.css");
 
 exports.cssClass = "ace-eclipse";
 

lib/ace/theme/github.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-github";
-exports.cssText = require('ace/requirejs/text!./github.css');
+exports.cssText = require("../requirejs/text!./github.css");
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/idle_fingers.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-idle-fingers";
-exports.cssText = require('ace/requirejs/text!./idle_fingers.css');
+exports.cssText = require("../requirejs/text!./idle_fingers.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/kr_theme.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-kr-theme";
-exports.cssText = require('ace/requirejs/text!./kr_theme.css');
+exports.cssText = require("../requirejs/text!./kr_theme.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/merbivore.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-merbivore";
-exports.cssText = require('ace/requirejs/text!./merbivore.css');
+exports.cssText = require("../requirejs/text!./merbivore.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/merbivore_soft.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-merbivore-soft";
-exports.cssText = require('ace/requirejs/text!./merbivore_soft.css');
+exports.cssText = require("../requirejs/text!./merbivore_soft.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/mono_industrial.css

@@ -135,4 +135,4 @@
 
 .ace-mono-industrial .ace_indent-guide {
   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ0tH4zzBz5sz/ABAOBECKH+evAAAAAElFTkSuQmCC) right repeat-y
-}
+}

lib/ace/theme/mono_industrial.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-mono-industrial";
-exports.cssText = require('ace/requirejs/text!./mono_industrial.css');
+exports.cssText = require("../requirejs/text!./mono_industrial.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/monokai.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-monokai";
-exports.cssText = require('ace/requirejs/text!./monokai.css');
+exports.cssText = require("../requirejs/text!./monokai.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/pastel_on_dark.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-pastel-on-dark";
-exports.cssText = require('ace/requirejs/text!./pastel_on_dark.css');
+exports.cssText = require("../requirejs/text!./pastel_on_dark.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/solarized_dark.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-solarized-dark";
-exports.cssText = require('ace/requirejs/text!./solarized_dark.css');
+exports.cssText = require("../requirejs/text!./solarized_dark.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/solarized_light.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-solarized-light";
-exports.cssText = require('ace/requirejs/text!./solarized_light.css');
+exports.cssText = require("../requirejs/text!./solarized_light.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/textmate.js

@@ -33,7 +33,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-tm";
-exports.cssText = require('ace/requirejs/text!./textmate.css');
+exports.cssText = require("../requirejs/text!./textmate.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/tomorrow.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-tomorrow";
-exports.cssText = require('ace/requirejs/text!./tomorrow.css');
+exports.cssText = require("../requirejs/text!./tomorrow.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/tomorrow_night.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-tomorrow-night";
-exports.cssText = require('ace/requirejs/text!./tomorrow_night.css');
+exports.cssText = require("../requirejs/text!./tomorrow_night.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/tomorrow_night_blue.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-tomorrow-night-blue";
-exports.cssText = require('ace/requirejs/text!./tomorrow_night_blue.css');
+exports.cssText = require("../requirejs/text!./tomorrow_night_blue.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/tomorrow_night_bright.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-tomorrow-night-bright";
-exports.cssText = require('ace/requirejs/text!./tomorrow_night_bright.css');
+exports.cssText = require("../requirejs/text!./tomorrow_night_bright.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/tomorrow_night_eighties.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-tomorrow-night-eighties";
-exports.cssText = require('ace/requirejs/text!./tomorrow_night_eighties.css');
+exports.cssText = require("../requirejs/text!./tomorrow_night_eighties.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/twilight.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-twilight";
-exports.cssText = require('ace/requirejs/text!./twilight.css');
+exports.cssText = require("../requirejs/text!./twilight.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/vibrant_ink.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = true;
 exports.cssClass = "ace-vibrant-ink";
-exports.cssText = require('ace/requirejs/text!./vibrant_ink.css');
+exports.cssText = require("../requirejs/text!./vibrant_ink.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/theme/xcode.js

@@ -32,7 +32,7 @@ define(function(require, exports, module) {
 
 exports.isDark = false;
 exports.cssClass = "ace-xcode";
-exports.cssText = require('ace/requirejs/text!./xcode.css');
+exports.cssText = require("../requirejs/text!./xcode.css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);

lib/ace/virtual_renderer.js

@@ -44,7 +44,7 @@ var CursorLayer = require("./layer/cursor").Cursor;
 var ScrollBar = require("./scrollbar").ScrollBar;
 var RenderLoop = require("./renderloop").RenderLoop;
 var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var editorCss = require("ace/requirejs/text!./css/editor.css");
+var editorCss = require("./requirejs/text!./css/editor.css");
 
 dom.importCssString(editorCss, "ace_editor");