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

replace lang.arrayIndexOf with ES5 indexOf()

Browse source
This commit is contained in:
Fabian Jakobs 2010-12-15 11:59:05 +01:00
commit 19eecaaefc
4 changed files with 42 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/pilot/dom.js
View file

@ -37,8 +37,6 @@
define(function(require, exports, module) {
var lang = require("pilot/lang");
exports.setText = function(elem, text) {
if (elem.innerText !== undefined) {
elem.innerText = text;
@ -50,7 +48,7 @@ exports.setText = function(elem, text) {
exports.hasCssClass = function(el, name) {
var classes = el.className.split(/\s+/g);
return lang.arrayIndexOf(classes, name) !== -1;
return classes.indexOf(name) !== -1;
};
exports.addCssClass = function(el, name) {
@ -62,7 +60,7 @@ exports.addCssClass = function(el, name) {
exports.removeCssClass = function(el, name) {
var classes = el.className.split(/\s+/g);
while (true) {
var index = lang.arrayIndexOf(classes, name);
var index = classes.indexOf(name);
if (index == -1) {
break;
}

6
plugins/pilot/event_emitter.js
View file

@ -37,8 +37,6 @@
define(function(require, exports, module) {
var lang = require('pilot/lang');
var EventEmitter = {};
EventEmitter._dispatchEvent = function(eventName, e) {
@ -63,7 +61,7 @@ EventEmitter.addEventListener = function(eventName, callback) {
if (!listeners) {
var listeners = this._eventRegistry[eventName] = [];
}
if (lang.arrayIndexOf(listeners, callback) == -1) {
if (listeners.indexOf(callback) == -1) {
listeners.push(callback);
}
};
@ -75,7 +73,7 @@ EventEmitter.removeEventListener = function(eventName, callback) {
if (!listeners) {
return;
}
var index = lang.arrayIndexOf(listeners, callback);
var index = listeners.indexOf(callback);
if (index !== -1) {
listeners.splice(index, 1);
}

38
plugins/pilot/fixoldbrowsers.js
View file

@ -49,6 +49,44 @@ if (!Array.isArray) {
};
}
// from MDC
// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
if (!Array.prototype.indexOf)
{
Array.prototype.indexOf = function(searchElement /*, fromIndex */)
{
if (this === void 0 || this === null)
throw new TypeError();
var t = Object(this);
var len = t.length >>> 0;
if (len === 0)
return -1;
var n = 0;
if (arguments.length > 0) {
n = Number(arguments[1]);
if (n !== n)
n = 0;
else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0))
n = (n > 0 || -1) * Math.floor(Math.abs(n));
}
if (n >= len)
return -1;
var k = n >= 0
? n
: Math.max(len - Math.abs(n), 0);
for (; k < len; k++) {
if (k in t && t[k] === searchElement)
return k;
}
return -1;
};
}
/**
* Retrieves the list of keys on an object.
*/

16
plugins/pilot/lang.js
View file

@ -45,22 +45,6 @@ exports.stringRepeat = function (string, count) {
return new Array(count + 1).join(string);
};
if (Array.prototype.indexOf) {
exports.arrayIndexOf = function(array, searchElement) {
return array.indexOf(searchElement);
};
}
else {
exports.arrayIndexOf = function(array, searchElement) {
for (var i=0; i<array.length; i++) {
if (array[i] == searchElement) {
return i;
}
}
return -1;
};
}
exports.copyObject = function(obj) {
var copy = {};
for (var key in obj) {