Revert "add parameter "theme" to load a document"

This reverts commit 100def4c80.

Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Change-Id: I054ae3efc51bab3ba8e30011a6f4222f3b65e6ad

browser/js/global.js

@@ -265,26 +265,7 @@ window.app = {
 
 		// @property lang: String
 		// browser language locale
-		lang: navigatorLang,
-
-		docs: ['presentation', 'spreadsheet', 'text', 'drawing'],
-
-		getTheme: function () {
-			var docTheme;
-			var themes = [];
-			if (global.isLocalStorageAllowed) {
-				for (var theme in global.L.Browser.docs) {
-					docTheme = global.localStorage.getItem('UIDefaults_' +
-									       global.L.Browser.docs[theme] +
-									       '_darkTheme');
-					if (docTheme) {
-						themes.push(global.L.Browser.docs[theme] + ':' +
-							    (docTheme === 'true' ? 'Dark' : 'Light'));
-					}
-				}
-			}
-			return themes.join(';');
-		}
+		lang: navigatorLang
 	};
 
 	global.keyboard = {
@@ -1228,10 +1209,6 @@ window.app = {
 
 				}
 
-				var docTheme = global.L.Browser.getTheme();
-				if (docTheme)
-					msg += ' theme=' + docTheme;
-
 				msg += ' timezone=' + Intl.DateTimeFormat().resolvedOptions().timeZone;
 
 				global.socket.send(msg);

browser/src/control/Control.UIManager.js

@@ -143,6 +143,7 @@ L.Control.UIManager = L.Control.extend({
 		else {
 			this.loadLightMode();
 		}
+		this.activateDarkModeInCore(selectedMode);
 	},
 
 	activateDarkModeInCore: function(activate) {

browser/src/core/Socket.js

@@ -247,10 +247,6 @@ app.definitions.Socket = L.Class.extend({
 			msg += ' accessibilityState=' + accessibilityState;
 		}
 
-		var docTheme = L.Browser.getTheme();
-		if (docTheme)
-			msg += ' theme=' + docTheme;
-
 		this._doSend(msg);
 		for (var i = 0; i < this._msgQueue.length; i++) {
 			this._doSend(this._msgQueue[i]);

common/Session.cpp

@@ -215,11 +215,6 @@ void Session::parseDocOptions(const StringVector& tokens, int& part, std::string
             _accessibilityState = value == "true";
             ++offset;
         }
-        else if (name == "theme")
-        {
-            _theme = value;
-            ++offset;
-        }
     }
 
     Util::mapAnonymized(_userId, _userIdAnonym);

common/Session.hpp

@@ -262,8 +262,6 @@ public:
 
     bool getAccessibilityState() const { return _accessibilityState; }
 
-    const std::string& getTheme() const { return _theme; }
-
 protected:
     Session(const std::shared_ptr<ProtocolHandlerInterface> &handler,
             const std::string& name, const std::string& id, bool readonly);
@@ -383,9 +381,6 @@ private:
 
     /// Specifies whether accessibility support is enabled for this session.
     bool _accessibilityState;
-
-    /// Specifies the theme
-    std::string _theme;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

wsd/ClientSession.cpp

@@ -1289,12 +1289,6 @@ bool ClientSession::loadDocument(const char* /*buffer*/, int /*length*/,
         {
             oss << " batch=" << getBatchMode();
         }
-
-        if (!getTheme().empty())
-        {
-            oss << " theme=" << getTheme();
-        }
-
 #if ENABLE_FEATURE_LOCK
         sendLockedInfo();
 #endif