History

Merge remote-tracking branch 'hifi/master' into merge-hifi-master

# Conflicts: # CMakeLists.txt # README.md # cmake/externals/glad32es/CMakeLists.txt # cmake/externals/glad41/CMakeLists.txt # cmake/externals/glad45/CMakeLists.txt # cmake/externals/polyvox/CMakeLists.txt # cmake/externals/quazip/CMakeLists.txt # cmake/externals/vhacd/CMakeLists.txt # cmake/init.cmake # cmake/ports/hifi-deps/CONTROL # cmake/ports/sdl2/CONTROL # cmake/ports/sdl2/disable-hidapi-for-uwp.patch # cmake/ports/sdl2/enable-winrt-cmake.patch # cmake/ports/sdl2/fix-arm64-headers.patch # cmake/ports/sdl2/fix-x86-windows.patch # cmake/ports/sdl2/portfile.cmake # cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake # cmake/ports/tbb/portfile.cmake # hifi_vcpkg.py # interface/src/avatar/MyAvatar.h # libraries/avatars-renderer/src/avatars-renderer/Avatar.h # libraries/avatars/src/AvatarData.h # libraries/entities-renderer/src/RenderableEntityItem.h # libraries/entities/src/EntityItem.cpp # libraries/entities/src/EntityItem.h # libraries/fbx/src/GLTFSerializer.cpp # libraries/graphics-scripting/src/graphics-scripting/Forward.h # libraries/networking/src/AddressManager.cpp # libraries/networking/src/DomainHandler.h # libraries/procedural/src/procedural/ProceduralMaterialCache.cpp # libraries/render-utils/src/HighlightEffect.cpp # libraries/render-utils/src/MeshPartPayload.cpp # libraries/render-utils/src/Model.cpp # libraries/render-utils/src/RenderShadowTask.cpp # libraries/script-engine/src/WebSocketClass.cpp

David Rowe committed 6 years ago

Commit ffeb37e2 parents e3d4856 c6cde9f403 files · +26813 −7254Browse files

Showing the changes to libraries/script-engine/src/XMLHttpRequestClass.cpp (1 of 403 files). Show all

Unified · Split

libraries/script-engine/src/XMLHttpRequestClass.cpp+8−0
@@ -109,6 +109,10 @@ QScriptValue XMLHttpRequestClass::getResponseHeader(const QString& name) const { · 108 unmodified lines
109 return QScriptValue::NullValue;109 return QScriptValue::NullValue;
110}110}
111 111
112/**jsdoc
113 * Called when the request's ready state changes.
114 * @callback XMLHttpRequest~onReadyStateChangeCallback
115 */
112void XMLHttpRequestClass::setReadyState(ReadyState readyState) {116void XMLHttpRequestClass::setReadyState(ReadyState readyState) {
113 if (readyState != _readyState) {117 if (readyState != _readyState) {
114 _readyState = readyState;118 _readyState = readyState;
@@ -184,6 +188,10 @@ void XMLHttpRequestClass::doSend() { · 69 unmodified lines
184 }188 }
185}189}
186 190
191/**jsdoc
192 * Called when the request times out.
193 * @callback XMLHttpRequest~onTimeoutCallback
194 */
187void XMLHttpRequestClass::requestTimeout() {195void XMLHttpRequestClass::requestTimeout() {
188 if (_onTimeout.isFunction()) {196 if (_onTimeout.isFunction()) {
189 _onTimeout.call(QScriptValue::NullValue);197 _onTimeout.call(QScriptValue::NullValue);