Skip to content

Commit 3adeac6

Browse files
fjakobsfjakobs
committed
apply Kevin's refactoring
- lower case file names - use define(function(require, exports, module) {..})
1 parent e377e03 commit 3adeac6

87 files changed

Lines changed: 2041 additions & 872 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lib/ace/PluginManager.js‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎lib/ace/RenderLoop.js‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎lib/ace/ScrollBar.js‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎lib/ace/UndoManager.js‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

lib/ace/Document.js renamed to lib/ace/_document.js

Lines changed: 51 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,48 @@
1-
/**
2-
* Ajax.org Code Editor (ACE)
1+
/* ***** BEGIN LICENSE BLOCK *****
2+
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
33
*
4-
* @copyright 2010, Ajax.org Services B.V.
5-
* @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
6-
* @author Fabian Jakobs <fabian AT ajax DOT org>
7-
*/
4+
* The contents of this file are subject to the Mozilla Public License Version
5+
* 1.1 (the "License"); you may not use this file except in compliance with
6+
* the License. You may obtain a copy of the License at
7+
* http://www.mozilla.org/MPL/
8+
*
9+
* Software distributed under the License is distributed on an "AS IS" basis,
10+
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
11+
* for the specific language governing rights and limitations under the
12+
* License.
13+
*
14+
* The Original Code is Ajax.org Code Editor (ACE).
15+
*
16+
* The Initial Developer of the Original Code is
17+
* Ajax.org Services B.V.
18+
* Portions created by the Initial Developer are Copyright (C) 2010
19+
* the Initial Developer. All Rights Reserved.
20+
*
21+
* Contributor(s):
22+
* Fabian Jakobs <fabian AT ajax DOT org>
23+
*
24+
* Alternatively, the contents of this file may be used under the terms of
25+
* either the GNU General Public License Version 2 or later (the "GPL"), or
26+
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
27+
* in which case the provisions of the GPL or the LGPL are applicable instead
28+
* of those above. If you wish to allow use of your version of this file only
29+
* under the terms of either the GPL or the LGPL, and not to allow others to
30+
* use your version of this file under the terms of the MPL, indicate your
31+
* decision by deleting the provisions above and replace them with the notice
32+
* and other provisions required by the GPL or the LGPL. If you do not delete
33+
* the provisions above, a recipient may use your version of this file under
34+
* the terms of any one of the MPL, the GPL or the LGPL.
35+
*
36+
* ***** END LICENSE BLOCK ***** */
37+
838
define(function(require, exports, module) {
9-
10-
var oop = require("./lib/oop");
11-
var lang = require("./lib/lang");
12-
var MEventEmitter = require("./mevent_emitter");
13-
var Selection = require("./selection");
14-
var TextMode = require("./mode/text");
15-
var Range = require("./range");
39+
40+
var oop = require("ace/lib/oop");
41+
var lang = require("ace/lib/lang");
42+
var MEventEmitter = require("ace/event_emitter");
43+
var Selection = require("ace/selection");
44+
var TextMode = require("ace/mode/text");
45+
var Range = require("ace/range");
1646

1747
var Document = function(text, mode) {
1848
this.modified = true;
@@ -32,6 +62,7 @@ var Document = function(text, mode) {
3262
}
3363
};
3464

65+
3566
(function() {
3667

3768
oop.implement(this, MEventEmitter);
@@ -360,14 +391,14 @@ var Document = function(text, mode) {
360391

361392
while (true) {
362393
while(column >= 0) {
363-
var chr = line.charAt(column);
364-
if (chr == openBracket) {
394+
var ch = line.chAt(column);
395+
if (ch == openBracket) {
365396
depth -= 1;
366397
if (depth == 0) {
367398
return {row: row, column: column};
368399
}
369400
}
370-
else if (chr == bracket) {
401+
else if (ch == bracket) {
371402
depth +=1;
372403
}
373404
column -= 1;
@@ -393,14 +424,14 @@ var Document = function(text, mode) {
393424

394425
while (true) {
395426
while(column < line.length) {
396-
var chr = line.charAt(column);
397-
if (chr == closingBracket) {
427+
var ch = line.chAt(column);
428+
if (ch == closingBracket) {
398429
depth -= 1;
399430
if (depth == 0) {
400431
return {row: row, column: column};
401432
}
402433
}
403-
else if (chr == bracket) {
434+
else if (ch == bracket) {
404435
depth +=1;
405436
}
406437
column += 1;
@@ -716,4 +747,4 @@ var Document = function(text, mode) {
716747
}).call(Document.prototype);
717748

718749
return Document;
719-
});
750+
});

lib/ace/Editor.js renamed to lib/ace/_editor.js

Lines changed: 49 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,53 @@
1-
/**
2-
* Ajax.org Code Editor (ACE)
1+
/* ***** BEGIN LICENSE BLOCK *****
2+
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
33
*
4-
* @copyright 2010, Ajax.org Services B.V.
5-
* @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
6-
* @author Fabian Jakobs <fabian AT ajax DOT org>
7-
*/
8-
9-
define(function(require, exports, module) {
10-
11-
var oop = require("./lib/oop");
12-
var event = require("./lib/event");
13-
var lang = require("./lib/lang");
14-
var TextInput = require("./textinput");
15-
var KeyBinding = require("./keybinding");
16-
var Document = require("./document");
17-
var Search = require("./search");
18-
var BackgroundTokenizer = require("./background_tokenizer");
19-
var Range = require("./range");
20-
var MEventEmitter = require("./mevent_emitter");
21-
4+
* The contents of this file are subject to the Mozilla Public License Version
5+
* 1.1 (the "License"); you may not use this file except in compliance with
6+
* the License. You may obtain a copy of the License at
7+
* http://www.mozilla.org/MPL/
8+
*
9+
* Software distributed under the License is distributed on an "AS IS" basis,
10+
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
11+
* for the specific language governing rights and limitations under the
12+
* License.
13+
*
14+
* The Original Code is Ajax.org Code Editor (ACE).
15+
*
16+
* The Initial Developer of the Original Code is
17+
* Ajax.org Services B.V.
18+
* Portions created by the Initial Developer are Copyright (C) 2010
19+
* the Initial Developer. All Rights Reserved.
20+
*
21+
* Contributor(s):
22+
* Fabian Jakobs <fabian AT ajax DOT org>
23+
*
24+
* Alternatively, the contents of this file may be used under the terms of
25+
* either the GNU General Public License Version 2 or later (the "GPL"), or
26+
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
27+
* in which case the provisions of the GPL or the LGPL are applicable instead
28+
* of those above. If you wish to allow use of your version of this file only
29+
* under the terms of either the GPL or the LGPL, and not to allow others to
30+
* use your version of this file under the terms of the MPL, indicate your
31+
* decision by deleting the provisions above and replace them with the notice
32+
* and other provisions required by the GPL or the LGPL. If you do not delete
33+
* the provisions above, a recipient may use your version of this file under
34+
* the terms of any one of the MPL, the GPL or the LGPL.
35+
*
36+
* ***** END LICENSE BLOCK ***** */
37+
38+
define(function(require, exports, module) {
39+
40+
var oop = require("ace/lib/oop");
41+
var event = require("ace/lib/event");
42+
var lang = require("ace/lib/lang");
43+
var TextInput = require("ace/textinput");
44+
var KeyBinding = require("ace/keybinding");
45+
var Document = require("ace/document");
46+
var Search = require("ace/search");
47+
var BackgroundTokenizer = require("ace/background_tokenizer");
48+
var Range = require("ace/range");
49+
var MEventEmitter = require("ace/event_emitter");
50+
2251
var Editor =function(renderer, doc) {
2352
var container = renderer.getContainerElement();
2453
this.container = container;

0 commit comments

Comments
 (0)