From 3a372a916f3545d37390f692f24f7e1c4d5351b5 Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Wed, 17 May 2017 16:19:36 -0400 Subject: Bug 1363803 - Consolidate YUI js and css into one js and one css file --- template/en/default/attachment/create.html.tmpl | 1 - template/en/default/attachment/edit.html.tmpl | 1 - template/en/default/bug/create/create.html.tmpl | 1 - template/en/default/bug/show-header.html.tmpl | 2 - template/en/default/bug/summarize-time.html.tmpl | 1 - template/en/default/global/header.html.tmpl | 53 ++-------------------- template/en/default/global/value-descs.js.tmpl | 12 +---- template/en/default/list/list.html.tmpl | 1 - template/en/default/reports/report.html.tmpl | 1 - .../en/default/search/search-advanced.html.tmpl | 1 - .../default/search/search-create-series.html.tmpl | 1 - .../en/default/search/search-instant.html.tmpl | 1 - .../default/search/search-report-graph.html.tmpl | 1 - .../default/search/search-report-table.html.tmpl | 1 - 14 files changed, 4 insertions(+), 74 deletions(-) (limited to 'template/en/default') diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index eae63adf1..710c12334 100644 --- a/template/en/default/attachment/create.html.tmpl +++ b/template/en/default/attachment/create.html.tmpl @@ -35,7 +35,6 @@ subheader = subheader generate_api_token = 1 style_urls = [ 'skins/standard/attachment.css' ] - yui = [ 'connection', 'json' ] javascript_urls = [ "js/attachment.js", 'js/field.js', "js/util.js", "js/TUI.js" ] doc_section = "attachments.html" %] diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index cb0b1c71a..4e0195e34 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -39,7 +39,6 @@ subheader = subheader generate_api_token = 1 doc_section = "attachments.html" - yui = [ 'connection', 'json' ] javascript_urls = ['js/attachment.js', 'js/field.js'] style_urls = ['skins/standard/attachment.css'] bodyclasses = "no_javascript" diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index ba5d08273..ab95c38a7 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -31,7 +31,6 @@ [% PROCESS global/header.html.tmpl title = title generate_api_token = 1 - yui = [ 'calendar', 'datatable', 'button' ] style_urls = [ 'skins/standard/attachment.css', 'skins/standard/enter_bug.css', 'skins/custom/create_bug.css' ] diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl index c8acca614..2aac89ddb 100644 --- a/template/en/default/bug/show-header.html.tmpl +++ b/template/en/default/bug/show-header.html.tmpl @@ -41,8 +41,6 @@ [% generate_api_token = 1 %] [% header = "$terms.Bug $bug.bug_id" %] [% header_addl_info = "Last modified: $filtered_timestamp" %] -[% yui = ['calendar', 'connection', 'json'] %] -[% yui.push('container') IF user.can_tag_comments %] [% javascript_urls = [ "js/util.js", "js/field.js" ] %] [% javascript_urls.push("js/bug.js") IF user.id %] [% javascript_urls.push('js/comment-tagging.js') diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl index 0166539ea..65ecc3e72 100644 --- a/template/en/default/bug/summarize-time.html.tmpl +++ b/template/en/default/bug/summarize-time.html.tmpl @@ -33,7 +33,6 @@ header = header style_urls = ["skins/standard/summarize-time.css"] doc_section = "timetracking.html" - yui = ['calendar'] javascript_urls = [ "js/util.js", "js/field.js" ] %] diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 5cd0fef79..ac753dca9 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -50,38 +50,12 @@ header_addl_info = "" onload = "" style_urls = [] - yui = [] - yui_css = {} - yui_deps = {} no_yui = 0 jquery = [] jquery_css = [] generate_api_token = 0 %] -[% IF NOT no_yui %] - [% SET yui_css = { - calendar => 1, - datatable => 1, - button => 1, - } %] - - [%# Note: This is simple dependency resolution--you can't have dependencies - # that depend on each other. You have to specify all of a module's deps, - # if that module is going to be specified in "yui". - #%] - [% SET yui_deps = { - datatable => ['json', 'connection', 'datasource', 'element'], - } %] - - [%# When using certain YUI modules, we need to process certain - # extra JS templates. - #%] - [% SET yui_templates = { - datatable => ['global/value-descs.js.tmpl'], - } %] -[% END %] - [%# These are JS URLs that are *always* on the page and come before # every other JS URL. #%] @@ -91,8 +65,7 @@ ] %] [% IF NOT no_yui %] - [% starting_js_urls.push("js/yui/yahoo-dom-event/yahoo-dom-event.js", - "js/yui/cookie/cookie-min.js") %] + [% starting_js_urls.push("js/yui.js") %] [% END %] [% SET jq_css_urls = [ @@ -163,11 +136,7 @@ [% PROCESS 'global/setting-descs.none.tmpl' %] - [% IF NOT no_yui %] - [% SET yui = yui_resolve_deps(yui, yui_deps) %] - [% END %] - - [% SET css_sets = css_files(style_urls.unique, yui, yui_css) %] + [% SET css_sets = css_files(style_urls.unique, no_yui) %] [% IF constants.CONCATENATE_ASSETS %] [% PROCESS format_css_link asset_url = css_sets.unified_standard_skin %] [% ELSE %] @@ -195,13 +164,6 @@ [% END %] [% END %] - [% IF NOT no_yui %] - [%# YUI Scripts %] - [% FOREACH yui_name = yui %] - [% starting_js_urls.push("js/yui/$yui_name/${yui_name}-min.js") %] - [% END %] - [% END %] - [%# jQuery Plugins %] [% FOREACH jq_name = jquery.unique %] [% starting_js_urls.push("js/jquery/plugins/$jq_name/${jq_name}-min.js") %] @@ -212,11 +174,6 @@ [% PROCESS format_js_link %] [% END %] - [%# Make some Bugzilla information available to all scripts. - # We don't import every parameter and constant because we - # don't want to add a lot of uncached JS to every page. - # %] - [% inline_javascript = BLOCK %] [% IF NOT no_yui %] YAHOO.namespace('bugzilla'); @@ -224,11 +181,7 @@ YAHOO.util.Event._simpleRemove(window, "unload", YAHOO.util.Event._unload); } - [% FOREACH yui_name = yui %] - [% FOREACH yui_template = yui_templates.$yui_name %] - [% INCLUDE $yui_template %] - [% END %] - [% END %] + [% INCLUDE 'global/value-descs.js.tmpl' %] [% END %] [% IF javascript %] diff --git a/template/en/default/global/value-descs.js.tmpl b/template/en/default/global/value-descs.js.tmpl index 20d023b42..b0fb1d4d2 100644 --- a/template/en/default/global/value-descs.js.tmpl +++ b/template/en/default/global/value-descs.js.tmpl @@ -20,14 +20,4 @@ [% PROCESS "global/value-descs.none.tmpl" %] -BUGZILLA.value_descs = { - [% FOREACH vd_field = value_descs.keys %] - [% vd_field FILTER js %]: { - [% FOREACH vd_value = value_descs.${vd_field}.keys %] - '[% vd_value FILTER js %]': - '[% value_descs.${vd_field}.${vd_value} FILTER js %]' - [%~ ',' UNLESS loop.last %] - [% END %] - }[% ',' UNLESS loop.last %] - [% END %] -}; +BUGZILLA.value_descs = JSON.parse('[% json_encode(value_descs) FILTER js %]'); diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl index 5e154f5df..1c49fee98 100644 --- a/template/en/default/list/list.html.tmpl +++ b/template/en/default/list/list.html.tmpl @@ -50,7 +50,6 @@ generate_api_token = dotweak style = style atomlink = "buglist.cgi?$urlquerypart&title=$url_filtered_title&ctype=atom" - yui = [ 'calendar' ] javascript_urls = [ "js/util.js", "js/field.js" ] style_urls = [ "skins/standard/buglist.css" ] doc_section = "query.html#list" diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl index 38b64df0b..deb570202 100644 --- a/template/en/default/reports/report.html.tmpl +++ b/template/en/default/reports/report.html.tmpl @@ -77,7 +77,6 @@ .ttotal, .ttotal td { background-color: #cfffdf } /* light green */ " header_addl_info = time - yui = ['datatable'] %] [% IF debug %] diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl index 3956a1ff2..60f47a916 100644 --- a/template/en/default/search/search-advanced.html.tmpl +++ b/template/en/default/search/search-advanced.html.tmpl @@ -45,7 +45,6 @@ function remove_token() { generate_api_token = 1 onload = "doOnSelectProduct(0);" javascript = js_data - yui = [ 'calendar', 'connection' ] javascript_urls = [ "js/productform.js", "js/util.js", "js/TUI.js", "js/field.js"] style_urls = [ "skins/standard/search_form.css" ] doc_section = "query.html" diff --git a/template/en/default/search/search-create-series.html.tmpl b/template/en/default/search/search-create-series.html.tmpl index 6b7678b23..69e7a6307 100644 --- a/template/en/default/search/search-create-series.html.tmpl +++ b/template/en/default/search/search-create-series.html.tmpl @@ -34,7 +34,6 @@ title = "Create New Data Set" generate_api_token = 1 onload = "doOnSelectProduct(0);" - yui = [ 'calendar' ] javascript = js_data javascript_urls = [ "js/util.js", "js/productform.js", "js/TUI.js", "js/field.js" ] style_urls = [ "skins/standard/search_form.css" ] diff --git a/template/en/default/search/search-instant.html.tmpl b/template/en/default/search/search-instant.html.tmpl index 00f6434e9..4a7ff1992 100644 --- a/template/en/default/search/search-instant.html.tmpl +++ b/template/en/default/search/search-instant.html.tmpl @@ -13,7 +13,6 @@ generate_api_token = 1 javascript_urls = [ 'extensions/GuidedBugEntry/web/js/products.js', 'js/instant-search.js', ] - yui = [ 'datatable', 'container' ] %] [% UNLESS default.exists('product') && default.product.size %] diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl index 20e8e184d..b7e7b59c8 100644 --- a/template/en/default/search/search-report-graph.html.tmpl +++ b/template/en/default/search/search-report-graph.html.tmpl @@ -33,7 +33,6 @@ var queryform = "reportform" title = "Generate Graphical Report" generate_api_token = 1 onload = "doOnSelectProduct(0); chartTypeChanged()" - yui = [ 'calendar' ] javascript = js_data javascript_urls = [ "js/util.js", "js/productform.js", "js/TUI.js", "js/field.js" ] style_urls = [ "skins/standard/search_form.css" ] diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl index 7ff54b8da..7ac4ac5a0 100644 --- a/template/en/default/search/search-report-table.html.tmpl +++ b/template/en/default/search/search-report-table.html.tmpl @@ -33,7 +33,6 @@ var queryform = "reportform" title = "Generate Tabular Report" generate_api_token = 1 onload = "doOnSelectProduct(0)" - yui = [ 'calendar' ] javascript = js_data javascript_urls = [ "js/util.js", "js/productform.js", "js/TUI.js", "js/field.js" ] style_urls = [ "skins/standard/search_form.css" ] -- cgit v1.2.3-24-g4f1b