From d3065b6686abb3560e1fb0304e91beffe849a6fb Mon Sep 17 00:00:00 2001
From: JustOff <Off.Just.Off@gmail.com>
Date: Thu, 19 Apr 2018 23:45:44 +0300
Subject: [PATCH] [PMkit] Allow access to 'sdk/ui/buttons' via
 require('sdk/ui')

---
 toolkit/jetpack/moz.build | 5 ++++-
 toolkit/jetpack/sdk/ui.js | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/toolkit/jetpack/moz.build b/toolkit/jetpack/moz.build
index f475d1a63c..ad11e90a3a 100644
--- a/toolkit/jetpack/moz.build
+++ b/toolkit/jetpack/moz.build
@@ -219,11 +219,14 @@ EXTRA_JS_MODULES.commonjs.sdk += [
     'sdk/tabs.js',
     'sdk/test.js',
     'sdk/timers.js',
-    'sdk/ui.js',
     'sdk/url.js',
     'sdk/windows.js',
 ]
 
+EXTRA_PP_JS_MODULES.commonjs.sdk += [
+    'sdk/ui.js',
+]
+
 EXTRA_JS_MODULES.commonjs.sdk.addon += [
     'sdk/addon/bootstrap.js',
     'sdk/addon/events.js',
diff --git a/toolkit/jetpack/sdk/ui.js b/toolkit/jetpack/sdk/ui.js
index 9f00be1c78..d1ff7ceb84 100644
--- a/toolkit/jetpack/sdk/ui.js
+++ b/toolkit/jetpack/sdk/ui.js
@@ -13,6 +13,8 @@ module.metadata = {
 
 exports.ActionButton = require('./ui/button/action').ActionButton;
 exports.ToggleButton = require('./ui/button/toggle').ToggleButton;
+#ifndef MC_PALEMOON
 exports.Sidebar = require('./ui/sidebar').Sidebar;
 exports.Frame = require('./ui/frame').Frame;
 exports.Toolbar = require('./ui/toolbar').Toolbar;
+#endif