OpenLayers OpenLayers

Changeset 1144

Show
Ignore:
Timestamp:
08/09/06 00:36:39 (2 years ago)
Author:
euzuro
Message:

hash -> hashtable and Hash -> Object -- let there be no confusion, we are *not* using prototype

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/openlayers/lib/OpenLayers/Control.js

    r961 r1144  
    2222     * @constructor 
    2323     *  
    24      * @param {Hash} options 
     24     * @param {Object} options 
    2525     */ 
    2626    initialize: function (options) { 

  • trunk/openlayers/lib/OpenLayers/Events.js

    r1142 r1144  
    1717    ], 
    1818 
    19     /** @type Hash of Array(Function): events listener functions */ 
     19    /** Hashtable of Array(Function): events listener functions  
     20     * @type Object */ 
    2021    listeners: null, 
    2122 

  • trunk/openlayers/lib/OpenLayers/Layer.js

    r1137 r1144  
    6161     *  
    6262     * @param {String} name 
    63      * @param {Object} options Hash of extra options to tag onto the layer 
     63     * @param {Object} options Hashtable of extra options to tag onto the layer 
    6464     */ 
    6565    initialize: function(name, options) { 
    …… 
    127127     
    128128   /** 
    129     * @param {Hash} newOptions 
     129    * @param {Object} newOptions 
    130130    */ 
    131131    addOptions: function (newOptions) { 

  • trunk/openlayers/lib/OpenLayers/Layer/Grid.js

    r1141 r1144  
    3030     * @param {String} url 
    3131     * @param {Object} params 
    32      * @param {Object} options Hash of extra options to tag onto the layer 
     32     * @param {Object} options Hashtable of extra options to tag onto the layer 
    3333    */ 
    3434    initialize: function(name, url, params, options) { 

  • trunk/openlayers/lib/OpenLayers/Layer/HTTPRequest.js

    r1143 r1144  
    1515    url: null, 
    1616 
    17     /** @type Hash */ 
     17    /** Hashtable of key/value parameters 
     18     * @type Object */ 
    1819    params: null, 
    1920 
    …… 
    2324     * @param {String} name 
    2425     * @param {String} url 
    25      * @param {hash} params 
    26      * @param {Object} options Hash of extra options to tag onto the layer 
     26     * @param {Object} params 
     27     * @param {Object} options Hashtable of extra options to tag onto the layer 
    2728     */ 
    2829    initialize: function(name, url, params, options) { 
    …… 
    115116        var requestString = url;         
    116117 
    117         // create a new params hash with all the layer params and the  
     118        // create a new params hashtable with all the layer params and the  
    118119        // new params together. then convert to string 
    119120        var allParams = Object.extend(new Object(), this.params); 

  • trunk/openlayers/lib/OpenLayers/Layer/Markers.js

    r1136 r1144  
    2424    * 
    2525    * @param {String} name 
    26     * @param {Object} options Hash of extra options to tag onto the layer 
     26    * @param {Object} options Hashtable of extra options to tag onto the layer 
    2727    */ 
    2828    initialize: function(name, options) { 

  • trunk/openlayers/lib/OpenLayers/Layer/Text.js

    r1136 r1144  
    1717    isBaseLayer: false, 
    1818     
    19     /** store url of text file - this should be specified in the "options" hash 
     19    /** store url of text file - this should be specified in the  
     20     *   "options" hashtable 
    2021    * @type str */ 
    2122    location:null, 
    …… 
    3233    * @param {String} name 
    3334    * @param {String} location 
    34     * @param {Object} options Hash of extra options to tag onto the layer 
     35    * @param {Object} options Hashtable of extra options to tag onto the layer 
    3536    */ 
    3637    initialize: function(name, options) { 

  • trunk/openlayers/lib/OpenLayers/Layer/WFS.js

    r1143 r1144  
    3131    tileClass: OpenLayers.Tile.WFS, 
    3232 
    33     /** @final @type hash */ 
     33    /** Hashtable of default key/value parameters 
     34     * @final @type Object */ 
    3435    DEFAULT_PARAMS: { service: "WFS", 
    3536                      version: "1.0.0", 
    …… 
    4344    * @param {String} name 
    4445    * @param {String} url 
    45     * @param {hash} params 
    46     * @param {Object} options Hash of extra options to tag onto the layer 
     46    * @param {Object} params 
     47    * @param {Object} options Hashtable of extra options to tag onto the layer 
    4748    */ 
    4849    initialize: function(name, url, params, options) { 
    …… 
    157158     * Once params have been changed, we will need to re-init our tiles 
    158159     *  
    159      * @param {Object} params Hash of new params to use 
     160     * @param {Object} params Hashtable of new params to use 
    160161     */ 
    161162    mergeNewParams:function(params) { 

  • trunk/openlayers/lib/OpenLayers/Layer/WMS.js

    r1143 r1144  
    1010  Object.extend( new OpenLayers.Layer.Grid(), { 
    1111 
    12     /** @final @type hash */ 
     12    /** Hashtable of default parameter key/value pairs  
     13     * @final @type Object */ 
    1314    DEFAULT_PARAMS: { service: "WMS", 
    1415                      version: "1.1.1", 
    …… 
    3233    * @param {String} name 
    3334    * @param {String} url 
    34     * @param {hash} params 
    35     * @param {Object} options Hash of extra options to tag onto the layer 
     35    * @param {Object} params 
     36    * @param {Object} options Hashtable of extra options to tag onto the layer 
    3637    */ 
    3738    initialize: function(name, url, params, options) { 
    …… 
    112113     * Once params have been changed, we will need to re-init our tiles 
    113114     *  
    114      * @param {Object} params Hash of new params to use 
     115     * @param {Object} params Hashtable of new params to use 
    115116     */ 
    116117    mergeNewParams:function(params) { 

  • trunk/openlayers/lib/OpenLayers/Layer/WMS/Untiled.js

    r1143 r1144  
    1212  Object.extend( new OpenLayers.Layer.HTTPRequest(), { 
    1313 
    14     /** @final @type hash */ 
     14    /** Hashtable of default parameter key/value pairs 
     15     * @final @type Object */ 
    1516    DEFAULT_PARAMS: { service: "WMS", 
    1617                      version: "1.1.1", 
    …… 
    3637    * @param {String} name 
    3738    * @param {String} url 
    38     * @param {hash} params 
     39    * @param {Object} params 
    3940    */ 
    4041    initialize: function(name, url, params) { 

  • trunk/openlayers/lib/OpenLayers/Map.js

    r1096 r1144  
    1515    /** base z-indexes for different classes of thing  
    1616     *  
    17      * @type Hash 
     17     * @type Object 
    1818     */ 
    1919    Z_INDEX_BASE: { Layer: 100, Popup: 200, Control: 1000 }, 
    …… 
    110110     *  
    111111     * @param {DOMElement} div 
    112      * @param {Object} options Hash of extra options to tag onto the map 
     112     * @param {Object} options Hashtable of extra options to tag onto the map 
    113113     */     
    114114    initialize: function (div, options) { 
    …… 
    192192     * @private 
    193193     *  
    194      * @param {Object} options Hash of options to tag to the map 
     194     * @param {Object} options Hashtable of options to tag to the map 
    195195     */ 
    196196    setOptions: function(options) { 

  • trunk/openlayers/lib/OpenLayers/Util.js

    r1137 r1144  
    905905 
    906906 
    907 /** Creates a new hash and copies over all the keys from the  
     907/** Creates a new hashtable and copies over all the keys from the  
    908908*    passed-in object, but storing them under an uppercased 
    909909*    version of the key at which they were stored. 
    …… 
    922922}; 
    923923 
    924 /** Takes a hash and copies any keys that don't exist from 
    925 *   another hash, by analogy with Object.extend() from 
     924/** Takes a hashtable and copies any keys that don't exist from 
     925*   another hashtable, by analogy with Object.extend() from 
    926926*   Prototype.js. 
    927927* 

  • trunk/openlayers/tests/test_Layer_WMS.html

    r1138 r1144  
    124124        newParams.CHICKPEAS = 151; 
    125125 
    126         t.eq( layer.params.CHICKPEAS, "image/png", "mergeNewParams() makes clean copy of hash"); 
     126        t.eq( layer.params.CHICKPEAS, "image/png", "mergeNewParams() makes clean copy of hashtable"); 
    127127    } 
    128128 

  • trunk/openlayers/tests/test_Map.html

    r1139 r1144  
    6363        t.plan(2); 
    6464        map = new OpenLayers.Map($('map'), {maxZoomLevel: 5, maxResolution: 3.14159}); 
    65         t.eq( map.maxZoomLevel, 5, "map.maxZoomLevel set correctly via options hash" ); 
    66         t.eq( map.maxResolution, 3.14159, "map.maxResolution set correctly via options hash" ); 
     65        t.eq( map.maxZoomLevel, 5, "map.maxZoomLevel set correctly via options hashtable" ); 
     66        t.eq( map.maxResolution, 3.14159, "map.maxResolution set correctly via options hashtable" ); 
    6767    } 
    6868    function test_05_Map_center(t) {