History

add option to add javascript objects to a DataWebDialog

Stephen Birarda committed 12 years ago

Commit e09eef91 parent a66b6e73 files · +25 −3Browse files

Showing the changes to interface/src/Menu.cpp (1 of 3 files). Show all

Unified · Split

interface/src/Menu.cpp+4−1
@@ -38,6 +38,7 @@ · 37 unmodified lines
38#include "Application.h"38#include "Application.h"
39#include "AccountManager.h"39#include "AccountManager.h"
40#include "Menu.h"40#include "Menu.h"
41#include "scripting/LocationScriptingInterface.h"
41#include "scripting/MenuScriptingInterface.h"42#include "scripting/MenuScriptingInterface.h"
42#include "Util.h"43#include "Util.h"
43#include "ui/AnimationsDialog.h"44#include "ui/AnimationsDialog.h"
@@ -1217,7 +1218,9 @@ void Menu::displayNameLocationResponse(const QString& errorString) { · 1173 unmodified lines
1217 1218
1218void Menu::toggleLocationList() {1219void Menu::toggleLocationList() {
1219 if (!_userLocationsDialog) {1220 if (!_userLocationsDialog) {
1220 _userLocationsDialog = DataWebDialog::dialogForPath("/locations");1221 JavascriptObjectMap locationObjectMap;
1222 locationObjectMap.insert("InterfaceLocation", LocationScriptingInterface::getInstance());
1223 _userLocationsDialog = DataWebDialog::dialogForPath("/locations", locationObjectMap);
1221 }1224 }
1222 1225
1223 if (!_userLocationsDialog->isVisible()) {1226 if (!_userLocationsDialog->isVisible()) {