Put behind a labs flag

src/components/views/elements/InlineSpinner.js

@@ -17,6 +17,7 @@ limitations under the License.
 import React from "react";
 import createReactClass from 'create-react-class';
 import {_t} from "../../../languageHandler";
+import SettingsStore from "../../../settings/SettingsStore";
 
 export default createReactClass({
     displayName: 'InlineSpinner',
@@ -27,10 +28,20 @@ export default createReactClass({
         const imgClass = this.props.imgClassName || "";
         const alt = this.props.alt || _t("Loading...");
 
+        let divClass;
+        let imageSource;
+        if (SettingsStore.isFeatureEnabled('feature_new_spinner')) {
+            divClass = "mx_InlineSpinner mx_Spinner_spin";
+            imageSource = require("../../../../res/img/spinner.svg");
+        } else {
+            divClass = "mx_InlineSpinner";
+            imageSource = require("../../../../res/img/spinner.gif");
+        }
+
         return (
-            <div className="mx_InlineSpinner">
+            <div className={divClass}>
                 <img
-                    src={require("../../../../res/img/spinner.svg")}
+                    src={imageSource}
                     width={w}
                     height={h}
                     className={imgClass}