Toggle key UI via options

0.2
Robin Hawkes 2015-03-03 21:11:40 +00:00
rodzic 41db7fc7e7
commit 0682f20f95
3 zmienionych plików z 42 dodań i 18 usunięć

Wyświetl plik

@ -8702,6 +8702,7 @@ if (typeof window === undefined) {
_.defaults(self.options, {
colourRange: ["#ffffe5","#f7fcb9","#d9f0a3","#addd8e","#78c679","#41ab5d","#238443","#006837","#004529"],
layer: 10,
keyUI: true,
name: "Choropleth"
});
@ -8716,10 +8717,8 @@ if (typeof window === undefined) {
self.name = self.options.name;
// Set up key UI
self.keyUI = new VIZI.KeyUIColourScale(self);
self.world;
self.keyUI;
};
VIZI.BlueprintOutputChoropleth.prototype = Object.create( VIZI.BlueprintOutput.prototype );
@ -8728,6 +8727,11 @@ if (typeof window === undefined) {
VIZI.BlueprintOutputChoropleth.prototype.init = function() {
var self = this;
// Set up key UI
if (self.options.keyUI) {
self.keyUI = new VIZI.KeyUIColourScale(self);
}
self.emit("initialised");
};
@ -8783,8 +8787,10 @@ if (typeof window === undefined) {
}
});
self.keyUI.scale = keyScale;
self.keyUI.onChange();
if (self.keyUI) {
self.keyUI.scale = keyScale;
self.keyUI.onChange();
}
}
var combinedGeom = new THREE.Geometry();
@ -8859,12 +8865,18 @@ if (typeof window === undefined) {
VIZI.BlueprintOutputChoropleth.prototype.onHide = function() {
var self = this;
self.keyUI.onHide();
if (self.keyUI) {
self.keyUI.onHide();
}
};
VIZI.BlueprintOutputChoropleth.prototype.onShow = function() {
var self = this;
self.keyUI.onShow();
if (self.keyUI) {
self.keyUI.onShow();
}
};
VIZI.BlueprintOutputChoropleth.prototype.onAdd = function(world) {

8
build/vizi.min.js vendored

File diff suppressed because one or more lines are too long

Wyświetl plik

@ -22,6 +22,7 @@
_.defaults(self.options, {
colourRange: ["#ffffe5","#f7fcb9","#d9f0a3","#addd8e","#78c679","#41ab5d","#238443","#006837","#004529"],
layer: 10,
keyUI: true,
name: "Choropleth"
});
@ -36,10 +37,8 @@
self.name = self.options.name;
// Set up key UI
self.keyUI = new VIZI.KeyUIColourScale(self);
self.world;
self.keyUI;
};
VIZI.BlueprintOutputChoropleth.prototype = Object.create( VIZI.BlueprintOutput.prototype );
@ -48,6 +47,11 @@
VIZI.BlueprintOutputChoropleth.prototype.init = function() {
var self = this;
// Set up key UI
if (self.options.keyUI) {
self.keyUI = new VIZI.KeyUIColourScale(self);
}
self.emit("initialised");
};
@ -103,8 +107,10 @@
}
});
self.keyUI.scale = keyScale;
self.keyUI.onChange();
if (self.keyUI) {
self.keyUI.scale = keyScale;
self.keyUI.onChange();
}
}
var combinedGeom = new THREE.Geometry();
@ -179,12 +185,18 @@
VIZI.BlueprintOutputChoropleth.prototype.onHide = function() {
var self = this;
self.keyUI.onHide();
if (self.keyUI) {
self.keyUI.onHide();
}
};
VIZI.BlueprintOutputChoropleth.prototype.onShow = function() {
var self = this;
self.keyUI.onShow();
if (self.keyUI) {
self.keyUI.onShow();
}
};
VIZI.BlueprintOutputChoropleth.prototype.onAdd = function(world) {