From c1a1f487afb26405b4dc2297ad681b0c07c24b84 Mon Sep 17 00:00:00 2001 From: JustOff Date: Thu, 19 Apr 2018 23:45:44 +0300 Subject: [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 f475d1a63..ad11e90a3 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 9f00be1c7..d1ff7ceb8 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 -- cgit v1.2.3