Commit 86914989 by Zachary Tong

Move dropdown options into scope so that it appears on panel creation

parent d693457e
...@@ -16,7 +16,17 @@ angular.module('kibana.map2', []) ...@@ -16,7 +16,17 @@ angular.module('kibana.map2', [])
scale:-1, scale:-1,
data: { data: {
samples: 1000, samples: 1000,
type: "mercator" type: "mercator",
dropdown:[
{
"text": "Mercator (Flat)",
id: "mercator"
},
{
text: "Orthographic (Sphere)",
id: "orthographic"
}
]
}, },
geopoints: { geopoints: {
enabled: false, enabled: false,
...@@ -187,24 +197,6 @@ angular.module('kibana.map2', []) ...@@ -187,24 +197,6 @@ angular.module('kibana.map2', [])
dr.worldData = null; dr.worldData = null;
dr.worldNames = null; dr.worldNames = null;
//These are various options that should not be cached in scope.panel
dr.options = {
data: {
dropdown:[
{
"text": "Mercator (Flat)",
id: "mercator"
},
{
text: "Orthographic (Sphere)",
id: "orthographic"
}
]
}
};
/** /**
* Initialize the panels if new, or render existing panels * Initialize the panels if new, or render existing panels
*/ */
...@@ -403,7 +395,7 @@ angular.module('kibana.map2', []) ...@@ -403,7 +395,7 @@ angular.module('kibana.map2', [])
//Special fix for when the user changes from mercator -> orthographic //Special fix for when the user changes from mercator -> orthographic
//The globe won't redraw automatically, we need to force it //The globe won't redraw automatically, we need to force it
if (scope.panel.display.data.type === 'orthographic') { if (scope.panel.display.data.type === 'orthographic') {
//dr.svg.selectAll("path").attr("d", dr.path); dr.svg.selectAll("path").attr("d", dr.path);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment