From c2ee13931ec7d01dd1417fbf1e08d06ca2b526e5 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Wed, 24 Jan 2018 13:38:10 -0500
Subject: [PATCH] changes per CR feedback; additional jsdoc

---
 libraries/networking/src/AssetClient.cpp      |  2 +-
 .../src/BaseAssetScriptingInterface.h         |  3 ---
 .../src/AssetScriptingInterface.cpp           | 20 ++++++++++++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp
index a0c86a25e8..4d987a3200 100644
--- a/libraries/networking/src/AssetClient.cpp
+++ b/libraries/networking/src/AssetClient.cpp
@@ -92,7 +92,7 @@ MiniPromise::Promise AssetClient::cacheInfoRequestAsync(MiniPromise::Promise def
     if (QThread::currentThread() != thread()) {
         QMetaObject::invokeMethod(this, "cacheInfoRequestAsync", Q_ARG(MiniPromise::Promise, deferred));
     } else {
-        auto* cache = qobject_cast<QNetworkDiskCache*>(NetworkAccessManager::getInstance().cache());
+        auto cache = qobject_cast<QNetworkDiskCache*>(NetworkAccessManager::getInstance().cache());
         if (cache) {
             deferred->resolve({
                 { "cacheDirectory", cache->cacheDirectory() },
diff --git a/libraries/networking/src/BaseAssetScriptingInterface.h b/libraries/networking/src/BaseAssetScriptingInterface.h
index 5ac391a4d7..a51f4a5105 100644
--- a/libraries/networking/src/BaseAssetScriptingInterface.h
+++ b/libraries/networking/src/BaseAssetScriptingInterface.h
@@ -21,9 +21,6 @@
 #include "NetworkAccessManager.h"
 #include <QtNetwork/QNetworkDiskCache>
 
-/**jsdoc
- * @namespace Assets
- */
 class BaseAssetScriptingInterface : public QObject {
     Q_OBJECT
 public:
diff --git a/libraries/script-engine/src/AssetScriptingInterface.cpp b/libraries/script-engine/src/AssetScriptingInterface.cpp
index 78d0b323ee..1c811573fb 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.cpp
+++ b/libraries/script-engine/src/AssetScriptingInterface.cpp
@@ -215,6 +215,21 @@ void AssetScriptingInterface::deleteAsset(QScriptValue options, QScriptValue sco
     jsVerify(false, "TODO: deleteAsset API");
 }
 
+/**jsdoc
+ * @typedef {string} Assets.GetOptions.ResponseType
+ * <p>Available <code>responseType</code> values for use with @{link Assets.getAsset} and @{link Assets.loadFromCache} configuration option. </p>
+ * <table>
+ *   <thead>
+ *     <tr><th>responseType</th><th>typeof response value</th></tr>
+ *   </thead>
+ *   <tbody>
+ *     <tr><td><code>"text"</code></td><td>contents returned as utf-8 decoded <code>String</code> value</td></tr>
+ *     <tr><td><code>"arraybuffer"</code></td><td>contents as a binary <code>ArrayBuffer</code> object</td></tr>
+ *     <tr><td><code>"json"</code></td><td>contents as a parsed <code>JSON</code> object</td></tr>
+ *   </tbody>
+ * </table>
+ */
+
 void AssetScriptingInterface::getAsset(QScriptValue options, QScriptValue scope, QScriptValue callback) {
     JS_VERIFY(options.isObject() || options.isString(), "expected request options Object or URL as first parameter");
 
@@ -224,7 +239,7 @@ void AssetScriptingInterface::getAsset(QScriptValue options, QScriptValue scope,
     if (options.isString()) {
         url = options.toString();
     }
-    if (responseType.isEmpty() || responseType == "string") {
+    if (responseType.isEmpty()) {
         responseType = "text";
     }
     auto asset = AssetUtils::getATPUrl(url).path();
@@ -389,8 +404,7 @@ bool AssetScriptingInterface::canWriteCacheValue(const QUrl& url) {
     // allow cache writes only from Client, EntityServer and Agent scripts
     bool isAllowedContext = (
         scriptEngine->isClientScript() ||
-        scriptEngine->isAgentScript() ||
-        scriptEngine->isEntityServerScript()
+        scriptEngine->isAgentScript()
     );
     if (!isAllowedContext) {
         qCDebug(scriptengine) << __FUNCTION__ << "invalid context" << scriptEngine->getContext() << url;