Skip to content

Commit

Permalink
Added in Array.prototype.indexOf es5 shim.
Browse files Browse the repository at this point in the history
  • Loading branch information
johnbeech committed Jul 27, 2015
1 parent a637c5c commit 0c9857d
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 3 deletions.
5 changes: 4 additions & 1 deletion static/script/devices/sanitisers/whitelisted.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
* Please contact us for an alternative licence
*/
require.def('antie/devices/sanitisers/whitelisted',
['antie/devices/sanitiser'],
[
'antie/devices/sanitiser',
'antie/lib/array.indexof' // Adds Array.prototype.indexOf()
],
function (Sanitiser) {

'use strict';
Expand Down
6 changes: 5 additions & 1 deletion static/script/events/event.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@
*/

require.def('antie/events/event',
['antie/class', 'antie/runtimecontext'],
[
'antie/class',
'antie/runtimecontext',
'antie/lib/array.indexof' // Adds Array.prototype.indexOf()
],
function(Class, RuntimeContext) {
'use strict';

Expand Down
72 changes: 72 additions & 0 deletions static/script/lib/array.indexof.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
require.def('antie/lib/array.indexof', function() {

// From: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf
// License: CC-BY-SA 2.5. http://creativecommons.org/licenses/by-sa/2.5/
// Changes: No changes from original

// Production steps of ECMA-262, Edition 5, 15.4.4.14
// Reference: http://es5.github.io/#x15.4.4.14
if (!Array.prototype.indexOf) {
Array.prototype.indexOf = function(searchElement, fromIndex) {

var k;

// 1. Let O be the result of calling ToObject passing
// the this value as the argument.
if (this == null) {
throw new TypeError('"this" is null or not defined');
}

var O = Object(this);

// 2. Let lenValue be the result of calling the Get
// internal method of O with the argument "length".
// 3. Let len be ToUint32(lenValue).
var len = O.length >>> 0;

// 4. If len is 0, return -1.
if (len === 0) {
return -1;
}

// 5. If argument fromIndex was passed let n be
// ToInteger(fromIndex); else let n be 0.
var n = +fromIndex || 0;

if (Math.abs(n) === Infinity) {
n = 0;
}

// 6. If n >= len, return -1.
if (n >= len) {
return -1;
}

// 7. If n >= 0, then Let k be n.
// 8. Else, n<0, Let k be len - abs(n).
// If k is less than 0, then let k be 0.
k = Math.max(n >= 0 ? n : len - Math.abs(n), 0);

// 9. Repeat, while k < len
while (k < len) {
// a. Let Pk be ToString(k).
// This is implicit for LHS operands of the in operator
// b. Let kPresent be the result of calling the
// HasProperty internal method of O with argument Pk.
// This step can be combined with c
// c. If kPresent is true, then
// i. Let elementK be the result of calling the Get
// internal method of O with the argument ToString(k).
// ii. Let same be the result of applying the
// Strict Equality Comparison Algorithm to
// searchElement and elementK.
// iii. If same is true, return k.
if (k in O && O[k] === searchElement) {
return k;
}
k++;
}
return -1;
};
}
});
3 changes: 2 additions & 1 deletion static/script/widgets/widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
require.def('antie/widgets/widget',
[
'antie/class',
'antie/runtimecontext'
'antie/runtimecontext',
'antie/lib/array.indexof' // Adds Array.prototype.indexOf()
],
function(Class, RuntimeContext) {
'use strict';
Expand Down

0 comments on commit 0c9857d

Please sign in to comment.