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

requireJS fixes for the editor

Browse source
This commit is contained in:
Fabian Jakobs 2010-09-17 11:27:15 +02:00
commit 872afa6904
6 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ace/Editor.js
View file

@ -7,7 +7,8 @@ require.def("ace/Editor",
"ace/Search", "ace/Search",
"ace/BackgroundTokenizer", "ace/BackgroundTokenizer",
"ace/Range", "ace/Range",
], function(ace, TextInput, KeyBinding, Document, Search, BackgroundTokenizer, Range) { "ace/MEventEmitter"
], function(ace, TextInput, KeyBinding, Document, Search, BackgroundTokenizer, Range, MEventEmitter) {
var Editor = function(renderer, doc) { var Editor = function(renderer, doc) {
var container = renderer.getContainerElement(); var container = renderer.getContainerElement();
@ -44,7 +45,7 @@ var Editor = function(renderer, doc) {
(function(){ (function(){
ace.implement(this, ace.MEventEmitter); ace.implement(this, MEventEmitter);
this.$forwardEvents = { this.$forwardEvents = {
gutterclick: 1, gutterclick: 1,

8
src/ace/KeyBinding.js
View file

@ -1,4 +1,6 @@
require.def("ace/KeyBinding", ["ace/ace"], function(ace) { require.def("ace/KeyBinding",
["ace/ace", "ace/conf/keybindings/default_mac", "ace/conf/keybindings/default_win"],
function(ace, default_mac, default_win) {
var KeyBinding = function(element, editor, config) { var KeyBinding = function(element, editor, config) {
this.editor = editor; this.editor = editor;
@ -53,8 +55,8 @@ var KeyBinding = function(element, editor, config) {
this.setConfig = function(config) { this.setConfig = function(config) {
this.config = config || ace.isMac this.config = config || ace.isMac
? ace.KeyBinding.default_mac ? default_mac
: ace.KeyBinding.default_win; : default_win;
if (typeof this.config.reverse == "undefined") if (typeof this.config.reverse == "undefined")
this.config.reverse = ace.objectReverse(this.config, "|"); this.config.reverse = ace.objectReverse(this.config, "|");
}; };

7
src/ace/VirtualRenderer.js
View file

@ -5,8 +5,9 @@ require.def("ace/VirtualRenderer",
"ace/layer/Marker", "ace/layer/Marker",
"ace/layer/Text", "ace/layer/Text",
"ace/layer/Cursor", "ace/layer/Cursor",
"ace/ScrollBar" "ace/ScrollBar",
], function(ace, GutterLayer, MarkerLayer, TextLayer, CursorLayer, ScrollBar) { "ace/MEventEmitter"
], function(ace, GutterLayer, MarkerLayer, TextLayer, CursorLayer, ScrollBar, MEventEmitter) {
var VirtualRenderer = function(container) { var VirtualRenderer = function(container) {
this.container = container; this.container = container;
@ -62,7 +63,7 @@ var VirtualRenderer = function(container) {
(function() { (function() {
ace.implement(this, ace.MEventEmitter); ace.implement(this, MEventEmitter);
this.setDocument = function(doc) { this.setDocument = function(doc) {
this.lines = doc.lines; this.lines = doc.lines;

2
src/ace/conf/keybindings/default_mac.js
View file

@ -1,4 +1,4 @@
require.def("ace/conf/keybinding/default_mac", function() { require.def("ace/conf/keybindings/default_mac", function() {
return { return {
"selectall": "Meta-A", "selectall": "Meta-A",

2
src/ace/conf/keybindings/default_win.js
View file

@ -1,4 +1,4 @@
require.def("ace/conf/keybinding/default_win", function() { require.def("ace/conf/keybindings/default_win", function() {
return { return {
"selectall": "Control-A", "selectall": "Control-A",

4
src/ace/lib/lang.js
View file

@ -34,7 +34,7 @@ require.def("ace/lib/lang", function() {
return copy; return copy;
}; };
this.arrayToMap = function(arr) { lang.arrayToMap = function(arr) {
var map = {}; var map = {};
for (var i=0; i<arr.length; i++) { for (var i=0; i<arr.length; i++) {
map[arr[i]] = 1; map[arr[i]] = 1;
@ -43,7 +43,7 @@ require.def("ace/lib/lang", function() {
}; };
this.objectReverse = function(obj, keySplit) { lang.objectReverse = function(obj, keySplit) {
var i, j, l, key, var i, j, l, key,
ret = {}; ret = {};
for (i in obj) { for (i in obj) {