diff --git a/documentation/builtin_drag.html b/documentation/builtin_drag.html index 24d9fc5..ef5a6a6 100644 --- a/documentation/builtin_drag.html +++ b/documentation/builtin_drag.html @@ -89,7 +89,7 @@

planetaryjs.plugins.drag([config])

Valid keys for config are:

JavaScript
diff --git a/documentation/builtin_zoom.html b/documentation/builtin_zoom.html index f11a9fa..d840642 100644 --- a/documentation/builtin_zoom.html +++ b/documentation/builtin_zoom.html @@ -91,7 +91,7 @@
JavaScript
diff --git a/examples/quake.html b/examples/quake.html index ece12da..663088c 100644 --- a/examples/quake.html +++ b/examples/quake.html @@ -82,10 +82,10 @@ })); planet.loadPlugin(planetaryjs.plugins.drag({ onDragStart: function() { - planet.plugins.autorotate.pause(); + this.plugins.autorotate.pause(); }, onDragEnd: function() { - planet.plugins.autorotate.resume(); + this.plugins.autorotate.resume(); } })); planet.loadPlugin(autorotate(5)); diff --git a/examples/quake/quake.js b/examples/quake/quake.js index c2d073b..362d1ed 100644 --- a/examples/quake/quake.js +++ b/examples/quake/quake.js @@ -18,10 +18,10 @@ })); planet.loadPlugin(planetaryjs.plugins.drag({ onDragStart: function() { - planet.plugins.autorotate.pause(); + this.plugins.autorotate.pause(); }, onDragEnd: function() { - planet.plugins.autorotate.resume(); + this.plugins.autorotate.resume(); } })); planet.loadPlugin(autorotate(5)); diff --git a/examples/rotating.html b/examples/rotating.html index d648714..3b6cd58 100644 --- a/examples/rotating.html +++ b/examples/rotating.html @@ -78,12 +78,12 @@ // Dragging the globe should pause the // automatic rotation until we release the mouse. onDragStart: function() { - globe.plugins.autorotate.pause(); + this.plugins.autorotate.pause(); }, onDragEnd: function() { - globe.plugins.autorotate.resume(); + this.plugins.autorotate.resume(); } - })) + })); // Set up the globe's initial scale, offset, and rotation. globe.projection.scale(175).translate([175, 175]).rotate([0, -10, 0]); diff --git a/examples/rotating.js b/examples/rotating.js index ecab566..5fae10e 100644 --- a/examples/rotating.js +++ b/examples/rotating.js @@ -21,12 +21,12 @@ // Dragging the globe should pause the // automatic rotation until we release the mouse. onDragStart: function() { - globe.plugins.autorotate.pause(); + this.plugins.autorotate.pause(); }, onDragEnd: function() { - globe.plugins.autorotate.resume(); + this.plugins.autorotate.resume(); } - })) + })); // Set up the globe's initial scale, offset, and rotation. globe.projection.scale(175).translate([175, 175]).rotate([0, -10, 0]); diff --git a/js/homepage.js b/js/homepage.js index b05b3d7..f88cefd 100644 --- a/js/homepage.js +++ b/js/homepage.js @@ -20,11 +20,11 @@ globe.loadPlugin(planetaryjs.plugins.drag({ // Dragging the globe should pause the // automatic rotation until we release the mouse. - onDragStart: function() { - globe.plugins.autorotate.pause(); + onDragStart: function(planet) { + this.plugins.autorotate.pause(); }, - onDragEnd: function() { - globe.plugins.autorotate.resume(); + onDragEnd: function(planet) { + this.plugins.autorotate.resume(); } })) // Set up the globe's initial scale, offset, and rotation. diff --git a/js/lib/planetaryjs.min.js b/js/lib/planetaryjs.min.js index 33b50d1..817d55b 100644 --- a/js/lib/planetaryjs.min.js +++ b/js/lib/planetaryjs.min.js @@ -1,2 +1,2 @@ /*! Planetary.js 1.0.0-rc.1 | (c) 2013 Brandon Tilley | Released under MIT License */ -!function(n,t){"function"==typeof define&&define.amd?define(["d3","topojson"],t):"object"==typeof exports?module.exports=t(require("d3"),require("topojson")):n.planetaryjs=t(n.d3,n.topojson,n)}(this,function(n,t,o){"use strict";var i=null;o&&(i=o.planetaryjs);var e=[],r=function(t,o,i){n.timer(function(){t.context.clearRect(0,0,o.width,o.height);for(var n=0;n=o.onInit.length?r(n,t,o):e(l)};e(l)}else r(n,t,o)},u=function(n,t,o,i){l(n,o),n.canvas=t,n.context=t.getContext("2d"),a(n,t,i)},c={plugins:{},noConflict:function(){return o.planetaryjs=i,c},loadPlugin:function(n){e.push(n)},planet:function(){var t=[],o={onInit:[],onDraw:[]},i={plugins:{},draw:function(n){u(i,n,t,o)},onInit:function(n){o.onInit.push(n)},onDraw:function(n){o.onDraw.push(n)},loadPlugin:function(n){t.push(n)},withSavedContext:function(n){if(!this.context)throw new Error("No canvas to fetch context for");this.context.save(),n(this.context),this.context.restore()}};return i.projection=n.geo.orthographic().clipAngle(90).precision(0),i.path=n.geo.path().projection(i.projection),i}};return c.plugins.topojson=function(t){return function(o){o.plugins.topojson={},o.onInit(function(i){if(t.world)o.plugins.topojson.world=t.world,setTimeout(i,0);else{var e=t.file||"world-110m.json";n.json(e,function(n,t){if(n)throw new Error("Could not load JSON "+e);o.plugins.topojson.world=t,i()})}})}},c.plugins.oceans=function(n){return function(t){t.onDraw(function(){t.withSavedContext(function(o){o.beginPath(),t.path.context(o)({type:"Sphere"}),o.fillStyle=n.fill||"black",o.fill()})})}},c.plugins.land=function(n){return function(o){var i=null;o.onInit(function(){var n=o.plugins.topojson.world;i=t.feature(n,n.objects.land)}),o.onDraw(function(){o.withSavedContext(function(t){t.beginPath(),o.path.context(t)(i),n.fill!==!1&&(t.fillStyle=n.fill||"white",t.fill()),n.stroke&&(n.lineWidth&&(t.lineWidth=n.lineWidth),t.strokeStyle=n.stroke,t.stroke())})})}},c.plugins.borders=function(n){return function(o){var i=null,e={internal:function(n,t){return n.id!==t.id},external:function(n,t){return n.id===t.id},both:function(){return!0}};o.onInit(function(){var r=o.plugins.topojson.world,l=r.objects.countries,a=n.type||"internal";i=t.mesh(r,l,e[a])}),o.onDraw(function(){o.withSavedContext(function(t){t.beginPath(),o.path.context(t)(i),t.strokeStyle=n.stroke||"gray",n.lineWidth&&(t.lineWidth=n.lineWidth),t.stroke()})})}},c.plugins.earth=function(n){n=n||{};var t=n.topojson||{},o=n.oceans||{},i=n.land||{},e=n.borders||{};return function(n){c.plugins.topojson(t)(n),c.plugins.oceans(o)(n),c.plugins.land(i)(n),c.plugins.borders(e)(n)}},c.plugins.pings=function(t){var o=[];t=t||{};var i=function(n,i,e){e=e||{},e.color=e.color||t.color||"white",e.angle=e.angle||t.angle||5,e.ttl=e.ttl||t.ttl||2e3;var r={time:new Date,options:e};t.latitudeFirst?(r.lat=n,r.lng=i):(r.lng=n,r.lat=i),o.push(r)},e=function(n,t,i){for(var e=[],l=0;l90&&(e[1]=90),e[1]<-90&&(e[1]=-90),e[0]>=180&&(e[0]-=360),t.projection.rotate(e),l()});n.select(t.canvas).call(o)})}},c}); \ No newline at end of file +!function(n,t){"function"==typeof define&&define.amd?define(["d3","topojson"],t):"object"==typeof exports?module.exports=t(require("d3"),require("topojson")):n.planetaryjs=t(n.d3,n.topojson,n)}(this,function(n,t,o){"use strict";var i=null;o&&(i=o.planetaryjs);var e=[],r=function(t,o,i){n.timer(function(){t.context.clearRect(0,0,o.width,o.height);for(var n=0;n=0;o--)t.unshift(e[o]);for(0===t.length&&(u.plugins.earth&&n.loadPlugin(u.plugins.earth()),u.plugins.pings&&n.loadPlugin(u.plugins.pings())),o=0;o=o.onInit.length?r(n,t,o):e(l)};e(l)}else r(n,t,o)},c=function(n,t,o,i){l(n,o),n.canvas=t,n.context=t.getContext("2d"),a(n,t,i)},u={plugins:{},noConflict:function(){return o.planetaryjs=i,u},loadPlugin:function(n){e.push(n)},planet:function(){var t=[],o={onInit:[],onDraw:[]},i={plugins:{},draw:function(n){c(i,n,t,o)},onInit:function(n){o.onInit.push(n)},onDraw:function(n){o.onDraw.push(n)},loadPlugin:function(n){t.push(n)},withSavedContext:function(n){if(!this.context)throw new Error("No canvas to fetch context for");this.context.save(),n(this.context),this.context.restore()}};return i.projection=n.geo.orthographic().clipAngle(90).precision(0),i.path=n.geo.path().projection(i.projection),i}};return u.plugins.topojson=function(t){return function(o){o.plugins.topojson={},o.onInit(function(i){if(t.world)o.plugins.topojson.world=t.world,setTimeout(i,0);else{var e=t.file||"world-110m.json";n.json(e,function(n,t){if(n)throw new Error("Could not load JSON "+e);o.plugins.topojson.world=t,i()})}})}},u.plugins.oceans=function(n){return function(t){t.onDraw(function(){t.withSavedContext(function(o){o.beginPath(),t.path.context(o)({type:"Sphere"}),o.fillStyle=n.fill||"black",o.fill()})})}},u.plugins.land=function(n){return function(o){var i=null;o.onInit(function(){var n=o.plugins.topojson.world;i=t.feature(n,n.objects.land)}),o.onDraw(function(){o.withSavedContext(function(t){t.beginPath(),o.path.context(t)(i),n.fill!==!1&&(t.fillStyle=n.fill||"white",t.fill()),n.stroke&&(n.lineWidth&&(t.lineWidth=n.lineWidth),t.strokeStyle=n.stroke,t.stroke())})})}},u.plugins.borders=function(n){return function(o){var i=null,e={internal:function(n,t){return n.id!==t.id},external:function(n,t){return n.id===t.id},both:function(){return!0}};o.onInit(function(){var r=o.plugins.topojson.world,l=r.objects.countries,a=n.type||"internal";i=t.mesh(r,l,e[a])}),o.onDraw(function(){o.withSavedContext(function(t){t.beginPath(),o.path.context(t)(i),t.strokeStyle=n.stroke||"gray",n.lineWidth&&(t.lineWidth=n.lineWidth),t.stroke()})})}},u.plugins.earth=function(n){n=n||{};var t=n.topojson||{},o=n.oceans||{},i=n.land||{},e=n.borders||{};return function(n){u.plugins.topojson(t)(n),u.plugins.oceans(o)(n),u.plugins.land(i)(n),u.plugins.borders(e)(n)}},u.plugins.pings=function(t){var o=[];t=t||{};var i=function(n,i,e){e=e||{},e.color=e.color||t.color||"white",e.angle=e.angle||t.angle||5,e.ttl=e.ttl||t.ttl||2e3;var r={time:new Date,options:e};t.latitudeFirst?(r.lat=n,r.lng=i):(r.lng=n,r.lat=i),o.push(r)},e=function(n,t,i){for(var e=[],l=0;l90&&(e[1]=90),e[1]<-90&&(e[1]=-90),e[0]>=180&&(e[0]-=360),t.projection.rotate(e),l.call(t)});n.select(t.canvas).call(o)})}},u}); \ No newline at end of file