From 15b4a517ea6ef807262e9fe5a1cabd38ba43ddfe Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Fri, 19 Sep 2014 09:34:15 -0400 Subject: [PATCH] Bug 1069682 - part 1 - ensure the addon-sdk's JS modules include .html files; r=erikvold --- addon-sdk/mach_commands.py | 2 +- addon-sdk/moz.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addon-sdk/mach_commands.py b/addon-sdk/mach_commands.py index d0e17bdddc8e..c920efa7eccc 100644 --- a/addon-sdk/mach_commands.py +++ b/addon-sdk/mach_commands.py @@ -48,7 +48,7 @@ class MachCommands(MachCommandBase): dirs_to_files = {} for path, dirs, files in os.walk(js_src_dir): - js_files = [f for f in files if f.endswith(('.js', '.jsm'))] + js_files = [f for f in files if f.endswith(('.js', '.jsm', '.html'))] if not js_files: continue diff --git a/addon-sdk/moz.build b/addon-sdk/moz.build index 32e5091dd96e..5bd2ffa4563b 100644 --- a/addon-sdk/moz.build +++ b/addon-sdk/moz.build @@ -399,6 +399,7 @@ EXTRA_JS_MODULES.commonjs.sdk.ui.button.view += [ EXTRA_JS_MODULES.commonjs.sdk.ui.frame += [ 'source/lib/sdk/ui/frame/model.js', + 'source/lib/sdk/ui/frame/view.html', 'source/lib/sdk/ui/frame/view.js', ]