gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-05 11:15:46 +01:00
Code Issues Projects Releases Wiki Activity

Camel-case array#{iteritems,itervalues}.

Browse Source
This commit is contained in:
Doug Kearns
2010-09-26 11:54:28 +10:00
parent 883c0c367d
commit 87b29aa609
11 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/modules/base.jsm
View File

@@ -342,7 +342,7 @@ set.remove = function (set, key) {
*/
function iter(obj) {
if (isinstance(obj, [Ci.nsIDOMHTMLCollection, Ci.nsIDOMNodeList]))
return array.iteritems(obj);
return array.iterItems(obj);
if (obj instanceof Ci.nsIDOMNamedNodeMap)
return (function () {
for (let i = 0; i < obj.length; i++)
@@ -899,7 +899,7 @@ const array = Class("array", Array, {
return {
__proto__: ary,
__iterator__: function () this.iteritems(),
__iterator__: function () this.iterItems(),
__noSuchMethod__: function (meth, args) {
var res = array[meth].apply(null, [this.array].concat(args));
if (isArray(res))
@@ -966,7 +966,7 @@ const array = Class("array", Array, {
* @param {Array} ary
* @returns {Iterator(Object)}
*/
itervalues: function itervalues(ary) {
iterValues: function iterValues(ary) {
let length = ary.length;
for (let i = 0; i < length; i++)
yield ary[i];
@@ -978,7 +978,7 @@ const array = Class("array", Array, {
* @param {Array} ary
* @returns {Iterator([{number}, {Object}])}
*/
iteritems: function iteritems(ary) {
iterItems: function iterItems(ary) {
let length = ary.length;
for (let i = 0; i < length; i++)
yield [i, ary[i]];

2
common/modules/template.jsm
View File

@@ -20,7 +20,7 @@ const Template = Module("Template", {
map: function map(iter, func, sep, interruptable) {
if (iter.length) // FIXME: Kludge?
iter = array.itervalues(iter);
iter = array.iterValues(iter);
let ret = <></>;
let n = 0;
for each (let i in Iterator(iter)) {

4
common/modules/util.jsm
View File

@@ -548,7 +548,7 @@ const Util = Module("Util", {
if (color)
return <span highlight="HelpXMLBlock"><span highlight="HelpXMLTagStart">&lt;{
namespaced(elem)} {
template.map(array.itervalues(elem.attributes),
template.map(array.iterValues(elem.attributes),
function (attr)
<span highlight="HelpXMLAttribute">{namespaced(attr)}</span> +
<span highlight="HelpXMLString">{attr.value}</span>,
@@ -560,7 +560,7 @@ const Util = Module("Util", {
let tag = "<" + [namespaced(elem)].concat(
[namespaced(a) + "=" + template.highlight(a.value, true)
for ([i, a] in array.iteritems(elem.attributes))]).join(" ");
for ([i, a] in array.iterItems(elem.attributes))]).join(" ");
return tag + (hasChildren ? "/>" : ">...</" + namespaced(elem) + ">");
}
catch (e) {