put back LocationScriptingInterface so it works prior to replacement

interface/src/Application.cpp

@@ -81,6 +81,7 @@
 #include "scripting/AccountScriptingInterface.h"
 #include "scripting/AudioDeviceScriptingInterface.h"
 #include "scripting/ClipboardScriptingInterface.h"
+#include "scripting/LocationScriptingInterface.h"
 #include "scripting/MenuScriptingInterface.h"
 #include "scripting/SettingsScriptingInterface.h"
 #include "scripting/WindowScriptingInterface.h"
@@ -3811,6 +3812,13 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser
 
     scriptEngine->registerGlobalObject("Overlays", &_overlays);
 
+    QScriptValue windowValue = scriptEngine->registerGlobalObject("Window", WindowScriptingInterface::getInstance());
+    scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
+                                       LocationScriptingInterface::locationSetter, windowValue);
+    // register `location` on the global object.
+    scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
+                                       LocationScriptingInterface::locationSetter);
+    
     scriptEngine->registerGlobalObject("Menu", MenuScriptingInterface::getInstance());
     scriptEngine->registerGlobalObject("Settings", SettingsScriptingInterface::getInstance());
     scriptEngine->registerGlobalObject("AudioDevice", AudioDeviceScriptingInterface::getInstance());

interface/src/scripting/LocationScriptingInterface.cpp

@@ -0,0 +1,52 @@
+//
+//  LocationScriptingInterface.cpp
+//  interface/src/scripting
+//
+//  Created by Ryan Huffman on 4/29/14.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include <glm/glm.hpp>
+
+#include "NodeList.h"
+
+#include "LocationScriptingInterface.h"
+
+LocationScriptingInterface* LocationScriptingInterface::getInstance() {
+    static LocationScriptingInterface sharedInstance;
+    return &sharedInstance;
+}
+
+bool LocationScriptingInterface::isConnected() {
+    return NodeList::getInstance()->getDomainHandler().isConnected();
+}
+
+QString LocationScriptingInterface::getHref() {
+    return getProtocol() + "//" + getHostname() + getPathname();
+}
+
+QString LocationScriptingInterface::getPathname() {
+    MyAvatar* applicationAvatar = Application::getInstance()->getAvatar();
+    return AddressManager::pathForPositionAndOrientation(applicationAvatar->getPosition(),
+                                                         true, applicationAvatar->getOrientation());
+}
+
+QString LocationScriptingInterface::getHostname() {
+    return NodeList::getInstance()->getDomainHandler().getHostname();
+}
+
+void LocationScriptingInterface::assign(const QString& url) {
+    QMetaObject::invokeMethod(&AddressManager::getInstance(), "handleLookupString", Q_ARG(const QString&, url));
+}
+
+QScriptValue LocationScriptingInterface::locationGetter(QScriptContext* context, QScriptEngine* engine) {
+    return engine->newQObject(getInstance());
+}
+
+QScriptValue LocationScriptingInterface::locationSetter(QScriptContext* context, QScriptEngine* engine) {
+    LocationScriptingInterface::getInstance()->assign(context->argument(0).toString());
+    return QScriptValue::UndefinedValue;
+}

interface/src/scripting/LocationScriptingInterface.h

@@ -0,0 +1,50 @@
+//
+//  LocationScriptingInterface.h
+//  interface/src/scripting
+//
+//  Created by Ryan Huffman on 4/29/14.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_LocationScriptingInterface_h
+#define hifi_LocationScriptingInterface_h
+
+#include <QObject>
+#include <QScriptContext>
+#include <QScriptEngine>
+#include <QScriptValue>
+#include <QString>
+
+#include <AddressManager.h>
+
+#include "Application.h"
+
+class LocationScriptingInterface : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(bool isConnected READ isConnected)
+    Q_PROPERTY(QString href READ getHref)
+    Q_PROPERTY(QString protocol READ getProtocol)
+    Q_PROPERTY(QString hostname READ getHostname)
+    Q_PROPERTY(QString pathname READ getPathname)
+    LocationScriptingInterface() { };
+public:
+    static LocationScriptingInterface* getInstance();
+
+    bool isConnected();
+    QString getHref();
+    QString getProtocol() { return HIFI_URL_SCHEME; };
+    QString getPathname();
+    QString getHostname();
+
+    static QScriptValue locationGetter(QScriptContext* context, QScriptEngine* engine);
+    static QScriptValue locationSetter(QScriptContext* context, QScriptEngine* engine);
+
+public slots:
+    void assign(const QString& url);
+
+};
+
+#endif // hifi_LocationScriptingInterface_h

libraries/networking/src/AddressManager.h

@@ -29,9 +29,10 @@ public:
     static QString pathForPositionAndOrientation(const glm::vec3& position, bool hasOrientation = false,
                                                  const glm::quat& orientation = glm::quat());
     
-    void handleLookupString(const QString& lookupString);
     void attemptPlaceNameLookup(const QString& lookupString);
 public slots:
+    void handleLookupString(const QString& lookupString);
+    
     void handleAPIResponse(const QJsonObject& jsonObject);
     void handleAPIError(QNetworkReply& errorReply);
     void goToUser(const QString& username);