diff options
| author | JustOff <Off.Just.Off@gmail.com> | 2018-04-19 23:45:44 +0300 |
|---|---|---|
| committer | JustOff <Off.Just.Off@gmail.com> | 2018-04-19 23:45:44 +0300 |
| commit | c1a1f487afb26405b4dc2297ad681b0c07c24b84 (patch) | |
| tree | c5efb8433c99757846234b8ab7d8eb43e56607c5 | |
| parent | 304b1776677f2b124189275bb59cb2a14c6fcb12 (diff) | |
| download | UXP-c1a1f487afb26405b4dc2297ad681b0c07c24b84.tar UXP-c1a1f487afb26405b4dc2297ad681b0c07c24b84.tar.gz UXP-c1a1f487afb26405b4dc2297ad681b0c07c24b84.tar.lz UXP-c1a1f487afb26405b4dc2297ad681b0c07c24b84.tar.xz UXP-c1a1f487afb26405b4dc2297ad681b0c07c24b84.zip | |
[PMkit] Allow access to 'sdk/ui/buttons' via require('sdk/ui')
| -rw-r--r-- | toolkit/jetpack/moz.build | 5 | ||||
| -rw-r--r-- | toolkit/jetpack/sdk/ui.js | 2 |
2 files changed, 6 insertions, 1 deletions
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 |