Rename ol/objectutil.js to ol/obj.js

test/spec/ol/feature.test.js

@@ -81,7 +81,7 @@ describe('ol.Feature', function() {
     it('is empty by default', function() {
       var feature = new ol.Feature();
       var properties = feature.getProperties();
-      expect(ol.object.isEmpty(properties)).to.be(true);
+      expect(ol.obj.isEmpty(properties)).to.be(true);
     });
 
   });
@@ -464,5 +464,5 @@ describe('ol.Feature.createStyleFunction()', function() {
 
 goog.require('ol.Feature');
 goog.require('ol.geom.Point');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.style.Style');

test/spec/ol/layer/group.test.js

@@ -364,9 +364,9 @@ describe('ol.layer.Group', function() {
       expect(layerStatesArray[0]).to.eql(layer1.getLayerState());
 
       // layer state should match except for layer reference
-      var layerState = ol.object.assign({}, layerStatesArray[0]);
+      var layerState = ol.obj.assign({}, layerStatesArray[0]);
       delete layerState.layer;
-      var groupState = ol.object.assign({}, layerGroup.getLayerState());
+      var groupState = ol.obj.assign({}, layerGroup.getLayerState());
       delete groupState.layer;
       expect(layerState).to.eql(groupState);
 
@@ -413,14 +413,14 @@ describe('ol.layer.Group', function() {
       var groupState, layerState;
 
       // layer state should match except for layer reference
-      layerState = ol.object.assign({}, layerStatesArray[0]);
+      layerState = ol.obj.assign({}, layerStatesArray[0]);
       delete layerState.layer;
-      groupState = ol.object.assign({}, layerGroup.getLayerState());
+      groupState = ol.obj.assign({}, layerGroup.getLayerState());
       delete groupState.layer;
       expect(layerState).to.eql(groupState);
 
       // layer state should be transformed (and we ignore layer reference)
-      layerState = ol.object.assign({}, layerStatesArray[1]);
+      layerState = ol.obj.assign({}, layerStatesArray[1]);
       delete layerState.layer;
       expect(layerState).to.eql({
         opacity: 0.25,
@@ -495,6 +495,6 @@ goog.require('ol.events');
 goog.require('ol.extent');
 goog.require('ol.layer.Group');
 goog.require('ol.layer.Layer');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.renderer.Map');
 goog.require('ol.source.Source');

test/spec/ol/objectutil.test.js

@@ -1,10 +1,10 @@
 goog.provide('ol.test.object');
 
-describe('ol.object.assign()', function() {
+describe('ol.obj.assign()', function() {
 
   it('is an alias for Object.assign() where available', function() {
     if (typeof Object.assign === 'function') {
-      expect(ol.object.assign).to.be(Object.assign);
+      expect(ol.obj.assign).to.be(Object.assign);
     }
   });
 
@@ -20,7 +20,7 @@ describe('ol.object.assign()', function() {
       targetProp1: 'targetValue1'
     };
 
-    var assigned = ol.object.assign(target, source);
+    var assigned = ol.obj.assign(target, source);
     expect(assigned).to.be(target);
     expect(assigned.sourceProp1).to.be('sourceValue1');
     expect(assigned.sourceProp2).to.be('sourceValue2');
@@ -30,11 +30,11 @@ describe('ol.object.assign()', function() {
 
 });
 
-describe('ol.object.clear()', function() {
+describe('ol.obj.clear()', function() {
 
   it('removes all properties from an object', function() {
-    var clear = ol.object.clear;
-    var isEmpty = ol.object.isEmpty;
+    var clear = ol.obj.clear;
+    var isEmpty = ol.obj.isEmpty;
     expect(isEmpty(clear({foo: 'bar'}))).to.be(true);
     expect(isEmpty(clear({foo: 'bar', num: 42}))).to.be(true);
     expect(isEmpty(clear({}))).to.be(true);
@@ -43,24 +43,24 @@ describe('ol.object.clear()', function() {
 
 });
 
-describe('ol.object.getValues()', function() {
+describe('ol.obj.getValues()', function() {
 
   it('gets a list of property values from an object', function() {
-    expect(ol.object.getValues({foo: 'bar', num: 42}).sort()).to.eql([42, 'bar']);
-    expect(ol.object.getValues(null)).to.eql([]);
+    expect(ol.obj.getValues({foo: 'bar', num: 42}).sort()).to.eql([42, 'bar']);
+    expect(ol.obj.getValues(null)).to.eql([]);
   });
 
 });
 
-describe('ol.object.isEmpty()', function() {
+describe('ol.obj.isEmpty()', function() {
 
   it('checks if an object has any properties', function() {
-    expect(ol.object.isEmpty({})).to.be(true);
-    expect(ol.object.isEmpty(null)).to.be(true);
-    expect(ol.object.isEmpty({foo: 'bar'})).to.be(false);
-    expect(ol.object.isEmpty({foo: false})).to.be(false);
+    expect(ol.obj.isEmpty({})).to.be(true);
+    expect(ol.obj.isEmpty(null)).to.be(true);
+    expect(ol.obj.isEmpty({foo: 'bar'})).to.be(false);
+    expect(ol.obj.isEmpty({foo: false})).to.be(false);
   });
 
 });
 
-goog.require('ol.object');
+goog.require('ol.obj');

test/spec/ol/pointer/touchsource.test.js

@@ -119,7 +119,7 @@ describe('ol.pointer.TouchSource', function() {
     touches = touches !== undefined ? touches : changedTouches;
 
     var event = new ol.events.Event(type);
-    ol.object.assign(event, {
+    ol.obj.assign(event, {
       touches: touches,
       changedTouches: changedTouches
     });
@@ -131,7 +131,7 @@ goog.require('ol.events');
 goog.require('ol.events.Event');
 goog.require('ol.events.EventTarget');
 goog.require('ol.has');
-goog.require('ol.object');
+goog.require('ol.obj');
 goog.require('ol.pointer.PointerEvent');
 goog.require('ol.pointer.PointerEventHandler');
 goog.require('ol.pointer.TouchSource');