diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2014-01-10 18:19:40 +0600 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2014-01-10 18:19:40 +0600 |
| commit | c2a1eecb81eab01a3181291cade8836d4bb14b74 (patch) | |
| tree | 1f2f8d518a5ebc934c2cc7c68adf8ce487c41ae7 /sonar-server/src | |
| parent | 4978d77b0907434dc333927d376323288a380ee0 (diff) | |
| download | sonarqube-c2a1eecb81eab01a3181291cade8836d4bb14b74.tar.gz sonarqube-c2a1eecb81eab01a3181291cade8836d4bb14b74.zip | |
Revert "SONAR-4853 New design of the Issues page"
This reverts commit 06b21a3efa5c5badc657cf806b9ddbc52d4e8cc7.
Diffstat (limited to 'sonar-server/src')
40 files changed, 527 insertions, 5539 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb index cd94b0cbc94..4e16f08f412 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb @@ -1,29 +1,53 @@ -<div class="code-issue" - data-issue-key="<%= issue.key -%>" - data-issue-component="<%= issue.componentKey() -%>" - data-issue-rule="<%= u issue.ruleKey().toString() -%>"> - +<div class="code-issue" data-issue-key="<%= issue.key -%>" data-issue-component="<%= issue.componentKey() -%>" data-issue-rule="<%= u issue.ruleKey().toString() -%>"> <div class="code-issue-name"> - <i class="icon-severity-<%= issue.severity.downcase -%>" title="<%= h message("severity.#{issue.severity}") -%>"></i> - <a href="#" onclick="return toggleIssueRule(this)" class="rulename issue-rule-link"><%= h @issue_results.rule(issue).getName() -%></a> - <div style="float: right"> - <% unless issue.status == "OPEN" %> - <i class="icon-status-<%= issue.status.downcase -%>"></i><%= h message("issue.status.#{issue.status}") -%> - <% end %> - <% if issue.resolution %> - <i class="icon-status-<%= issue.resolution.downcase -%>"></i><%= h message("issue.resolution.#{issue.resolution}") -%> - <% end %> - - <a href="#" onclick="return toggleIssueChangelog(this)" class="gray issue-changelog-link" - id="toggle-issue-changelog"><%= distance_of_time_in_words_to_now(Api::Utils.java_to_ruby_datetime(issue.updateDate())) -%></a> - <a href="#" onclick="return openIssuePopup(this)" class="issue-permalink"><img src="<%= ApplicationController.root_context -%>/images/new-window-16.gif"></a> </div> + + <img src="<%= ApplicationController.root_context -%>/images/priority/<%= issue.severity -%>.png" title="<%= h message("severity.#{issue.severity}") -%>"> + + <a href="#" onclick="return toggleIssueRule(this)" class="rulename issue-rule-link"><%= h @issue_results.rule(issue).getName() -%></a> + + <% if issue.resolution %> + <img src="<%= ApplicationController.root_context -%>/images/sep12.png"/> + + <span><%= message("issue.resolution.#{issue.resolution}") -%></span> + + <% else %> + <img src="<%= ApplicationController.root_context -%>/images/sep12.png"/> + + <span><%= message("issue.status.#{issue.status}") -%></span> + + <% end %> + <img src="<%= ApplicationController.root_context -%>/images/sep12.png"/> + + <%= message('issue.updated') -%> <a href="#" onclick="return toggleIssueChangelog(this)" class="gray issue-changelog-link" + id="toggle-issue-changelog"><%= distance_of_time_in_words_to_now(Api::Utils.java_to_ruby_datetime(issue.updateDate())) -%></a> + + <% if issue.reporter %> + <img src="<%= ApplicationController.root_context -%>/images/sep12.png"/> + + <span><%= message('issue.reported_by') -%> <%= @issue_results.user(issue.reporter).name -%></span> + + <% end %> + <% if issue.authorLogin %> + <img src="<%= ApplicationController.root_context -%>/images/sep12.png"/> + + <span><%= message('issue.authorLogin') -%> <%= issue.authorLogin -%></span> + + <% end %> + <% if issue.technicalDebt %> + <img src="<%= ApplicationController.root_context -%>/images/sep12.png"/> + + <%= message('issue.technical_debt') -%> <a href="#" onclick="return toggleTechnicalDebt(this)" class="gray issue-technicaldebt-link" + id="toggle-issue-technicaldebt"><%= Internal.technical_debt.format(issue.technicalDebt) -%></a> + + <% end %> </div> <div class="issue-rule rule-desc" style="display: none"></div> <div class="issue-changelog" id="issue-changelog" style="display: none"></div> + <div class="issue-technicaldebt" id="issue-technicaldebt" style="display: none"></div> <% unless issue.message.blank? %> <div class="code-issue-msg"> @@ -31,94 +55,6 @@ </div> <% end %> - <div class="code-issue-details"> - <ul class="tabs"> - <li> - <a href="#tab-issue-details"><%= message('issue.details') -%></a> - </li> - <li> - <a href="/dev/issue/rule/<%= u issue.ruleKey().toString() -%>"><%= message('rule') -%></a> - </li> - <li> - <a href="/dev/issue/changelog/<%= issue.key -%>"><%= message('changelog') -%></a> - </li> - </ul> - <div id="tab-issue-details"> - <ul class="code-issue-details-list"> - <li> - <div class="code-issue-details-term"><%= message('severity') -%></div> - <div class="code-issue-details-value"> - <i class="icon-severity-<%= issue.severity.downcase -%>"></i><%= h message("severity.#{issue.severity}") -%> - </div> - </li> - <li> - <div class="code-issue-details-term"><%= message('status') -%></div> - <div class="code-issue-details-value"> - <i class="icon-status-<%= issue.status.downcase -%>"></i><%= h message("issue.status.#{issue.status}") -%> - </div> - </li> - <li> - <div class="code-issue-details-term"><%= message('resolution') -%></div> - <div class="code-issue-details-value"> - <% if issue.resolution %> - <i class="icon-status-<%= issue.resolution.downcase -%>"></i><%= h message("issue.resolution.#{issue.resolution}") -%>; - <% else %> - <%= message('unresolved') -%> - <% end %> - </div> - </li> - <li> - <div class="code-issue-details-term"><%= message('issue_filter.header.action_plan') -%></div> - <div class="code-issue-details-value"> - <% if issue.actionPlanKey %> - <%= h @issue_results.actionPlan(issue).name() -%> - <% else %> - <%= message('none') -%> - <% end %> - </div> - </li> - <li> - <div class="code-issue-details-term"><%= message('issue.technical_debt_clear') -%></div> - <div class="code-issue-details-value"> - <%= h Internal.technical_debt.format(issue.technicalDebt) -%> - </div> - </li> - <% if issue.reporter %> - <li> - <div class="code-issue-details-term"><%= message('reporter') -%></div> - <div class="code-issue-details-value"><%= h @issue_results.user(issue.reporter).name -%></div> - </li> - <% end %> - <li> - <div class="code-issue-details-term"><%= message('author') -%></div> - <div class="code-issue-details-value"><%= h issue.authorLogin -%></div> - </li> - <li> - <div class="code-issue-details-term"><%= message('assignee') -%></div> - <div class="code-issue-details-value"> - <% if issue.assignee %> - <%= h @issue_results.user(issue.assignee).name -%> - <% else %> - <%= message('unassigned') -%> - <% end %> - </div> - </li> - <li> - <div class="code-issue-details-term"><%= message('created') -%></div> - <div class="code-issue-details-value"> - <%= human_short_date(Api::Utils.java_to_ruby_datetime(issue.updateDate)) -%> - </div> - </li> - <li> - <div class="code-issue-details-term"><%= message('updated') -%></div> - <div class="code-issue-details-value"> - <%= human_short_date(Api::Utils.java_to_ruby_datetime(issue.creationDate)) -%> - </div> - </li> - </ul> - </div> - </div> - <% issue.comments.each do |comment| comment_html_id = "comment-#{comment.key}-#{rand(100)}" @@ -228,9 +164,3 @@ </div> <% end %> </div> - -<script> - $j(function() { - $j('.code-issue-details').tabs(); - }); -</script> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_list.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_list.html.erb index 864bb2ea1af..731a60c1913 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_list.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_list.html.erb @@ -1,41 +1,126 @@ -<ol class="navigator-results-list"> +<% + if @issues_result.issues && !@issues_result.issues.empty? + colspan = 6 +%> + <div id="issues-list"> + <table class="data width100"> + <thead> + <tr> + <th width="1%" nowrap class="column-severity"> + <%= column_html(@issues_query, @issues_result, message('severity_abbreviated'), message('severity'), 'SEVERITY') %> + </th> + <th width="1%" nowrap class="column-status"> + <%= column_html(@issues_query, @issues_result, message('status'), message('status'), 'STATUS') %> + </th> + <th> + <%= message('description') -%> + </th> + <th nowrap> + <%= message('component') -%> + </th> + <th class="column-assignee"> + <%= column_html(@issues_query, @issues_result, message('issue_filter.header.assignee'), message('issue_filter.header.assignee'), 'ASSIGNEE') %> + </th> + <th width="1%" nowrap> + <%= message('issue_filter.header.action_plan') -%> + </th> + <th width="1%" nowrap class="column-update-date"> + <%= column_html(@issues_query, @issues_result, message('issue_filter.header.update_date'), message('issue_filter.header.update_date'), 'UPDATE_DATE') %> + </th> + </tr> + </thead> + <tbody> + <% + @issues_result.issues.each do |issue| + %> + <tr class="<%= cycle('even', 'odd') -%>"> + <td width="1%" nowrap> + <img src="<%= ApplicationController.root_context -%>/images/priority/<%= issue.severity -%>.png" title="<%= message(issue.severity.downcase).capitalize -%>"/> + </td> + <td> + <%= message("issue.status.#{issue.status}") -%> + <% if issue.resolution %> + <span class="note" style="white-space: nowrap">[<%= message("issue.resolution.#{issue.resolution}") -%>]</span> + <% end %> + </td> + <td> + <a class='open-modal rule-modal issue-detail-link' modal-width='900' href='<%= url_for :controller => 'issue', :action => 'show', :id => issue.key, :modal => true -%>'> + <%= h truncate(issue.message, :length => 100) -%></a> + </td> + <td> + <% project = @issues_result.project(issue) + component = @issues_result.component(issue) -%> + <div class="subtitle"><%= h (truncate(project.name, :length => 100)) -%></div> + <% if component %> + <!-- Do not display component name when issue is on module --> + <% if component.key != project.key %> + <%= h component.longName() -%> + <% end %> + <% else %> + <del><%= h issue.componentKey() %></del> + <% end %> + </td> + <td> + <%= h @issues_result.user(issue.assignee).name if issue.assignee -%> + </td> + <td> + <%= h @issues_result.actionPlan(issue).name if issue.actionPlanKey() -%> + </td> + <td width="1%" nowrap> + <%= human_short_date(Api::Utils.java_to_ruby_datetime(issue.updateDate())) -%> + </td> + </tr> + <% + end + %> + </tbody> + <%= if @ajax_mode + paginate_java(@issues_result.paging, :colspan => colspan, :id => 'issue-filter-foot', :include_loading_icon => true, + :url_results => url_for({:controller => 'issues', :action => 'search'}.merge(params))) { |label, page_id| + link_to_function label, "refreshList('#{@issues_query.sort}', #{@issues_query.asc}, #{page_id})" + } + else + paginate_java(@issues_result.paging, :colspan => colspan, :id => 'issue-filter-foot', :include_loading_icon => true) { |label, page_id| + link_to(label, params.merge({:pageIndex => page_id})) + } + end + %> + </table> + </div> +<% + end +%> - <% @issues_result.issues.each do |issue| %> +<script type="text/javascript"> + var filterCriteria = <%= json_escape(@issues_query_params.to_json) -%>; - <li data-key="<%= h issue.key -%>"> + function refreshList(sort, asc, page) { + $j('#issue-filter-foot_pages').hide(); + $j('#issue-filter-foot_loading').show(); - <div class="line line-small"> - <i class="icon-severity-<%= issue.severity.downcase -%>" title="<%= message(issue.severity.downcase).capitalize -%>"></i><%= message(issue.severity.downcase).capitalize -%> - - <i class="icon-status-<%= issue.status.downcase -%>" title="<%= message(issue.status.downcase).capitalize -%>"></i><%= message(issue.status.downcase).capitalize -%> - <% if issue.resolution %> - - <i class="icon-resolution-<%= issue.resolution.downcase -%>" title="<%= message(issue.resolution.downcase).capitalize -%>"></i><%= message(issue.resolution.downcase).capitalize -%> - <% end %> + filterCriteria['sort']=sort; + filterCriteria['asc']=asc; + filterCriteria['pageIndex']=page; + var url = baseUrl + '/issues/search?' + $j.param(filterCriteria); - <div class="line-right"> - <%= human_short_date(Api::Utils.java_to_ruby_datetime(issue.updateDate())) -%> - </div> - </div> + <% if @ajax_mode %> + $j('.issues-content').load(url, function () { + // As issues will be loaded after open-modal has been processed by jQuery, we have to process manually modal classes + processModal(); + }); + <% else %> + window.location = url; + <% end %> + return false; + } - <div class="line line-nowrap"> - <%= h issue.message -%> - </div> - - <div class="line"> - <% project = @issues_result.project(issue) - component = @issues_result.component(issue) -%> - <div class="subtitle"><%= h (truncate(project.name, :length => 100)) -%></div> - <% if component %> - <% if component.key != project.key %> - <%= h component.longName -%> - <% end %> - <% else %> - <del><%= h issue.componentKey %></del> - <% end %> - </div> - - </li> + function processModal(){ + $j('.issues-content .open-modal').modal(); + } + <% if @ajax_mode %> + $j(document).ready(function() { + processModal(); + }); <% end %> -</ol> +</script> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb index 0fd737aefb6..972321c274d 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb @@ -1,27 +1,47 @@ <div class="navigator"> - <div class="navigator-header"> - <h1 class="navigator-header-title">Issues</h1> - </div> - <div class="navigator-filters"></div> - <div class="navigator-results"></div> - <div class="navigator-details"></div> - <div class="navigator-actions"></div> + <div class="navigator-results"> + <%= render :partial => 'search' -%> + </div> </div> +<script type="text/javascript"> + function onBulkIssues(issues_query_params){ + // SONAR-4723 pagination parameters should be removed after applying bulk change + delete issues_query_params.pageIndex; + window.location = baseUrl + '/issues/search?' + jQuery.param(issues_query_params); + } +</script> <script id="filterBarTemplate" type="text/template"> - <div class="navigator-filters-list"></div> + <form method="get" action="<%= ApplicationController.root_context -%>/issues/search"> + <% if @filter && @filter.id %> + <input type="hidden" name="id" value="<%= h @filter.id.to_s -%>"> + <% end %> + <input type="hidden" name="sort" value="<%= h @issues_query.sort -%>"/> + <input type="hidden" name="asc" value="<%= h @issues_query.asc -%>"/> + + <div class="navigator-filters-list"></div> + <button class="navigator-filter-submit"><%= message('search_verb') -%></button> + <a class="navigator-filter-new-search link-action" href="<%= ApplicationController.root_context -%>/issues/search"><%= message 'issue_filter.new_search' -%></a> + </form> </script> <%= render :partial => '/navigator/filter_templates' -%> -<%= render :partial => '/issues/templates/issue.hbs' -%> -<%= render :partial => '/issues/templates/issues_actions.hbs' -%> -<%= render :partial => '/issues/templates/no_issues.hbs' -%> +<% + component_labels = Project.by_keys(@issues_query.componentRoots).map{|c| c ? c.name : nil} + assignee_keys = @issues_query.assignees + assignee_labels = user_labels(@issues_query.assignees) + if @issues_query.assigned==false + assignee_keys = ['<unassigned>'] + assignee_keys + assignee_labels = [message('unassigned')] + assignee_labels + end + reporter_labels = user_labels(@issues_query.reporters) +%> <script> _.templateSettings = { @@ -75,7 +95,17 @@ } }); - jQuery(function() { - window.SS.IssuesNavigatorApp.start(); - }); + var queryParams = [ + { key: 'componentRoots', value: <%= @issues_query.componentRoots.to_json -%>, text: <%= component_labels.to_json -%> }, + { key: 'severities[]', value: <%= @issues_query.severities.to_json -%> }, + { key: 'statuses[]', value: <%= @issues_query.statuses.to_json -%> }, + { key: 'resolutions[]', value: <%= @issues_query.resolutions.to_json -%> }, + { key: 'assignees', value: <%= assignee_keys.to_json -%>, text: <%= assignee_labels.to_json -%> }, + { key: 'reporters', value: <%= @issues_query.reporters.to_json -%>, text: <%= reporter_labels.to_json -%> }, + { key: 'createdAfter', value: '<%= Api::Utils.format_date(@issues_query.createdAfter) -%>' }, + { key: 'createdBefore', value: '<%= Api::Utils.format_date(@issues_query.createdBefore) -%>' } + ]; + + window.SS.IssuesNavigatorApp.start(); + window.SS.IssuesNavigatorApp.filterBarView.restoreFromQuery(queryParams); </script> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb deleted file mode 100644 index 74cca976847..00000000000 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb +++ /dev/null @@ -1,22 +0,0 @@ -<script id="issue-template" type="text/x-handlebars-template"> - <div class="line line-small"> - {{severityIcon severity}}{{capitalize severity}} - {{statusIcon status}}{{capitalize status}} - {{#if resolution}} - {{resolutionIcon resolution}}{{capitalize resolution}} - {{/if}} - - <div class="line-right"> - {{fromNow updateDate}} - </div> - </div> - - <div class="line line-nowrap" title="{{rule.name}}"> - {{rule.name}} - </div> - - <div class="line"> - <div class="subtitle">{{project.longName}}</div> - {{component.longName}} - </div> -</script> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb deleted file mode 100644 index 3f5aea023b4..00000000000 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb +++ /dev/null @@ -1,7 +0,0 @@ -<script id="issues-actions-template" type="text/x-handlebars-template"> - <div class="navigator-actions-order">Order by <i class="icon-arrow-down"></i></div> - <div class="navigator-actions-total"> - Found: {{paging.total}} - <span class="navigator-actions-bulk" title="Bulk Change"><i class="icon-settings"></i></span> - </div> -</script> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_no_issues.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_no_issues.hbs.erb deleted file mode 100644 index 1ff2e0ec3b5..00000000000 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_no_issues.hbs.erb +++ /dev/null @@ -1,6 +0,0 @@ -<script id="no-issues-template" type="text/x-handlebars-template"> - <div class="navigator-results-no-issues"> - <i class="icon-emoticon-sad"></i> - <p>No issues to display</p> - </div> -</script> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb index e0669ded869..77d4b16e06d 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb @@ -29,7 +29,6 @@ <%= stylesheet_link_tag 'select2-sonar', :media => 'all' %> <%= stylesheet_link_tag 'layout', :media => 'all' %> <%= stylesheet_link_tag 'style', :media => 'all' %> - <%= stylesheet_link_tag 'icons', :media => 'all' %> <%= stylesheet_link_tag 'ui', :media => 'all' %> <%= stylesheet_link_tag 'sonar-colorizer', :media => 'all' %> <%= stylesheet_link_tag 'dashboard', :media => 'all' %> @@ -45,10 +44,8 @@ <%= javascript_include_tag 'third-party/underscore-min' %> <%= javascript_include_tag 'third-party/backbone-min' %> <%= javascript_include_tag 'third-party/backbone.marionette.min' %> - <%= javascript_include_tag 'third-party/handlebars' %> <%= javascript_include_tag 'third-party/jquery.ba-throttle-debounce.min.js' %> <%= javascript_include_tag 'third-party/select2.min' %> - <%= javascript_include_tag 'third-party/moment.min' %> <%= javascript_include_tag 'widgets/widget' %> <%= javascript_include_tag 'widgets/bubble-chart' %> @@ -56,12 +53,9 @@ <%= javascript_include_tag 'widgets/stack-area' %> <%= javascript_include_tag 'widgets/pie-chart' %> <%= javascript_include_tag 'widgets/histogram' %> - <%= javascript_include_tag 'widgets/word-cloud' %> <%= javascript_include_tag 'select-list' %> - <%= javascript_include_tag 'navigator/handlebars-extensions' %> - <%= javascript_include_tag 'navigator/filters/base-filters' %> <%= javascript_include_tag 'navigator/filters/select-filters' %> <%= javascript_include_tag 'navigator/filters/ajax-select-filters' %> @@ -71,10 +65,7 @@ <%= javascript_include_tag 'navigator/filters/metric-filters' %> <%= javascript_include_tag 'navigator/filters/favorite-filters' %> <%= javascript_include_tag 'navigator/filters/more-criteria-filters' %> - - <%= javascript_include_tag 'navigator/issues' %> <%= javascript_include_tag 'navigator/issues-app' %> - <%= javascript_include_tag 'navigator/measures-app' %> <%= javascript_include_tag 'application' %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb index 709e1caf4d3..4696464cc94 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb @@ -1,4 +1,4 @@ -<div class="navigator navigator-simple"> +<div class="navigator"> <div class="navigator-filters"></div> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb index 4f6f4bf5ce3..15f95ff7521 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb @@ -18,7 +18,7 @@ <input type="checkbox" value="{{ item.id }}" {[ if (checked) { ]}checked{[ } ]}> {[ if (item.icon) { ]} - <i class="icon-{{ item.icon }}"></i> + <img src="{{ item.icon }}" alt="{{ item.text }}"> {[ } ]} <span> {{ item.text }} diff --git a/sonar-server/src/main/webapp/fonts/sonar.eot b/sonar-server/src/main/webapp/fonts/sonar.eot Binary files differdeleted file mode 100755 index b6130065578..00000000000 --- a/sonar-server/src/main/webapp/fonts/sonar.eot +++ /dev/null diff --git a/sonar-server/src/main/webapp/fonts/sonar.svg b/sonar-server/src/main/webapp/fonts/sonar.svg deleted file mode 100755 index 6db852509e9..00000000000 --- a/sonar-server/src/main/webapp/fonts/sonar.svg +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > -<svg xmlns="http://www.w3.org/2000/svg"> -<metadata>Generated by IcoMoon</metadata> -<defs> -<font id="sonar" horiz-adv-x="1024"> -<font-face units-per-em="1024" ascent="960" descent="-64" /> -<missing-glyph horiz-adv-x="1024" /> -<glyph unicode=" " d="" horiz-adv-x="512" /> -<glyph unicode="" d="M438.857 865.524q119.429 0 220.286-58.857t159.714-159.714 58.857-220.286-58.857-220.286-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857zM512 152.953v108.571q0 8-5.143 13.429t-12.571 5.429h-109.714q-7.429 0-13.143-5.714t-5.714-13.143v-108.571q0-7.429 5.714-13.143t13.143-5.714h109.714q7.429 0 12.571 5.429t5.143 13.429zM510.857 349.524l10.286 354.857q0 6.857-5.714 10.286-5.714 4.571-13.714 4.571h-125.714q-8 0-13.714-4.571-5.714-3.429-5.714-10.286l9.714-354.857q0-5.714 5.714-10t13.714-4.286h105.714q8 0 13.429 4.286t6 10z" /> -<glyph unicode="" d="M733.714 427.238q0 15.429-10.286 25.714l-258.857 258.857q-10.286 10.286-25.714 10.286t-25.714-10.286l-258.857-258.857q-10.286-10.286-10.286-25.714t10.286-25.714l52-52q10.286-10.286 25.714-10.286t25.714 10.286l108 108v-286.857q0-14.857 10.857-25.714t25.714-10.857h73.143q14.857 0 25.714 10.857t10.857 25.714v286.857l108-108q10.857-10.857 25.714-10.857t25.714 10.857l52 52q10.286 10.286 10.286 25.714zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -<glyph unicode="" d="M665.714 287.81l58.286 58.286q10.857 10.857 10.857 25.714t-10.857 25.714l-259.429 259.429q-10.857 10.857-25.714 10.857t-25.714-10.857l-259.429-259.429q-10.857-10.857-10.857-25.714t10.857-25.714l58.286-58.286q10.857-10.857 25.714-10.857t25.714 10.857l175.429 175.429 175.429-175.429q10.857-10.857 25.714-10.857t25.714 10.857zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -<glyph unicode="" d="M464.571 196.381l259.429 259.429q10.857 10.857 10.857 25.714t-10.857 25.714l-58.286 58.286q-10.857 10.857-25.714 10.857t-25.714-10.857l-175.429-175.429-175.429 175.429q-10.857 10.857-25.714 10.857t-25.714-10.857l-58.286-58.286q-10.857-10.857-10.857-25.714t10.857-25.714l259.429-259.429q10.857-10.857 25.714-10.857t25.714 10.857zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -<glyph unicode="" d="M733.714 426.096q0 15.429-10.286 25.714l-52 52q-10.286 10.286-25.714 10.286t-25.714-10.286l-108-108v286.857q0 14.857-10.857 25.714t-25.714 10.857h-73.143q-14.857 0-25.714-10.857t-10.857-25.714v-286.857l-108 108q-10.857 10.857-25.714 10.857t-25.714-10.857l-52-52q-10.286-10.286-10.286-25.714t10.286-25.714l258.857-258.857q10.286-10.286 25.714-10.286t25.714 10.286l258.857 258.857q10.286 10.286 10.286 25.714zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -<glyph unicode="" d="M438.857 737.524q-84.571 0-156-41.714t-113.143-113.143-41.714-156 41.714-156 113.143-113.143 156-41.714 156 41.714 113.143 113.143 41.714 156-41.714 156-113.143 113.143-156 41.714zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -<glyph unicode="" d="M585.143 426.667q0-60.571-42.857-103.429t-103.429-42.857-103.429 42.857-42.857 103.429 42.857 103.429 103.429 42.857 103.429-42.857 42.857-103.429zM438.857 737.524q-84.571 0-156-41.714t-113.143-113.143-41.714-156 41.714-156 113.143-113.143 156-41.714 156 41.714 113.143 113.143 41.714 156-41.714 156-113.143 113.143-156 41.714zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -<glyph unicode="" d="M438.857 115.81v621.714q-84.571 0-156-41.714t-113.143-113.143-41.714-156 41.714-156 113.143-113.143 156-41.714zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -<glyph unicode="" d="M733.714 519.238q0 16-10.286 26.286l-52 51.429q-10.857 10.857-25.714 10.857t-25.714-10.857l-233.143-232.571-129.143 129.143q-10.857 10.857-25.714 10.857t-25.714-10.857l-52-51.429q-10.286-10.286-10.286-26.286 0-15.429 10.286-25.714l206.857-206.857q10.857-10.857 25.714-10.857 15.429 0 26.286 10.857l310.286 310.286q10.286 10.286 10.286 25.714zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -<glyph unicode="" d="M877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -<glyph unicode="" d="M585.143 426.667q0 60.571-42.857 103.429t-103.429 42.857-103.429-42.857-42.857-103.429 42.857-103.429 103.429-42.857 103.429 42.857 42.857 103.429zM877.714 488.953v-126.857q0-6.857-4.571-13.143t-11.429-7.429l-105.714-16q-10.857-30.857-22.286-52 20-28.571 61.143-78.857 5.714-6.857 5.714-14.286t-5.143-13.143q-15.429-21.143-56.571-61.714t-53.714-40.571q-6.857 0-14.857 5.143l-78.857 61.714q-25.143-13.143-52-21.714-9.143-77.714-16.571-106.286-4-16-20.571-16h-126.857q-8 0-14 4.857t-6.571 12.286l-16 105.143q-28 9.143-51.429 21.143l-80.571-61.143q-5.714-5.143-14.286-5.143-8 0-14.286 6.286-72 65.143-94.286 96-4 5.714-4 13.143 0 6.857 4.571 13.143 8.571 12 29.143 38t30.857 40.286q-15.429 28.571-23.429 56.571l-104.571 15.429q-7.429 1.143-12 7.143t-4.571 13.429v126.857q0 6.857 4.571 13.143t10.857 7.429l106.286 16q8 26.286 22.286 52.571-22.857 32.571-61.143 78.857-5.714 6.857-5.714 13.714 0 5.714 5.143 13.143 14.857 20.571 56.286 61.429t54 40.857q7.429 0 14.857-5.714l78.857-61.143q25.143 13.143 52 21.714 9.143 77.714 16.571 106.286 4 16 20.571 16h126.857q8 0 14-4.857t6.571-12.286l16-105.143q28-9.143 51.429-21.143l81.143 61.143q5.143 5.143 13.714 5.143 7.429 0 14.286-5.714 73.714-68 94.286-97.143 4-4.571 4-12.571 0-6.857-4.571-13.143-8.571-12-29.143-38t-30.857-40.286q14.857-28.571 23.429-56l104.571-16q7.429-1.143 12-7.143t4.571-13.429z" /> -<glyph unicode="" d="M1024 170.667v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-950.857q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h950.857q14.857 0 25.714-10.857t10.857-25.714zM1024 390.096v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-950.857q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h950.857q14.857 0 25.714-10.857t10.857-25.714zM1024 609.524v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-950.857q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h950.857q14.857 0 25.714-10.857t10.857-25.714zM1024 828.953v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-950.857q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h950.857q14.857 0 25.714-10.857t10.857-25.714z" /> -<glyph unicode="" d="M626.857 322.096l-83.429-83.429q-5.714-5.714-13.143-5.714t-13.143 5.714l-78.286 78.286-78.286-78.286q-5.714-5.714-13.143-5.714t-13.143 5.714l-83.429 83.429q-5.714 5.714-5.714 13.143t5.714 13.143l78.286 78.286-78.286 78.286q-5.714 5.714-5.714 13.143t5.714 13.143l83.429 83.429q5.714 5.714 13.143 5.714t13.143-5.714l78.286-78.286 78.286 78.286q5.714 5.714 13.143 5.714t13.143-5.714l83.429-83.429q5.714-5.714 5.714-13.143t-5.714-13.143l-78.286-78.286 78.286-78.286q5.714-5.714 5.714-13.143t-5.714-13.143zM749.714 426.667q0 84.571-41.714 156t-113.143 113.143-156 41.714-156-41.714-113.143-113.143-41.714-156 41.714-156 113.143-113.143 156-41.714 156 41.714 113.143 113.143 41.714 156zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -<glyph unicode="" d="M669.143 474.096l-241.143-241.143q-10.857-10.857-25.714-10.857t-25.714 10.857l-168 168q-10.857 10.857-10.857 25.714t10.857 25.714l58.286 58.286q10.857 10.857 25.714 10.857t25.714-10.857l84-84 157.143 157.143q10.857 10.857 25.714 10.857t25.714-10.857l58.286-58.286q10.857-10.857 10.857-25.714t-10.857-25.714zM749.714 426.667q0 84.571-41.714 156t-113.143 113.143-156 41.714-156-41.714-113.143-113.143-41.714-156 41.714-156 113.143-113.143 156-41.714 156 41.714 113.143 113.143 41.714 156zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -<glyph unicode="" d="M749.714 428.381q0 92-49.714 168.571l-430.857-430.286q78.286-50.857 169.714-50.857 63.429 0 120.857 24.857t99.143 66.571 66.286 99.714 24.571 121.429zM178.857 257.524l431.429 430.857q-77.143 52-171.429 52-84.571 0-156-41.714t-113.143-113.714-41.714-156.571q0-92.571 50.857-170.857zM877.714 428.381q0-89.714-34.857-171.429t-93.429-140.571-140-93.714-170.571-34.857-170.571 34.857-140 93.714-93.429 140.571-34.857 171.429 34.857 171.143 93.429 140.286 140 93.714 170.571 34.857 170.571-34.857 140-93.714 93.429-140.286 34.857-171.143z" /> -<glyph unicode="" d="M585.143 536.381q0-14.857-10.857-25.714l-256-256q-10.857-10.857-25.714-10.857t-25.714 10.857l-256 256q-10.857 10.857-10.857 25.714t10.857 25.714 25.714 10.857h512q14.857 0 25.714-10.857t10.857-25.714z" horiz-adv-x="585" /> -<glyph unicode="" d="M585.143 243.81q0-14.857-10.857-25.714t-25.714-10.857h-512q-14.857 0-25.714 10.857t-10.857 25.714 10.857 25.714l256 256q10.857 10.857 25.714 10.857t25.714-10.857l256-256q10.857-10.857 10.857-25.714z" horiz-adv-x="585" /> -<glyph unicode="" d="M365.714 682.667v-512q0-14.857-10.857-25.714t-25.714-10.857-25.714 10.857l-256 256q-10.857 10.857-10.857 25.714t10.857 25.714l256 256q10.857 10.857 25.714 10.857t25.714-10.857 10.857-25.714z" horiz-adv-x="366" /> -<glyph unicode="" d="M329.143 426.667q0-14.857-10.857-25.714l-256-256q-10.857-10.857-25.714-10.857t-25.714 10.857-10.857 25.714v512q0 14.857 10.857 25.714t25.714 10.857 25.714-10.857l256-256q10.857-10.857 10.857-25.714z" horiz-adv-x="366" /> -<glyph unicode="" d="M648 324.381q-21.143-69.143-78.857-111.429t-130.286-42.286-130.286 42.286-78.857 111.429q-4.571 14.286 2.286 27.714t21.714 18q14.286 4.571 27.714-2.286t18-21.714q14.286-45.714 52.857-74t86.571-28.286 86.571 28.286 52.857 74q4.571 14.857 18.286 21.714t28 2.286 21.143-18 2.286-27.714zM365.714 572.953q0-30.286-21.429-51.714t-51.714-21.429-51.714 21.429-21.429 51.714 21.429 51.714 51.714 21.429 51.714-21.429 21.429-51.714zM658.286 572.953q0-30.286-21.429-51.714t-51.714-21.429-51.714 21.429-21.429 51.714 21.429 51.714 51.714 21.429 51.714-21.429 21.429-51.714zM804.571 426.667q0 74.286-29.143 142t-78 116.571-116.571 78-142 29.143-142-29.143-116.571-78-78-116.571-29.143-142 29.143-142 78-116.571 116.571-78 142-29.143 142 29.143 116.571 78 78 116.571 29.143 142zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -<glyph unicode="" d="M648 236.381q4.571-14.286-2.286-27.714t-21.143-18-28 2.286-18.286 21.714q-14.286 45.714-52.857 74t-86.571 28.286-86.571-28.286-52.857-74q-4.571-14.857-18-21.714t-27.714-2.286q-14.857 4.571-21.714 18t-2.286 27.714q21.143 69.143 78.857 111.429t130.286 42.286 130.286-42.286 78.857-111.429zM365.714 572.953q0-30.286-21.429-51.714t-51.714-21.429-51.714 21.429-21.429 51.714 21.429 51.714 51.714 21.429 51.714-21.429 21.429-51.714zM658.286 572.953q0-30.286-21.429-51.714t-51.714-21.429-51.714 21.429-21.429 51.714 21.429 51.714 51.714 21.429 51.714-21.429 21.429-51.714zM804.571 426.667q0 74.286-29.143 142t-78 116.571-116.571 78-142 29.143-142-29.143-116.571-78-78-116.571-29.143-142 29.143-142 78-116.571 116.571-78 142-29.143 142 29.143 116.571 78 78 116.571 29.143 142zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -<glyph unicode="" d="M658.286 316.953q0-14.857-10.857-25.714t-25.714-10.857h-365.714q-14.857 0-25.714 10.857t-10.857 25.714 10.857 25.714 25.714 10.857h365.714q14.857 0 25.714-10.857t10.857-25.714zM365.714 572.953q0-30.286-21.429-51.714t-51.714-21.429-51.714 21.429-21.429 51.714 21.429 51.714 51.714 21.429 51.714-21.429 21.429-51.714zM658.286 572.953q0-30.286-21.429-51.714t-51.714-21.429-51.714 21.429-21.429 51.714 21.429 51.714 51.714 21.429 51.714-21.429 21.429-51.714zM804.571 426.667q0 74.286-29.143 142t-78 116.571-116.571 78-142 29.143-142-29.143-116.571-78-78-116.571-29.143-142 29.143-142 78-116.571 116.571-78 142-29.143 142 29.143 116.571 78 78 116.571 29.143 142zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" /> -</font></defs></svg>
\ No newline at end of file diff --git a/sonar-server/src/main/webapp/fonts/sonar.ttf b/sonar-server/src/main/webapp/fonts/sonar.ttf Binary files differdeleted file mode 100755 index fcc8534045c..00000000000 --- a/sonar-server/src/main/webapp/fonts/sonar.ttf +++ /dev/null diff --git a/sonar-server/src/main/webapp/fonts/sonar.woff b/sonar-server/src/main/webapp/fonts/sonar.woff Binary files differdeleted file mode 100755 index 5475b38184f..00000000000 --- a/sonar-server/src/main/webapp/fonts/sonar.woff +++ /dev/null diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js index 595354bb4ca..c1673f4018c 100644 --- a/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js +++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js @@ -203,10 +203,6 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; restore: function(value, param) { - if (_.isString(value)) { - value = value.split(','); - } - if (this.choices && this.selection && value.length > 0) { this.selection.reset([]); @@ -248,10 +244,7 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; this.model.set({ value: value, enabled: true - }, { - silent: true }); - this.renderBase(); }, @@ -398,19 +391,6 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; text: r.users[0].name + ' (' + r.users[0].login + ')' })); }); - }, - - - formatValue: function() { - var q = {}; - if (this.model.has('property') && this.model.has('value') && this.model.get('value').length > 0) { - var assignees = _.without(this.model.get('value'), '<unassigned>'); - if (assignees.length > 0) { - q[this.model.get('property')] = assignees.join(','); - } - q.assigned = this.model.get('value').length <= assignees.length; - } - return q; } }); diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/base-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/base-filters.js index 1d177b58ff7..84cd24b8668 100644 --- a/sonar-server/src/main/webapp/javascripts/navigator/filters/base-filters.js +++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/base-filters.js @@ -169,8 +169,7 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; restore: function(value) { - this.model.set({ value: value }, { silent: true }); - this.renderBase(); + this.model.set('value', value); }, @@ -185,15 +184,6 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; }, - formatValue: function() { - var q = {}; - if (this.model.has('property') && this.model.has('value') && this.model.get('value')) { - q[this.model.get('property')] = this.model.get('value'); - } - return q; - }, - - serializeData: function() { return _.extend({}, this.model.toJSON(), { value: this.renderValue(), @@ -293,7 +283,6 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; } this.moreCriteriaFilter.set('filters', disabledFilters); } - }); diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/range-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/range-filters.js index 34a9570e0af..763a13de618 100644 --- a/sonar-server/src/main/webapp/javascripts/navigator/filters/range-filters.js +++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/range-filters.js @@ -149,11 +149,6 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; enabled: true }); } - }, - - - formatValue: function() { - return this.model.get('value'); } }); diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js index d4e54059f4b..a8c6862bbe7 100644 --- a/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js +++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js @@ -203,7 +203,7 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; }); if (icons && icons[key]) { - model.set('icon', icons[key]); + model.set('icon', baseUrl + icons[key]); } return model; @@ -260,7 +260,7 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; restore: function(value) { if (_.isString(value)) { - value = value.split(','); + value = [value]; } if (this.choices && this.selection && value.length > 0) { @@ -282,21 +282,8 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; this.model.set({ value: value, enabled: true - }, { - silent: true }); - - this.renderBase(); - } - }, - - - formatValue: function() { - var q = {}; - if (this.model.has('property') && this.model.has('value') && this.model.get('value').length > 0) { - q[this.model.get('property')] = this.model.get('value').join(','); } - return q; } }); diff --git a/sonar-server/src/main/webapp/javascripts/navigator/handlebars-extensions.js b/sonar-server/src/main/webapp/javascripts/navigator/handlebars-extensions.js deleted file mode 100644 index e48963d3b8a..00000000000 --- a/sonar-server/src/main/webapp/javascripts/navigator/handlebars-extensions.js +++ /dev/null @@ -1,29 +0,0 @@ -(function() { - - Handlebars.registerHelper('capitalize', function(string) { - return string.charAt(0).toUpperCase() + string.slice(1).toLowerCase(); - }); - - Handlebars.registerHelper('severityIcon', function(severity) { - return new Handlebars.SafeString( - '<i class="icon-severity-' + severity.toLowerCase() + '"></i>' - ); - }); - - Handlebars.registerHelper('statusIcon', function(status) { - return new Handlebars.SafeString( - '<i class="icon-status-' + status.toLowerCase() + '"></i>' - ); - }); - - Handlebars.registerHelper('resolutionIcon', function(resolution) { - return new Handlebars.SafeString( - '<i class="icon-resolution-' + resolution.toLowerCase() + '"></i>' - ); - }); - - Handlebars.registerHelper('fromNow', function(time) { - return moment(time).fromNow(true); - }); - -})(); diff --git a/sonar-server/src/main/webapp/javascripts/navigator/issues-app.js b/sonar-server/src/main/webapp/javascripts/navigator/issues-app.js index 2b1a63c1315..901cf599353 100644 --- a/sonar-server/src/main/webapp/javascripts/navigator/issues-app.js +++ b/sonar-server/src/main/webapp/javascripts/navigator/issues-app.js @@ -2,7 +2,7 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; -jQuery(function() { +(function() { var NavigatorApp = new Backbone.Marionette.Application(); window.SS.IssuesNavigatorApp = NavigatorApp; @@ -10,25 +10,7 @@ jQuery(function() { NavigatorApp.addRegions({ - filtersRegion: '.navigator-filters', - resultsRegion: '.navigator-results', - actionsRegion: '.navigator-actions' - }); - - - NavigatorApp.addInitializer(function() { - this.issues = new window.SS.Issues(); - this.issuesPage = 1; - - this.issuesView = new window.SS.IssuesView({ - collection: this.issues - }); - this.resultsRegion.show(this.issuesView); - - this.issuesActionsView = new window.SS.IssuesActionsView({ - collection: this.issues - }); - this.actionsRegion.show(this.issuesActionsView); + filtersRegion: '.navigator-filters' }); @@ -58,7 +40,7 @@ jQuery(function() { new window.SS.Filter({ name: window.SS.phrases.severity, - property: 'severities', + property: 'severities[]', type: window.SS.SelectFilterView, enabled: true, optional: false, @@ -70,17 +52,17 @@ jQuery(function() { 'INFO': window.SS.phrases.severities.info }, choiceIcons: { - 'BLOCKER': 'severity-blocker', - 'CRITICAL': 'severity-critical', - 'MAJOR': 'severity-major', - 'MINOR': 'severity-minor', - 'INFO': 'severity-info' + 'BLOCKER': '/images/priority/BLOCKER.png', + 'CRITICAL': '/images/priority/CRITICAL.png', + 'MAJOR': '/images/priority/MAJOR.png', + 'MINOR': '/images/priority/MINOR.png', + 'INFO': '/images/priority/INFO.png' } }), new window.SS.Filter({ name: window.SS.phrases.status, - property: 'statuses', + property: 'statuses[]', type: window.SS.SelectFilterView, enabled: true, optional: false, @@ -90,13 +72,6 @@ jQuery(function() { 'REOPENED': window.SS.phrases.statuses.reopened, 'RESOLVED': window.SS.phrases.statuses.resolved, 'CLOSED': window.SS.phrases.statuses.closed - }, - choiceIcons: { - 'OPEN': 'status-open', - 'CONFIRMED': 'status-confirmed', - 'REOPENED': 'status-reopened', - 'RESOLVED': 'status-resolved', - 'CLOSED': 'status-closed' } }), @@ -110,7 +85,7 @@ jQuery(function() { new window.SS.Filter({ name: window.SS.phrases.resolution, - property: 'resolutions', + property: 'resolutions[]', type: window.SS.SelectFilterView, enabled: false, optional: true, @@ -140,8 +115,7 @@ jQuery(function() { ]); - this.filterBarView = new window.SS.IssuesFilterBarView({ - app: this, + this.filterBarView = new window.SS.FilterBarView({ collection: this.filters, extra: { sort: '', @@ -149,27 +123,8 @@ jQuery(function() { } }); - this.filtersRegion.show(this.filterBarView); - }); - - NavigatorApp.addInitializer(function() { - this.router = new window.SS.IssuesRouter({ - app: this - }); - Backbone.history.start() + this.filtersRegion.show(this.filterBarView); }); - - NavigatorApp.fetchFirstPage = function() { - this.issuesPage = 1; - this.filterBarView.fetchNextPage(); - }; - - - NavigatorApp.fetchNextPage = function() { - this.issuesPage++; - this.filterBarView.fetchNextPage(); - }; - -}); +})(); diff --git a/sonar-server/src/main/webapp/javascripts/navigator/issues.js b/sonar-server/src/main/webapp/javascripts/navigator/issues.js deleted file mode 100644 index b8841597a95..00000000000 --- a/sonar-server/src/main/webapp/javascripts/navigator/issues.js +++ /dev/null @@ -1,239 +0,0 @@ -/* global _:false, Backbone:false, baseUrl:false */ - -window.SS = typeof window.SS === 'object' ? window.SS : {}; - -jQuery(function() { - - var Issue = Backbone.Model.extend({ - - }); - - - - var Issues = Backbone.Collection.extend({ - model: Issue, - - - url: function() { - return baseUrl + '/api/issues/search'; - }, - - - parse: function(r) { - - function find(source, key) { - return _.findWhere(source, { key: key }); - } - - this.paging = r.paging; - - return r.issues.map(function(issue) { - return _.extend({}, issue, { - component: find(r.components, issue.component), - project: find(r.projects, issue.project), - rule: find(r.rules, issue.rule) - }); - }); - - } - }); - - - - var IssueView = Backbone.Marionette.ItemView.extend({ - template: Handlebars.compile(jQuery('#issue-template').html()), - tagName: 'li', - events: { - 'click': 'showDetails' - }, - - - showDetails: function() { - var projectKey = this.model.get('component').key, - issueKey = this.model.get('key'), - url = baseUrl + '/resource/index/' + projectKey + '?metric=violations&display_title=true', - details = jQuery('.navigator-details'); - - function scrollToIssue() { - var issue = jQuery('[data-issue-key="' + issueKey + '"]', details), - offset = issue.position().top - 40; - details.scrollTop(offset); - } - - function collapseIssues() { - var issues = jQuery('.code-issue', details); - issues.addClass('code-issue-collapsed'); - issues.filter('[data-issue-key="' + issueKey + '"]').removeClass('code-issue-collapsed'); - } - - this.$el.parent().children().removeClass('active'); - this.$el.addClass('active'); - details.empty().addClass('loading'); - jQuery.ajax({ - type: 'GET', - url: url - }).done(function(r) { - details.html(r).removeClass('loading'); - collapseIssues(); - scrollToIssue(); - }); - } - }); - - - - var NoIssuesView = Backbone.Marionette.ItemView.extend({ - template: Handlebars.compile(jQuery('#no-issues-template').html()) - }); - - - - var IssuesView = Backbone.Marionette.CollectionView.extend({ - tagName: 'ol', - className: 'navigator-results-list', - itemView: IssueView, - emptyView: NoIssuesView, - - - onRender: function() { - var $scrollEl = jQuery('.navigator-results'), - scrollEl = $scrollEl.get(0), - onScroll = function() { - if (scrollEl.offsetHeight + scrollEl.scrollTop >= scrollEl.scrollHeight) { - window.SS.IssuesNavigatorApp.fetchNextPage(); - } - }, - throttledScroll = _.throttle(onScroll, 300); - $scrollEl.off('scroll').on('scroll', throttledScroll); - }, - - - close: function() { - var scrollEl = jQuery('.navigator-results'); - scrollEl.off('scroll'); - Backbone.Marionette.CollectionView.prototype.close.call(this); - } - - }); - - - - var IssuesActionsView = Backbone.Marionette.ItemView.extend({ - template: Handlebars.compile(jQuery('#issues-actions-template').html()), - collectionEvents: { - 'sync': 'render' - }, - - - onRender: function() { - this.$el.toggle(this.collection.length > 0); - }, - - - serializeData: function() { - var data = Backbone.Marionette.ItemView.apply(this, arguments); - return _.extend(data || {}, { - paging: this.collection.paging - }); - } - }); - - - - var IssuesFilterBarView = window.SS.FilterBarView.extend({ - - collectionEvents: { - 'change:value': 'changeValue', - 'change:enabled': 'changeEnabled' - }, - - - getQuery: function() { - var query = {}; - this.collection.each(function(filter) { - _.extend(query, filter.view.formatValue()); - }); - return query; - }, - - - changeValue: function() { - var query = this.getQuery(), - fetchQuery =_.extend({ - pageIndex: this.options.app.issuesPage - }, query); - - this.storeQuery(query); - this.options.app.issues.fetch({ - data: fetchQuery - }); - }, - - - fetchNextPage: function() { - var query = this.getQuery(), - fetchQuery =_.extend({ - pageIndex: this.options.app.issuesPage - }, query); - - this.storeQuery(query); - this.options.app.issues.fetch({ - data: fetchQuery, - remove: false - }); - }, - - - storeQuery: function(query) { - var queryString = _.map(query, function(v, k) { - return [k, encodeURIComponent(v)].join('='); - }).join('&'); - this.options.app.router.navigate(queryString); - } - - }); - - - - var IssuesRouter = Backbone.Router.extend({ - - routes: { - '': 'index', - ':query': 'index' - }, - - - initialize: function(options) { - this.app = options.app; - }, - - - index: function(query) { - var params = (query || '').split('&').map(function(t) { - return { - key: t.split('=')[0], - value: decodeURIComponent(t.split('=')[1]) - } - }); - this.app.filterBarView.restoreFromQuery(params); - this.app.fetchFirstPage(); - } - }); - - - - /* - * Export public classes - */ - - _.extend(window.SS, { - Issue: Issue, - Issues: Issues, - IssueView: IssueView, - IssuesView: IssuesView, - IssuesActionsView: IssuesActionsView, - IssuesFilterBarView: IssuesFilterBarView, - IssuesRouter: IssuesRouter - }); - -}); diff --git a/sonar-server/src/main/webapp/javascripts/third-party/handlebars.js b/sonar-server/src/main/webapp/javascripts/third-party/handlebars.js deleted file mode 100644 index 1c64ca507d8..00000000000 --- a/sonar-server/src/main/webapp/javascripts/third-party/handlebars.js +++ /dev/null @@ -1,2610 +0,0 @@ -/*! - - handlebars v1.2.0 - -Copyright (C) 2011 by Yehuda Katz - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -@license -*/ -var Handlebars = (function() { -// handlebars/safe-string.js -var __module4__ = (function() { - "use strict"; - var __exports__; - // Build out our basic SafeString type - function SafeString(string) { - this.string = string; - } - - SafeString.prototype.toString = function() { - return "" + this.string; - }; - - __exports__ = SafeString; - return __exports__; -})(); - -// handlebars/utils.js -var __module3__ = (function(__dependency1__) { - "use strict"; - var __exports__ = {}; - /*jshint -W004 */ - var SafeString = __dependency1__; - - var escape = { - "&": "&", - "<": "<", - ">": ">", - '"': """, - "'": "'", - "`": "`" - }; - - var badChars = /[&<>"'`]/g; - var possible = /[&<>"'`]/; - - function escapeChar(chr) { - return escape[chr] || "&"; - } - - function extend(obj, value) { - for(var key in value) { - if(Object.prototype.hasOwnProperty.call(value, key)) { - obj[key] = value[key]; - } - } - } - - __exports__.extend = extend;var toString = Object.prototype.toString; - __exports__.toString = toString; - // Sourced from lodash - // https://github.com/bestiejs/lodash/blob/master/LICENSE.txt - var isFunction = function(value) { - return typeof value === 'function'; - }; - // fallback for older versions of Chrome and Safari - if (isFunction(/x/)) { - isFunction = function(value) { - return typeof value === 'function' && toString.call(value) === '[object Function]'; - }; - } - var isFunction; - __exports__.isFunction = isFunction; - var isArray = Array.isArray || function(value) { - return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false; - }; - __exports__.isArray = isArray; - - function escapeExpression(string) { - // don't escape SafeStrings, since they're already safe - if (string instanceof SafeString) { - return string.toString(); - } else if (!string && string !== 0) { - return ""; - } - - // Force a string conversion as this will be done by the append regardless and - // the regex test will do this transparently behind the scenes, causing issues if - // an object's to string has escaped characters in it. - string = "" + string; - - if(!possible.test(string)) { return string; } - return string.replace(badChars, escapeChar); - } - - __exports__.escapeExpression = escapeExpression;function isEmpty(value) { - if (!value && value !== 0) { - return true; - } else if (isArray(value) && value.length === 0) { - return true; - } else { - return false; - } - } - - __exports__.isEmpty = isEmpty; - return __exports__; -})(__module4__); - -// handlebars/exception.js -var __module5__ = (function() { - "use strict"; - var __exports__; - - var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack']; - - function Exception(/* message */) { - var tmp = Error.prototype.constructor.apply(this, arguments); - - // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work. - for (var idx = 0; idx < errorProps.length; idx++) { - this[errorProps[idx]] = tmp[errorProps[idx]]; - } - } - - Exception.prototype = new Error(); - - __exports__ = Exception; - return __exports__; -})(); - -// handlebars/base.js -var __module2__ = (function(__dependency1__, __dependency2__) { - "use strict"; - var __exports__ = {}; - var Utils = __dependency1__; - var Exception = __dependency2__; - - var VERSION = "1.2.0"; - __exports__.VERSION = VERSION;var COMPILER_REVISION = 4; - __exports__.COMPILER_REVISION = COMPILER_REVISION; - var REVISION_CHANGES = { - 1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it - 2: '== 1.0.0-rc.3', - 3: '== 1.0.0-rc.4', - 4: '>= 1.0.0' - }; - __exports__.REVISION_CHANGES = REVISION_CHANGES; - var isArray = Utils.isArray, - isFunction = Utils.isFunction, - toString = Utils.toString, - objectType = '[object Object]'; - - function HandlebarsEnvironment(helpers, partials) { - this.helpers = helpers || {}; - this.partials = partials || {}; - - registerDefaultHelpers(this); - } - - __exports__.HandlebarsEnvironment = HandlebarsEnvironment;HandlebarsEnvironment.prototype = { - constructor: HandlebarsEnvironment, - - logger: logger, - log: log, - - registerHelper: function(name, fn, inverse) { - if (toString.call(name) === objectType) { - if (inverse || fn) { throw new Exception('Arg not supported with multiple helpers'); } - Utils.extend(this.helpers, name); - } else { - if (inverse) { fn.not = inverse; } - this.helpers[name] = fn; - } - }, - - registerPartial: function(name, str) { - if (toString.call(name) === objectType) { - Utils.extend(this.partials, name); - } else { - this.partials[name] = str; - } - } - }; - - function registerDefaultHelpers(instance) { - instance.registerHelper('helperMissing', function(arg) { - if(arguments.length === 2) { - return undefined; - } else { - throw new Error("Missing helper: '" + arg + "'"); - } - }); - - instance.registerHelper('blockHelperMissing', function(context, options) { - var inverse = options.inverse || function() {}, fn = options.fn; - - if (isFunction(context)) { context = context.call(this); } - - if(context === true) { - return fn(this); - } else if(context === false || context == null) { - return inverse(this); - } else if (isArray(context)) { - if(context.length > 0) { - return instance.helpers.each(context, options); - } else { - return inverse(this); - } - } else { - return fn(context); - } - }); - - instance.registerHelper('each', function(context, options) { - var fn = options.fn, inverse = options.inverse; - var i = 0, ret = "", data; - - if (isFunction(context)) { context = context.call(this); } - - if (options.data) { - data = createFrame(options.data); - } - - if(context && typeof context === 'object') { - if (isArray(context)) { - for(var j = context.length; i<j; i++) { - if (data) { - data.index = i; - data.first = (i === 0); - data.last = (i === (context.length-1)); - } - ret = ret + fn(context[i], { data: data }); - } - } else { - for(var key in context) { - if(context.hasOwnProperty(key)) { - if(data) { - data.key = key; - data.index = i; - data.first = (i === 0); - } - ret = ret + fn(context[key], {data: data}); - i++; - } - } - } - } - - if(i === 0){ - ret = inverse(this); - } - - return ret; - }); - - instance.registerHelper('if', function(conditional, options) { - if (isFunction(conditional)) { conditional = conditional.call(this); } - - // Default behavior is to render the positive path if the value is truthy and not empty. - // The `includeZero` option may be set to treat the condtional as purely not empty based on the - // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative. - if ((!options.hash.includeZero && !conditional) || Utils.isEmpty(conditional)) { - return options.inverse(this); - } else { - return options.fn(this); - } - }); - - instance.registerHelper('unless', function(conditional, options) { - return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash}); - }); - - instance.registerHelper('with', function(context, options) { - if (isFunction(context)) { context = context.call(this); } - - if (!Utils.isEmpty(context)) return options.fn(context); - }); - - instance.registerHelper('log', function(context, options) { - var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1; - instance.log(level, context); - }); - } - - var logger = { - methodMap: { 0: 'debug', 1: 'info', 2: 'warn', 3: 'error' }, - - // State enum - DEBUG: 0, - INFO: 1, - WARN: 2, - ERROR: 3, - level: 3, - - // can be overridden in the host environment - log: function(level, obj) { - if (logger.level <= level) { - var method = logger.methodMap[level]; - if (typeof console !== 'undefined' && console[method]) { - console[method].call(console, obj); - } - } - } - }; - __exports__.logger = logger; - function log(level, obj) { logger.log(level, obj); } - - __exports__.log = log;var createFrame = function(object) { - var obj = {}; - Utils.extend(obj, object); - return obj; - }; - __exports__.createFrame = createFrame; - return __exports__; -})(__module3__, __module5__); - -// handlebars/runtime.js -var __module6__ = (function(__dependency1__, __dependency2__, __dependency3__) { - "use strict"; - var __exports__ = {}; - var Utils = __dependency1__; - var Exception = __dependency2__; - var COMPILER_REVISION = __dependency3__.COMPILER_REVISION; - var REVISION_CHANGES = __dependency3__.REVISION_CHANGES; - - function checkRevision(compilerInfo) { - var compilerRevision = compilerInfo && compilerInfo[0] || 1, - currentRevision = COMPILER_REVISION; - - if (compilerRevision !== currentRevision) { - if (compilerRevision < currentRevision) { - var runtimeVersions = REVISION_CHANGES[currentRevision], - compilerVersions = REVISION_CHANGES[compilerRevision]; - throw new Error("Template was precompiled with an older version of Handlebars than the current runtime. "+ - "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+")."); - } else { - // Use the embedded version info since the runtime doesn't know about this revision yet - throw new Error("Template was precompiled with a newer version of Handlebars than the current runtime. "+ - "Please update your runtime to a newer version ("+compilerInfo[1]+")."); - } - } - } - - __exports__.checkRevision = checkRevision;// TODO: Remove this line and break up compilePartial - - function template(templateSpec, env) { - if (!env) { - throw new Error("No environment passed to template"); - } - - // Note: Using env.VM references rather than local var references throughout this section to allow - // for external users to override these as psuedo-supported APIs. - var invokePartialWrapper = function(partial, name, context, helpers, partials, data) { - var result = env.VM.invokePartial.apply(this, arguments); - if (result != null) { return result; } - - if (env.compile) { - var options = { helpers: helpers, partials: partials, data: data }; - partials[name] = env.compile(partial, { data: data !== undefined }, env); - return partials[name](context, options); - } else { - throw new Exception("The partial " + name + " could not be compiled when running in runtime-only mode"); - } - }; - - // Just add water - var container = { - escapeExpression: Utils.escapeExpression, - invokePartial: invokePartialWrapper, - programs: [], - program: function(i, fn, data) { - var programWrapper = this.programs[i]; - if(data) { - programWrapper = program(i, fn, data); - } else if (!programWrapper) { - programWrapper = this.programs[i] = program(i, fn); - } - return programWrapper; - }, - merge: function(param, common) { - var ret = param || common; - - if (param && common && (param !== common)) { - ret = {}; - Utils.extend(ret, common); - Utils.extend(ret, param); - } - return ret; - }, - programWithDepth: env.VM.programWithDepth, - noop: env.VM.noop, - compilerInfo: null - }; - - return function(context, options) { - options = options || {}; - var namespace = options.partial ? options : env, - helpers, - partials; - - if (!options.partial) { - helpers = options.helpers; - partials = options.partials; - } - var result = templateSpec.call( - container, - namespace, context, - helpers, - partials, - options.data); - - if (!options.partial) { - env.VM.checkRevision(container.compilerInfo); - } - - return result; - }; - } - - __exports__.template = template;function programWithDepth(i, fn, data /*, $depth */) { - var args = Array.prototype.slice.call(arguments, 3); - - var prog = function(context, options) { - options = options || {}; - - return fn.apply(this, [context, options.data || data].concat(args)); - }; - prog.program = i; - prog.depth = args.length; - return prog; - } - - __exports__.programWithDepth = programWithDepth;function program(i, fn, data) { - var prog = function(context, options) { - options = options || {}; - - return fn(context, options.data || data); - }; - prog.program = i; - prog.depth = 0; - return prog; - } - - __exports__.program = program;function invokePartial(partial, name, context, helpers, partials, data) { - var options = { partial: true, helpers: helpers, partials: partials, data: data }; - - if(partial === undefined) { - throw new Exception("The partial " + name + " could not be found"); - } else if(partial instanceof Function) { - return partial(context, options); - } - } - - __exports__.invokePartial = invokePartial;function noop() { return ""; } - - __exports__.noop = noop; - return __exports__; -})(__module3__, __module5__, __module2__); - -// handlebars.runtime.js -var __module1__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) { - "use strict"; - var __exports__; - /*globals Handlebars: true */ - var base = __dependency1__; - - // Each of these augment the Handlebars object. No need to setup here. - // (This is done to easily share code between commonjs and browse envs) - var SafeString = __dependency2__; - var Exception = __dependency3__; - var Utils = __dependency4__; - var runtime = __dependency5__; - - // For compatibility and usage outside of module systems, make the Handlebars object a namespace - var create = function() { - var hb = new base.HandlebarsEnvironment(); - - Utils.extend(hb, base); - hb.SafeString = SafeString; - hb.Exception = Exception; - hb.Utils = Utils; - - hb.VM = runtime; - hb.template = function(spec) { - return runtime.template(spec, hb); - }; - - return hb; - }; - - var Handlebars = create(); - Handlebars.create = create; - - __exports__ = Handlebars; - return __exports__; -})(__module2__, __module4__, __module5__, __module3__, __module6__); - -// handlebars/compiler/ast.js -var __module7__ = (function(__dependency1__) { - "use strict"; - var __exports__; - var Exception = __dependency1__; - - var AST = { - ProgramNode: function(statements, inverseStrip, inverse) { - this.type = "program"; - this.statements = statements; - this.strip = {}; - - if(inverse) { - this.inverse = new AST.ProgramNode(inverse, inverseStrip); - this.strip.right = inverseStrip.left; - } else if (inverseStrip) { - this.strip.left = inverseStrip.right; - } - }, - - MustacheNode: function(rawParams, hash, open, strip) { - this.type = "mustache"; - this.hash = hash; - this.strip = strip; - - // Open may be a string parsed from the parser or a passed boolean flag - if (open != null && open.charAt) { - // Must use charAt to support IE pre-10 - var escapeFlag = open.charAt(3) || open.charAt(2); - this.escaped = escapeFlag !== '{' && escapeFlag !== '&'; - } else { - this.escaped = !!open; - } - - var id = this.id = rawParams[0]; - var params = this.params = rawParams.slice(1); - - // a mustache is an eligible helper if: - // * its id is simple (a single part, not `this` or `..`) - var eligibleHelper = this.eligibleHelper = id.isSimple; - - // a mustache is definitely a helper if: - // * it is an eligible helper, and - // * it has at least one parameter or hash segment - this.isHelper = eligibleHelper && (params.length || hash); - - // if a mustache is an eligible helper but not a definite - // helper, it is ambiguous, and will be resolved in a later - // pass or at runtime. - }, - - PartialNode: function(partialName, context, strip) { - this.type = "partial"; - this.partialName = partialName; - this.context = context; - this.strip = strip; - }, - - BlockNode: function(mustache, program, inverse, close) { - if(mustache.id.original !== close.path.original) { - throw new Exception(mustache.id.original + " doesn't match " + close.path.original); - } - - this.type = "block"; - this.mustache = mustache; - this.program = program; - this.inverse = inverse; - - this.strip = { - left: mustache.strip.left, - right: close.strip.right - }; - - (program || inverse).strip.left = mustache.strip.right; - (inverse || program).strip.right = close.strip.left; - - if (inverse && !program) { - this.isInverse = true; - } - }, - - ContentNode: function(string) { - this.type = "content"; - this.string = string; - }, - - HashNode: function(pairs) { - this.type = "hash"; - this.pairs = pairs; - }, - - IdNode: function(parts) { - this.type = "ID"; - - var original = "", - dig = [], - depth = 0; - - for(var i=0,l=parts.length; i<l; i++) { - var part = parts[i].part; - original += (parts[i].separator || '') + part; - - if (part === ".." || part === "." || part === "this") { - if (dig.length > 0) { throw new Exception("Invalid path: " + original); } - else if (part === "..") { depth++; } - else { this.isScoped = true; } - } - else { dig.push(part); } - } - - this.original = original; - this.parts = dig; - this.string = dig.join('.'); - this.depth = depth; - - // an ID is simple if it only has one part, and that part is not - // `..` or `this`. - this.isSimple = parts.length === 1 && !this.isScoped && depth === 0; - - this.stringModeValue = this.string; - }, - - PartialNameNode: function(name) { - this.type = "PARTIAL_NAME"; - this.name = name.original; - }, - - DataNode: function(id) { - this.type = "DATA"; - this.id = id; - }, - - StringNode: function(string) { - this.type = "STRING"; - this.original = - this.string = - this.stringModeValue = string; - }, - - IntegerNode: function(integer) { - this.type = "INTEGER"; - this.original = - this.integer = integer; - this.stringModeValue = Number(integer); - }, - - BooleanNode: function(bool) { - this.type = "BOOLEAN"; - this.bool = bool; - this.stringModeValue = bool === "true"; - }, - - CommentNode: function(comment) { - this.type = "comment"; - this.comment = comment; - } - }; - - // Must be exported as an object rather than the root of the module as the jison lexer - // most modify the object to operate properly. - __exports__ = AST; - return __exports__; -})(__module5__); - -// handlebars/compiler/parser.js -var __module9__ = (function() { - "use strict"; - var __exports__; - /* jshint ignore:start */ - /* Jison generated parser */ - var handlebars = (function(){ - var parser = {trace: function trace() { }, - yy: {}, - symbols_: {"error":2,"root":3,"statements":4,"EOF":5,"program":6,"simpleInverse":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"inMustache":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"CLOSE_UNESCAPED":24,"OPEN_PARTIAL":25,"partialName":26,"partial_option0":27,"inMustache_repetition0":28,"inMustache_option0":29,"dataName":30,"param":31,"STRING":32,"INTEGER":33,"BOOLEAN":34,"hash":35,"hash_repetition_plus0":36,"hashSegment":37,"ID":38,"EQUALS":39,"DATA":40,"pathSegments":41,"SEP":42,"$accept":0,"$end":1}, - terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"CLOSE_UNESCAPED",25:"OPEN_PARTIAL",32:"STRING",33:"INTEGER",34:"BOOLEAN",38:"ID",39:"EQUALS",40:"DATA",42:"SEP"}, - productions_: [0,[3,2],[3,1],[6,2],[6,3],[6,2],[6,1],[6,1],[6,0],[4,1],[4,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,4],[7,2],[17,3],[17,1],[31,1],[31,1],[31,1],[31,1],[31,1],[35,1],[37,3],[26,1],[26,1],[26,1],[30,2],[21,1],[41,3],[41,1],[27,0],[27,1],[28,0],[28,2],[29,0],[29,1],[36,1],[36,2]], - performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) { - - var $0 = $$.length - 1; - switch (yystate) { - case 1: return new yy.ProgramNode($$[$0-1]); - break; - case 2: return new yy.ProgramNode([]); - break; - case 3:this.$ = new yy.ProgramNode([], $$[$0-1], $$[$0]); - break; - case 4:this.$ = new yy.ProgramNode($$[$0-2], $$[$0-1], $$[$0]); - break; - case 5:this.$ = new yy.ProgramNode($$[$0-1], $$[$0], []); - break; - case 6:this.$ = new yy.ProgramNode($$[$0]); - break; - case 7:this.$ = new yy.ProgramNode([]); - break; - case 8:this.$ = new yy.ProgramNode([]); - break; - case 9:this.$ = [$$[$0]]; - break; - case 10: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; - break; - case 11:this.$ = new yy.BlockNode($$[$0-2], $$[$0-1].inverse, $$[$0-1], $$[$0]); - break; - case 12:this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0-1].inverse, $$[$0]); - break; - case 13:this.$ = $$[$0]; - break; - case 14:this.$ = $$[$0]; - break; - case 15:this.$ = new yy.ContentNode($$[$0]); - break; - case 16:this.$ = new yy.CommentNode($$[$0]); - break; - case 17:this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2], stripFlags($$[$0-2], $$[$0])); - break; - case 18:this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2], stripFlags($$[$0-2], $$[$0])); - break; - case 19:this.$ = {path: $$[$0-1], strip: stripFlags($$[$0-2], $$[$0])}; - break; - case 20:this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2], stripFlags($$[$0-2], $$[$0])); - break; - case 21:this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2], stripFlags($$[$0-2], $$[$0])); - break; - case 22:this.$ = new yy.PartialNode($$[$0-2], $$[$0-1], stripFlags($$[$0-3], $$[$0])); - break; - case 23:this.$ = stripFlags($$[$0-1], $$[$0]); - break; - case 24:this.$ = [[$$[$0-2]].concat($$[$0-1]), $$[$0]]; - break; - case 25:this.$ = [[$$[$0]], null]; - break; - case 26:this.$ = $$[$0]; - break; - case 27:this.$ = new yy.StringNode($$[$0]); - break; - case 28:this.$ = new yy.IntegerNode($$[$0]); - break; - case 29:this.$ = new yy.BooleanNode($$[$0]); - break; - case 30:this.$ = $$[$0]; - break; - case 31:this.$ = new yy.HashNode($$[$0]); - break; - case 32:this.$ = [$$[$0-2], $$[$0]]; - break; - case 33:this.$ = new yy.PartialNameNode($$[$0]); - break; - case 34:this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0])); - break; - case 35:this.$ = new yy.PartialNameNode(new yy.IntegerNode($$[$0])); - break; - case 36:this.$ = new yy.DataNode($$[$0]); - break; - case 37:this.$ = new yy.IdNode($$[$0]); - break; - case 38: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2]; - break; - case 39:this.$ = [{part: $$[$0]}]; - break; - case 42:this.$ = []; - break; - case 43:$$[$0-1].push($$[$0]); - break; - case 46:this.$ = [$$[$0]]; - break; - case 47:$$[$0-1].push($$[$0]); - break; - } - }, - table: [{3:1,4:2,5:[1,3],8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],25:[1,15]},{1:[3]},{5:[1,16],8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],25:[1,15]},{1:[2,2]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],25:[2,9]},{4:20,6:18,7:19,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,8],22:[1,13],23:[1,14],25:[1,15]},{4:20,6:22,7:19,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,8],22:[1,13],23:[1,14],25:[1,15]},{5:[2,13],14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],25:[2,13]},{5:[2,14],14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],25:[2,14]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],25:[2,15]},{5:[2,16],14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],25:[2,16]},{17:23,21:24,30:25,38:[1,28],40:[1,27],41:26},{17:29,21:24,30:25,38:[1,28],40:[1,27],41:26},{17:30,21:24,30:25,38:[1,28],40:[1,27],41:26},{17:31,21:24,30:25,38:[1,28],40:[1,27],41:26},{21:33,26:32,32:[1,34],33:[1,35],38:[1,28],41:26},{1:[2,1]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],25:[2,10]},{10:36,20:[1,37]},{4:38,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,7],22:[1,13],23:[1,14],25:[1,15]},{7:39,8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,6],22:[1,13],23:[1,14],25:[1,15]},{17:23,18:[1,40],21:24,30:25,38:[1,28],40:[1,27],41:26},{10:41,20:[1,37]},{18:[1,42]},{18:[2,42],24:[2,42],28:43,32:[2,42],33:[2,42],34:[2,42],38:[2,42],40:[2,42]},{18:[2,25],24:[2,25]},{18:[2,37],24:[2,37],32:[2,37],33:[2,37],34:[2,37],38:[2,37],40:[2,37],42:[1,44]},{21:45,38:[1,28],41:26},{18:[2,39],24:[2,39],32:[2,39],33:[2,39],34:[2,39],38:[2,39],40:[2,39],42:[2,39]},{18:[1,46]},{18:[1,47]},{24:[1,48]},{18:[2,40],21:50,27:49,38:[1,28],41:26},{18:[2,33],38:[2,33]},{18:[2,34],38:[2,34]},{18:[2,35],38:[2,35]},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],25:[2,11]},{21:51,38:[1,28],41:26},{8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,3],22:[1,13],23:[1,14],25:[1,15]},{4:52,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,5],22:[1,13],23:[1,14],25:[1,15]},{14:[2,23],15:[2,23],16:[2,23],19:[2,23],20:[2,23],22:[2,23],23:[2,23],25:[2,23]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],25:[2,12]},{14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],25:[2,18]},{18:[2,44],21:56,24:[2,44],29:53,30:60,31:54,32:[1,57],33:[1,58],34:[1,59],35:55,36:61,37:62,38:[1,63],40:[1,27],41:26},{38:[1,64]},{18:[2,36],24:[2,36],32:[2,36],33:[2,36],34:[2,36],38:[2,36],40:[2,36]},{14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],25:[2,17]},{5:[2,20],14:[2,20],15:[2,20],16:[2,20],19:[2,20],20:[2,20],22:[2,20],23:[2,20],25:[2,20]},{5:[2,21],14:[2,21],15:[2,21],16:[2,21],19:[2,21],20:[2,21],22:[2,21],23:[2,21],25:[2,21]},{18:[1,65]},{18:[2,41]},{18:[1,66]},{8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],25:[1,15]},{18:[2,24],24:[2,24]},{18:[2,43],24:[2,43],32:[2,43],33:[2,43],34:[2,43],38:[2,43],40:[2,43]},{18:[2,45],24:[2,45]},{18:[2,26],24:[2,26],32:[2,26],33:[2,26],34:[2,26],38:[2,26],40:[2,26]},{18:[2,27],24:[2,27],32:[2,27],33:[2,27],34:[2,27],38:[2,27],40:[2,27]},{18:[2,28],24:[2,28],32:[2,28],33:[2,28],34:[2,28],38:[2,28],40:[2,28]},{18:[2,29],24:[2,29],32:[2,29],33:[2,29],34:[2,29],38:[2,29],40:[2,29]},{18:[2,30],24:[2,30],32:[2,30],33:[2,30],34:[2,30],38:[2,30],40:[2,30]},{18:[2,31],24:[2,31],37:67,38:[1,68]},{18:[2,46],24:[2,46],38:[2,46]},{18:[2,39],24:[2,39],32:[2,39],33:[2,39],34:[2,39],38:[2,39],39:[1,69],40:[2,39],42:[2,39]},{18:[2,38],24:[2,38],32:[2,38],33:[2,38],34:[2,38],38:[2,38],40:[2,38],42:[2,38]},{5:[2,22],14:[2,22],15:[2,22],16:[2,22],19:[2,22],20:[2,22],22:[2,22],23:[2,22],25:[2,22]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],25:[2,19]},{18:[2,47],24:[2,47],38:[2,47]},{39:[1,69]},{21:56,30:60,31:70,32:[1,57],33:[1,58],34:[1,59],38:[1,28],40:[1,27],41:26},{18:[2,32],24:[2,32],38:[2,32]}], - defaultActions: {3:[2,2],16:[2,1],50:[2,41]}, - parseError: function parseError(str, hash) { - throw new Error(str); - }, - parse: function parse(input) { - var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1; - this.lexer.setInput(input); - this.lexer.yy = this.yy; - this.yy.lexer = this.lexer; - this.yy.parser = this; - if (typeof this.lexer.yylloc == "undefined") - this.lexer.yylloc = {}; - var yyloc = this.lexer.yylloc; - lstack.push(yyloc); - var ranges = this.lexer.options && this.lexer.options.ranges; - if (typeof this.yy.parseError === "function") - this.parseError = this.yy.parseError; - function popStack(n) { - stack.length = stack.length - 2 * n; - vstack.length = vstack.length - n; - lstack.length = lstack.length - n; - } - function lex() { - var token; - token = self.lexer.lex() || 1; - if (typeof token !== "number") { - token = self.symbols_[token] || token; - } - return token; - } - var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected; - while (true) { - state = stack[stack.length - 1]; - if (this.defaultActions[state]) { - action = this.defaultActions[state]; - } else { - if (symbol === null || typeof symbol == "undefined") { - symbol = lex(); - } - action = table[state] && table[state][symbol]; - } - if (typeof action === "undefined" || !action.length || !action[0]) { - var errStr = ""; - if (!recovering) { - expected = []; - for (p in table[state]) - if (this.terminals_[p] && p > 2) { - expected.push("'" + this.terminals_[p] + "'"); - } - if (this.lexer.showPosition) { - errStr = "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + (this.terminals_[symbol] || symbol) + "'"; - } else { - errStr = "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == 1?"end of input":"'" + (this.terminals_[symbol] || symbol) + "'"); - } - this.parseError(errStr, {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected}); - } - } - if (action[0] instanceof Array && action.length > 1) { - throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol); - } - switch (action[0]) { - case 1: - stack.push(symbol); - vstack.push(this.lexer.yytext); - lstack.push(this.lexer.yylloc); - stack.push(action[1]); - symbol = null; - if (!preErrorSymbol) { - yyleng = this.lexer.yyleng; - yytext = this.lexer.yytext; - yylineno = this.lexer.yylineno; - yyloc = this.lexer.yylloc; - if (recovering > 0) - recovering--; - } else { - symbol = preErrorSymbol; - preErrorSymbol = null; - } - break; - case 2: - len = this.productions_[action[1]][1]; - yyval.$ = vstack[vstack.length - len]; - yyval._$ = {first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column}; - if (ranges) { - yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]]; - } - r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack); - if (typeof r !== "undefined") { - return r; - } - if (len) { - stack = stack.slice(0, -1 * len * 2); - vstack = vstack.slice(0, -1 * len); - lstack = lstack.slice(0, -1 * len); - } - stack.push(this.productions_[action[1]][0]); - vstack.push(yyval.$); - lstack.push(yyval._$); - newState = table[stack[stack.length - 2]][stack[stack.length - 1]]; - stack.push(newState); - break; - case 3: - return true; - } - } - return true; - } - }; - - - function stripFlags(open, close) { - return { - left: open.charAt(2) === '~', - right: close.charAt(0) === '~' || close.charAt(1) === '~' - }; - } - - /* Jison generated lexer */ - var lexer = (function(){ - var lexer = ({EOF:1, - parseError:function parseError(str, hash) { - if (this.yy.parser) { - this.yy.parser.parseError(str, hash); - } else { - throw new Error(str); - } - }, - setInput:function (input) { - this._input = input; - this._more = this._less = this.done = false; - this.yylineno = this.yyleng = 0; - this.yytext = this.matched = this.match = ''; - this.conditionStack = ['INITIAL']; - this.yylloc = {first_line:1,first_column:0,last_line:1,last_column:0}; - if (this.options.ranges) this.yylloc.range = [0,0]; - this.offset = 0; - return this; - }, - input:function () { - var ch = this._input[0]; - this.yytext += ch; - this.yyleng++; - this.offset++; - this.match += ch; - this.matched += ch; - var lines = ch.match(/(?:\r\n?|\n).*/g); - if (lines) { - this.yylineno++; - this.yylloc.last_line++; - } else { - this.yylloc.last_column++; - } - if (this.options.ranges) this.yylloc.range[1]++; - - this._input = this._input.slice(1); - return ch; - }, - unput:function (ch) { - var len = ch.length; - var lines = ch.split(/(?:\r\n?|\n)/g); - - this._input = ch + this._input; - this.yytext = this.yytext.substr(0, this.yytext.length-len-1); - //this.yyleng -= len; - this.offset -= len; - var oldLines = this.match.split(/(?:\r\n?|\n)/g); - this.match = this.match.substr(0, this.match.length-1); - this.matched = this.matched.substr(0, this.matched.length-1); - - if (lines.length-1) this.yylineno -= lines.length-1; - var r = this.yylloc.range; - - this.yylloc = {first_line: this.yylloc.first_line, - last_line: this.yylineno+1, - first_column: this.yylloc.first_column, - last_column: lines ? - (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length: - this.yylloc.first_column - len - }; - - if (this.options.ranges) { - this.yylloc.range = [r[0], r[0] + this.yyleng - len]; - } - return this; - }, - more:function () { - this._more = true; - return this; - }, - less:function (n) { - this.unput(this.match.slice(n)); - }, - pastInput:function () { - var past = this.matched.substr(0, this.matched.length - this.match.length); - return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, ""); - }, - upcomingInput:function () { - var next = this.match; - if (next.length < 20) { - next += this._input.substr(0, 20-next.length); - } - return (next.substr(0,20)+(next.length > 20 ? '...':'')).replace(/\n/g, ""); - }, - showPosition:function () { - var pre = this.pastInput(); - var c = new Array(pre.length + 1).join("-"); - return pre + this.upcomingInput() + "\n" + c+"^"; - }, - next:function () { - if (this.done) { - return this.EOF; - } - if (!this._input) this.done = true; - - var token, - match, - tempMatch, - index, - col, - lines; - if (!this._more) { - this.yytext = ''; - this.match = ''; - } - var rules = this._currentRules(); - for (var i=0;i < rules.length; i++) { - tempMatch = this._input.match(this.rules[rules[i]]); - if (tempMatch && (!match || tempMatch[0].length > match[0].length)) { - match = tempMatch; - index = i; - if (!this.options.flex) break; - } - } - if (match) { - lines = match[0].match(/(?:\r\n?|\n).*/g); - if (lines) this.yylineno += lines.length; - this.yylloc = {first_line: this.yylloc.last_line, - last_line: this.yylineno+1, - first_column: this.yylloc.last_column, - last_column: lines ? lines[lines.length-1].length-lines[lines.length-1].match(/\r?\n?/)[0].length : this.yylloc.last_column + match[0].length}; - this.yytext += match[0]; - this.match += match[0]; - this.matches = match; - this.yyleng = this.yytext.length; - if (this.options.ranges) { - this.yylloc.range = [this.offset, this.offset += this.yyleng]; - } - this._more = false; - this._input = this._input.slice(match[0].length); - this.matched += match[0]; - token = this.performAction.call(this, this.yy, this, rules[index],this.conditionStack[this.conditionStack.length-1]); - if (this.done && this._input) this.done = false; - if (token) return token; - else return; - } - if (this._input === "") { - return this.EOF; - } else { - return this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(), - {text: "", token: null, line: this.yylineno}); - } - }, - lex:function lex() { - var r = this.next(); - if (typeof r !== 'undefined') { - return r; - } else { - return this.lex(); - } - }, - begin:function begin(condition) { - this.conditionStack.push(condition); - }, - popState:function popState() { - return this.conditionStack.pop(); - }, - _currentRules:function _currentRules() { - return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules; - }, - topState:function () { - return this.conditionStack[this.conditionStack.length-2]; - }, - pushState:function begin(condition) { - this.begin(condition); - }}); - lexer.options = {}; - lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) { - - - function strip(start, end) { - return yy_.yytext = yy_.yytext.substr(start, yy_.yyleng-end); - } - - - var YYSTATE=YY_START - switch($avoiding_name_collisions) { - case 0: - if(yy_.yytext.slice(-2) === "\\\\") { - strip(0,1); - this.begin("mu"); - } else if(yy_.yytext.slice(-1) === "\\") { - strip(0,1); - this.begin("emu"); - } else { - this.begin("mu"); - } - if(yy_.yytext) return 14; - - break; - case 1:return 14; - break; - case 2: - this.popState(); - return 14; - - break; - case 3:strip(0,4); this.popState(); return 15; - break; - case 4:return 25; - break; - case 5:return 16; - break; - case 6:return 20; - break; - case 7:return 19; - break; - case 8:return 19; - break; - case 9:return 23; - break; - case 10:return 22; - break; - case 11:this.popState(); this.begin('com'); - break; - case 12:strip(3,5); this.popState(); return 15; - break; - case 13:return 22; - break; - case 14:return 39; - break; - case 15:return 38; - break; - case 16:return 38; - break; - case 17:return 42; - break; - case 18:// ignore whitespace - break; - case 19:this.popState(); return 24; - break; - case 20:this.popState(); return 18; - break; - case 21:yy_.yytext = strip(1,2).replace(/\\"/g,'"'); return 32; - break; - case 22:yy_.yytext = strip(1,2).replace(/\\'/g,"'"); return 32; - break; - case 23:return 40; - break; - case 24:return 34; - break; - case 25:return 34; - break; - case 26:return 33; - break; - case 27:return 38; - break; - case 28:yy_.yytext = strip(1,2); return 38; - break; - case 29:return 'INVALID'; - break; - case 30:return 5; - break; - } - }; - lexer.rules = [/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|\\\{\{|\\\\\{\{|$)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{(~)?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s])))/,/^(?:false(?=([~}\s])))/,/^(?:-?[0-9]+(?=([~}\s])))/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.]))))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/]; - lexer.conditions = {"mu":{"rules":[4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30],"inclusive":false},"emu":{"rules":[2],"inclusive":false},"com":{"rules":[3],"inclusive":false},"INITIAL":{"rules":[0,1,30],"inclusive":true}}; - return lexer;})() - parser.lexer = lexer; - function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser; - return new Parser; - })();__exports__ = handlebars; - /* jshint ignore:end */ - return __exports__; -})(); - -// handlebars/compiler/base.js -var __module8__ = (function(__dependency1__, __dependency2__) { - "use strict"; - var __exports__ = {}; - var parser = __dependency1__; - var AST = __dependency2__; - - __exports__.parser = parser; - - function parse(input) { - // Just return if an already-compile AST was passed in. - if(input.constructor === AST.ProgramNode) { return input; } - - parser.yy = AST; - return parser.parse(input); - } - - __exports__.parse = parse; - return __exports__; -})(__module9__, __module7__); - -// handlebars/compiler/javascript-compiler.js -var __module11__ = (function(__dependency1__) { - "use strict"; - var __exports__; - var COMPILER_REVISION = __dependency1__.COMPILER_REVISION; - var REVISION_CHANGES = __dependency1__.REVISION_CHANGES; - var log = __dependency1__.log; - - function Literal(value) { - this.value = value; - } - - function JavaScriptCompiler() {} - - JavaScriptCompiler.prototype = { - // PUBLIC API: You can override these methods in a subclass to provide - // alternative compiled forms for name lookup and buffering semantics - nameLookup: function(parent, name /* , type*/) { - var wrap, - ret; - if (parent.indexOf('depth') === 0) { - wrap = true; - } - - if (/^[0-9]+$/.test(name)) { - ret = parent + "[" + name + "]"; - } else if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) { - ret = parent + "." + name; - } - else { - ret = parent + "['" + name + "']"; - } - - if (wrap) { - return '(' + parent + ' && ' + ret + ')'; - } else { - return ret; - } - }, - - compilerInfo: function() { - var revision = COMPILER_REVISION, - versions = REVISION_CHANGES[revision]; - return "this.compilerInfo = ["+revision+",'"+versions+"'];\n"; - }, - - appendToBuffer: function(string) { - if (this.environment.isSimple) { - return "return " + string + ";"; - } else { - return { - appendToBuffer: true, - content: string, - toString: function() { return "buffer += " + string + ";"; } - }; - } - }, - - initializeBuffer: function() { - return this.quotedString(""); - }, - - namespace: "Handlebars", - // END PUBLIC API - - compile: function(environment, options, context, asObject) { - this.environment = environment; - this.options = options || {}; - - log('debug', this.environment.disassemble() + "\n\n"); - - this.name = this.environment.name; - this.isChild = !!context; - this.context = context || { - programs: [], - environments: [], - aliases: { } - }; - - this.preamble(); - - this.stackSlot = 0; - this.stackVars = []; - this.registers = { list: [] }; - this.compileStack = []; - this.inlineStack = []; - - this.compileChildren(environment, options); - - var opcodes = environment.opcodes, opcode; - - this.i = 0; - - for(var l=opcodes.length; this.i<l; this.i++) { - opcode = opcodes[this.i]; - - if(opcode.opcode === 'DECLARE') { - this[opcode.name] = opcode.value; - } else { - this[opcode.opcode].apply(this, opcode.args); - } - - // Reset the stripNext flag if it was not set by this operation. - if (opcode.opcode !== this.stripNext) { - this.stripNext = false; - } - } - - // Flush any trailing content that might be pending. - this.pushSource(''); - - return this.createFunctionContext(asObject); - }, - - preamble: function() { - var out = []; - - if (!this.isChild) { - var namespace = this.namespace; - - var copies = "helpers = this.merge(helpers, " + namespace + ".helpers);"; - if (this.environment.usePartial) { copies = copies + " partials = this.merge(partials, " + namespace + ".partials);"; } - if (this.options.data) { copies = copies + " data = data || {};"; } - out.push(copies); - } else { - out.push(''); - } - - if (!this.environment.isSimple) { - out.push(", buffer = " + this.initializeBuffer()); - } else { - out.push(""); - } - - // track the last context pushed into place to allow skipping the - // getContext opcode when it would be a noop - this.lastContext = 0; - this.source = out; - }, - - createFunctionContext: function(asObject) { - var locals = this.stackVars.concat(this.registers.list); - - if(locals.length > 0) { - this.source[1] = this.source[1] + ", " + locals.join(", "); - } - - // Generate minimizer alias mappings - if (!this.isChild) { - for (var alias in this.context.aliases) { - if (this.context.aliases.hasOwnProperty(alias)) { - this.source[1] = this.source[1] + ', ' + alias + '=' + this.context.aliases[alias]; - } - } - } - - if (this.source[1]) { - this.source[1] = "var " + this.source[1].substring(2) + ";"; - } - - // Merge children - if (!this.isChild) { - this.source[1] += '\n' + this.context.programs.join('\n') + '\n'; - } - - if (!this.environment.isSimple) { - this.pushSource("return buffer;"); - } - - var params = this.isChild ? ["depth0", "data"] : ["Handlebars", "depth0", "helpers", "partials", "data"]; - - for(var i=0, l=this.environment.depths.list.length; i<l; i++) { - params.push("depth" + this.environment.depths.list[i]); - } - - // Perform a second pass over the output to merge content when possible - var source = this.mergeSource(); - - if (!this.isChild) { - source = this.compilerInfo()+source; - } - - if (asObject) { - params.push(source); - - return Function.apply(this, params); - } else { - var functionSource = 'function ' + (this.name || '') + '(' + params.join(',') + ') {\n ' + source + '}'; - log('debug', functionSource + "\n\n"); - return functionSource; - } - }, - mergeSource: function() { - // WARN: We are not handling the case where buffer is still populated as the source should - // not have buffer append operations as their final action. - var source = '', - buffer; - for (var i = 0, len = this.source.length; i < len; i++) { - var line = this.source[i]; - if (line.appendToBuffer) { - if (buffer) { - buffer = buffer + '\n + ' + line.content; - } else { - buffer = line.content; - } - } else { - if (buffer) { - source += 'buffer += ' + buffer + ';\n '; - buffer = undefined; - } - source += line + '\n '; - } - } - return source; - }, - - // [blockValue] - // - // On stack, before: hash, inverse, program, value - // On stack, after: return value of blockHelperMissing - // - // The purpose of this opcode is to take a block of the form - // `{{#foo}}...{{/foo}}`, resolve the value of `foo`, and - // replace it on the stack with the result of properly - // invoking blockHelperMissing. - blockValue: function() { - this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing'; - - var params = ["depth0"]; - this.setupParams(0, params); - - this.replaceStack(function(current) { - params.splice(1, 0, current); - return "blockHelperMissing.call(" + params.join(", ") + ")"; - }); - }, - - // [ambiguousBlockValue] - // - // On stack, before: hash, inverse, program, value - // Compiler value, before: lastHelper=value of last found helper, if any - // On stack, after, if no lastHelper: same as [blockValue] - // On stack, after, if lastHelper: value - ambiguousBlockValue: function() { - this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing'; - - var params = ["depth0"]; - this.setupParams(0, params); - - var current = this.topStack(); - params.splice(1, 0, current); - - // Use the options value generated from the invocation - params[params.length-1] = 'options'; - - this.pushSource("if (!" + this.lastHelper + ") { " + current + " = blockHelperMissing.call(" + params.join(", ") + "); }"); - }, - - // [appendContent] - // - // On stack, before: ... - // On stack, after: ... - // - // Appends the string value of `content` to the current buffer - appendContent: function(content) { - if (this.pendingContent) { - content = this.pendingContent + content; - } - if (this.stripNext) { - content = content.replace(/^\s+/, ''); - } - - this.pendingContent = content; - }, - - // [strip] - // - // On stack, before: ... - // On stack, after: ... - // - // Removes any trailing whitespace from the prior content node and flags - // the next operation for stripping if it is a content node. - strip: function() { - if (this.pendingContent) { - this.pendingContent = this.pendingContent.replace(/\s+$/, ''); - } - this.stripNext = 'strip'; - }, - - // [append] - // - // On stack, before: value, ... - // On stack, after: ... - // - // Coerces `value` to a String and appends it to the current buffer. - // - // If `value` is truthy, or 0, it is coerced into a string and appended - // Otherwise, the empty string is appended - append: function() { - // Force anything that is inlined onto the stack so we don't have duplication - // when we examine local - this.flushInline(); - var local = this.popStack(); - this.pushSource("if(" + local + " || " + local + " === 0) { " + this.appendToBuffer(local) + " }"); - if (this.environment.isSimple) { - this.pushSource("else { " + this.appendToBuffer("''") + " }"); - } - }, - - // [appendEscaped] - // - // On stack, before: value, ... - // On stack, after: ... - // - // Escape `value` and append it to the buffer - appendEscaped: function() { - this.context.aliases.escapeExpression = 'this.escapeExpression'; - - this.pushSource(this.appendToBuffer("escapeExpression(" + this.popStack() + ")")); - }, - - // [getContext] - // - // On stack, before: ... - // On stack, after: ... - // Compiler value, after: lastContext=depth - // - // Set the value of the `lastContext` compiler value to the depth - getContext: function(depth) { - if(this.lastContext !== depth) { - this.lastContext = depth; - } - }, - - // [lookupOnContext] - // - // On stack, before: ... - // On stack, after: currentContext[name], ... - // - // Looks up the value of `name` on the current context and pushes - // it onto the stack. - lookupOnContext: function(name) { - this.push(this.nameLookup('depth' + this.lastContext, name, 'context')); - }, - - // [pushContext] - // - // On stack, before: ... - // On stack, after: currentContext, ... - // - // Pushes the value of the current context onto the stack. - pushContext: function() { - this.pushStackLiteral('depth' + this.lastContext); - }, - - // [resolvePossibleLambda] - // - // On stack, before: value, ... - // On stack, after: resolved value, ... - // - // If the `value` is a lambda, replace it on the stack by - // the return value of the lambda - resolvePossibleLambda: function() { - this.context.aliases.functionType = '"function"'; - - this.replaceStack(function(current) { - return "typeof " + current + " === functionType ? " + current + ".apply(depth0) : " + current; - }); - }, - - // [lookup] - // - // On stack, before: value, ... - // On stack, after: value[name], ... - // - // Replace the value on the stack with the result of looking - // up `name` on `value` - lookup: function(name) { - this.replaceStack(function(current) { - return current + " == null || " + current + " === false ? " + current + " : " + this.nameLookup(current, name, 'context'); - }); - }, - - // [lookupData] - // - // On stack, before: ... - // On stack, after: data, ... - // - // Push the data lookup operator - lookupData: function() { - this.push('data'); - }, - - // [pushStringParam] - // - // On stack, before: ... - // On stack, after: string, currentContext, ... - // - // This opcode is designed for use in string mode, which - // provides the string value of a parameter along with its - // depth rather than resolving it immediately. - pushStringParam: function(string, type) { - this.pushStackLiteral('depth' + this.lastContext); - - this.pushString(type); - - if (typeof string === 'string') { - this.pushString(string); - } else { - this.pushStackLiteral(string); - } - }, - - emptyHash: function() { - this.pushStackLiteral('{}'); - - if (this.options.stringParams) { - this.register('hashTypes', '{}'); - this.register('hashContexts', '{}'); - } - }, - pushHash: function() { - this.hash = {values: [], types: [], contexts: []}; - }, - popHash: function() { - var hash = this.hash; - this.hash = undefined; - - if (this.options.stringParams) { - this.register('hashContexts', '{' + hash.contexts.join(',') + '}'); - this.register('hashTypes', '{' + hash.types.join(',') + '}'); - } - this.push('{\n ' + hash.values.join(',\n ') + '\n }'); - }, - - // [pushString] - // - // On stack, before: ... - // On stack, after: quotedString(string), ... - // - // Push a quoted version of `string` onto the stack - pushString: function(string) { - this.pushStackLiteral(this.quotedString(string)); - }, - - // [push] - // - // On stack, before: ... - // On stack, after: expr, ... - // - // Push an expression onto the stack - push: function(expr) { - this.inlineStack.push(expr); - return expr; - }, - - // [pushLiteral] - // - // On stack, before: ... - // On stack, after: value, ... - // - // Pushes a value onto the stack. This operation prevents - // the compiler from creating a temporary variable to hold - // it. - pushLiteral: function(value) { - this.pushStackLiteral(value); - }, - - // [pushProgram] - // - // On stack, before: ... - // On stack, after: program(guid), ... - // - // Push a program expression onto the stack. This takes - // a compile-time guid and converts it into a runtime-accessible - // expression. - pushProgram: function(guid) { - if (guid != null) { - this.pushStackLiteral(this.programExpression(guid)); - } else { - this.pushStackLiteral(null); - } - }, - - // [invokeHelper] - // - // On stack, before: hash, inverse, program, params..., ... - // On stack, after: result of helper invocation - // - // Pops off the helper's parameters, invokes the helper, - // and pushes the helper's return value onto the stack. - // - // If the helper is not found, `helperMissing` is called. - invokeHelper: function(paramSize, name) { - this.context.aliases.helperMissing = 'helpers.helperMissing'; - - var helper = this.lastHelper = this.setupHelper(paramSize, name, true); - var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context'); - - this.push(helper.name + ' || ' + nonHelper); - this.replaceStack(function(name) { - return name + ' ? ' + name + '.call(' + - helper.callParams + ") " + ": helperMissing.call(" + - helper.helperMissingParams + ")"; - }); - }, - - // [invokeKnownHelper] - // - // On stack, before: hash, inverse, program, params..., ... - // On stack, after: result of helper invocation - // - // This operation is used when the helper is known to exist, - // so a `helperMissing` fallback is not required. - invokeKnownHelper: function(paramSize, name) { - var helper = this.setupHelper(paramSize, name); - this.push(helper.name + ".call(" + helper.callParams + ")"); - }, - - // [invokeAmbiguous] - // - // On stack, before: hash, inverse, program, params..., ... - // On stack, after: result of disambiguation - // - // This operation is used when an expression like `{{foo}}` - // is provided, but we don't know at compile-time whether it - // is a helper or a path. - // - // This operation emits more code than the other options, - // and can be avoided by passing the `knownHelpers` and - // `knownHelpersOnly` flags at compile-time. - invokeAmbiguous: function(name, helperCall) { - this.context.aliases.functionType = '"function"'; - - this.pushStackLiteral('{}'); // Hash value - var helper = this.setupHelper(0, name, helperCall); - - var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper'); - - var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context'); - var nextStack = this.nextStack(); - - this.pushSource('if (' + nextStack + ' = ' + helperName + ') { ' + nextStack + ' = ' + nextStack + '.call(' + helper.callParams + '); }'); - this.pushSource('else { ' + nextStack + ' = ' + nonHelper + '; ' + nextStack + ' = typeof ' + nextStack + ' === functionType ? ' + nextStack + '.call(' + helper.callParams + ') : ' + nextStack + '; }'); - }, - - // [invokePartial] - // - // On stack, before: context, ... - // On stack after: result of partial invocation - // - // This operation pops off a context, invokes a partial with that context, - // and pushes the result of the invocation back. - invokePartial: function(name) { - var params = [this.nameLookup('partials', name, 'partial'), "'" + name + "'", this.popStack(), "helpers", "partials"]; - - if (this.options.data) { - params.push("data"); - } - - this.context.aliases.self = "this"; - this.push("self.invokePartial(" + params.join(", ") + ")"); - }, - - // [assignToHash] - // - // On stack, before: value, hash, ... - // On stack, after: hash, ... - // - // Pops a value and hash off the stack, assigns `hash[key] = value` - // and pushes the hash back onto the stack. - assignToHash: function(key) { - var value = this.popStack(), - context, - type; - - if (this.options.stringParams) { - type = this.popStack(); - context = this.popStack(); - } - - var hash = this.hash; - if (context) { - hash.contexts.push("'" + key + "': " + context); - } - if (type) { - hash.types.push("'" + key + "': " + type); - } - hash.values.push("'" + key + "': (" + value + ")"); - }, - - // HELPERS - - compiler: JavaScriptCompiler, - - compileChildren: function(environment, options) { - var children = environment.children, child, compiler; - - for(var i=0, l=children.length; i<l; i++) { - child = children[i]; - compiler = new this.compiler(); - - var index = this.matchExistingProgram(child); - - if (index == null) { - this.context.programs.push(''); // Placeholder to prevent name conflicts for nested children - index = this.context.programs.length; - child.index = index; - child.name = 'program' + index; - this.context.programs[index] = compiler.compile(child, options, this.context); - this.context.environments[index] = child; - } else { - child.index = index; - child.name = 'program' + index; - } - } - }, - matchExistingProgram: function(child) { - for (var i = 0, len = this.context.environments.length; i < len; i++) { - var environment = this.context.environments[i]; - if (environment && environment.equals(child)) { - return i; - } - } - }, - - programExpression: function(guid) { - this.context.aliases.self = "this"; - - if(guid == null) { - return "self.noop"; - } - - var child = this.environment.children[guid], - depths = child.depths.list, depth; - - var programParams = [child.index, child.name, "data"]; - - for(var i=0, l = depths.length; i<l; i++) { - depth = depths[i]; - - if(depth === 1) { programParams.push("depth0"); } - else { programParams.push("depth" + (depth - 1)); } - } - - return (depths.length === 0 ? "self.program(" : "self.programWithDepth(") + programParams.join(", ") + ")"; - }, - - register: function(name, val) { - this.useRegister(name); - this.pushSource(name + " = " + val + ";"); - }, - - useRegister: function(name) { - if(!this.registers[name]) { - this.registers[name] = true; - this.registers.list.push(name); - } - }, - - pushStackLiteral: function(item) { - return this.push(new Literal(item)); - }, - - pushSource: function(source) { - if (this.pendingContent) { - this.source.push(this.appendToBuffer(this.quotedString(this.pendingContent))); - this.pendingContent = undefined; - } - - if (source) { - this.source.push(source); - } - }, - - pushStack: function(item) { - this.flushInline(); - - var stack = this.incrStack(); - if (item) { - this.pushSource(stack + " = " + item + ";"); - } - this.compileStack.push(stack); - return stack; - }, - - replaceStack: function(callback) { - var prefix = '', - inline = this.isInline(), - stack; - - // If we are currently inline then we want to merge the inline statement into the - // replacement statement via ',' - if (inline) { - var top = this.popStack(true); - - if (top instanceof Literal) { - // Literals do not need to be inlined - stack = top.value; - } else { - // Get or create the current stack name for use by the inline - var name = this.stackSlot ? this.topStackName() : this.incrStack(); - - prefix = '(' + this.push(name) + ' = ' + top + '),'; - stack = this.topStack(); - } - } else { - stack = this.topStack(); - } - - var item = callback.call(this, stack); - - if (inline) { - if (this.inlineStack.length || this.compileStack.length) { - this.popStack(); - } - this.push('(' + prefix + item + ')'); - } else { - // Prevent modification of the context depth variable. Through replaceStack - if (!/^stack/.test(stack)) { - stack = this.nextStack(); - } - - this.pushSource(stack + " = (" + prefix + item + ");"); - } - return stack; - }, - - nextStack: function() { - return this.pushStack(); - }, - - incrStack: function() { - this.stackSlot++; - if(this.stackSlot > this.stackVars.length) { this.stackVars.push("stack" + this.stackSlot); } - return this.topStackName(); - }, - topStackName: function() { - return "stack" + this.stackSlot; - }, - flushInline: function() { - var inlineStack = this.inlineStack; - if (inlineStack.length) { - this.inlineStack = []; - for (var i = 0, len = inlineStack.length; i < len; i++) { - var entry = inlineStack[i]; - if (entry instanceof Literal) { - this.compileStack.push(entry); - } else { - this.pushStack(entry); - } - } - } - }, - isInline: function() { - return this.inlineStack.length; - }, - - popStack: function(wrapped) { - var inline = this.isInline(), - item = (inline ? this.inlineStack : this.compileStack).pop(); - - if (!wrapped && (item instanceof Literal)) { - return item.value; - } else { - if (!inline) { - this.stackSlot--; - } - return item; - } - }, - - topStack: function(wrapped) { - var stack = (this.isInline() ? this.inlineStack : this.compileStack), - item = stack[stack.length - 1]; - - if (!wrapped && (item instanceof Literal)) { - return item.value; - } else { - return item; - } - }, - - quotedString: function(str) { - return '"' + str - .replace(/\\/g, '\\\\') - .replace(/"/g, '\\"') - .replace(/\n/g, '\\n') - .replace(/\r/g, '\\r') - .replace(/\u2028/g, '\\u2028') // Per Ecma-262 7.3 + 7.8.4 - .replace(/\u2029/g, '\\u2029') + '"'; - }, - - setupHelper: function(paramSize, name, missingParams) { - var params = []; - this.setupParams(paramSize, params, missingParams); - var foundHelper = this.nameLookup('helpers', name, 'helper'); - - return { - params: params, - name: foundHelper, - callParams: ["depth0"].concat(params).join(", "), - helperMissingParams: missingParams && ["depth0", this.quotedString(name)].concat(params).join(", ") - }; - }, - - // the params and contexts arguments are passed in arrays - // to fill in - setupParams: function(paramSize, params, useRegister) { - var options = [], contexts = [], types = [], param, inverse, program; - - options.push("hash:" + this.popStack()); - - inverse = this.popStack(); - program = this.popStack(); - - // Avoid setting fn and inverse if neither are set. This allows - // helpers to do a check for `if (options.fn)` - if (program || inverse) { - if (!program) { - this.context.aliases.self = "this"; - program = "self.noop"; - } - - if (!inverse) { - this.context.aliases.self = "this"; - inverse = "self.noop"; - } - - options.push("inverse:" + inverse); - options.push("fn:" + program); - } - - for(var i=0; i<paramSize; i++) { - param = this.popStack(); - params.push(param); - - if(this.options.stringParams) { - types.push(this.popStack()); - contexts.push(this.popStack()); - } - } - - if (this.options.stringParams) { - options.push("contexts:[" + contexts.join(",") + "]"); - options.push("types:[" + types.join(",") + "]"); - options.push("hashContexts:hashContexts"); - options.push("hashTypes:hashTypes"); - } - - if(this.options.data) { - options.push("data:data"); - } - - options = "{" + options.join(",") + "}"; - if (useRegister) { - this.register('options', options); - params.push('options'); - } else { - params.push(options); - } - return params.join(", "); - } - }; - - var reservedWords = ( - "break else new var" + - " case finally return void" + - " catch for switch while" + - " continue function this with" + - " default if throw" + - " delete in try" + - " do instanceof typeof" + - " abstract enum int short" + - " boolean export interface static" + - " byte extends long super" + - " char final native synchronized" + - " class float package throws" + - " const goto private transient" + - " debugger implements protected volatile" + - " double import public let yield" - ).split(" "); - - var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {}; - - for(var i=0, l=reservedWords.length; i<l; i++) { - compilerWords[reservedWords[i]] = true; - } - - JavaScriptCompiler.isValidJavaScriptVariableName = function(name) { - if(!JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]+$/.test(name)) { - return true; - } - return false; - }; - - __exports__ = JavaScriptCompiler; - return __exports__; -})(__module2__); - -// handlebars/compiler/compiler.js -var __module10__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) { - "use strict"; - var __exports__ = {}; - var Exception = __dependency1__; - var parse = __dependency2__.parse; - var JavaScriptCompiler = __dependency3__; - var AST = __dependency4__; - - function Compiler() {} - - __exports__.Compiler = Compiler;// the foundHelper register will disambiguate helper lookup from finding a - // function in a context. This is necessary for mustache compatibility, which - // requires that context functions in blocks are evaluated by blockHelperMissing, - // and then proceed as if the resulting value was provided to blockHelperMissing. - - Compiler.prototype = { - compiler: Compiler, - - disassemble: function() { - var opcodes = this.opcodes, opcode, out = [], params, param; - - for (var i=0, l=opcodes.length; i<l; i++) { - opcode = opcodes[i]; - - if (opcode.opcode === 'DECLARE') { - out.push("DECLARE " + opcode.name + "=" + opcode.value); - } else { - params = []; - for (var j=0; j<opcode.args.length; j++) { - param = opcode.args[j]; - if (typeof param === "string") { - param = "\"" + param.replace("\n", "\\n") + "\""; - } - params.push(param); - } - out.push(opcode.opcode + " " + params.join(" ")); - } - } - - return out.join("\n"); - }, - - equals: function(other) { - var len = this.opcodes.length; - if (other.opcodes.length !== len) { - return false; - } - - for (var i = 0; i < len; i++) { - var opcode = this.opcodes[i], - otherOpcode = other.opcodes[i]; - if (opcode.opcode !== otherOpcode.opcode || opcode.args.length !== otherOpcode.args.length) { - return false; - } - for (var j = 0; j < opcode.args.length; j++) { - if (opcode.args[j] !== otherOpcode.args[j]) { - return false; - } - } - } - - len = this.children.length; - if (other.children.length !== len) { - return false; - } - for (i = 0; i < len; i++) { - if (!this.children[i].equals(other.children[i])) { - return false; - } - } - - return true; - }, - - guid: 0, - - compile: function(program, options) { - this.opcodes = []; - this.children = []; - this.depths = {list: []}; - this.options = options; - - // These changes will propagate to the other compiler components - var knownHelpers = this.options.knownHelpers; - this.options.knownHelpers = { - 'helperMissing': true, - 'blockHelperMissing': true, - 'each': true, - 'if': true, - 'unless': true, - 'with': true, - 'log': true - }; - if (knownHelpers) { - for (var name in knownHelpers) { - this.options.knownHelpers[name] = knownHelpers[name]; - } - } - - return this.accept(program); - }, - - accept: function(node) { - var strip = node.strip || {}, - ret; - if (strip.left) { - this.opcode('strip'); - } - - ret = this[node.type](node); - - if (strip.right) { - this.opcode('strip'); - } - - return ret; - }, - - program: function(program) { - var statements = program.statements; - - for(var i=0, l=statements.length; i<l; i++) { - this.accept(statements[i]); - } - this.isSimple = l === 1; - - this.depths.list = this.depths.list.sort(function(a, b) { - return a - b; - }); - - return this; - }, - - compileProgram: function(program) { - var result = new this.compiler().compile(program, this.options); - var guid = this.guid++, depth; - - this.usePartial = this.usePartial || result.usePartial; - - this.children[guid] = result; - - for(var i=0, l=result.depths.list.length; i<l; i++) { - depth = result.depths.list[i]; - - if(depth < 2) { continue; } - else { this.addDepth(depth - 1); } - } - - return guid; - }, - - block: function(block) { - var mustache = block.mustache, - program = block.program, - inverse = block.inverse; - - if (program) { - program = this.compileProgram(program); - } - - if (inverse) { - inverse = this.compileProgram(inverse); - } - - var type = this.classifyMustache(mustache); - - if (type === "helper") { - this.helperMustache(mustache, program, inverse); - } else if (type === "simple") { - this.simpleMustache(mustache); - - // now that the simple mustache is resolved, we need to - // evaluate it by executing `blockHelperMissing` - this.opcode('pushProgram', program); - this.opcode('pushProgram', inverse); - this.opcode('emptyHash'); - this.opcode('blockValue'); - } else { - this.ambiguousMustache(mustache, program, inverse); - - // now that the simple mustache is resolved, we need to - // evaluate it by executing `blockHelperMissing` - this.opcode('pushProgram', program); - this.opcode('pushProgram', inverse); - this.opcode('emptyHash'); - this.opcode('ambiguousBlockValue'); - } - - this.opcode('append'); - }, - - hash: function(hash) { - var pairs = hash.pairs, pair, val; - - this.opcode('pushHash'); - - for(var i=0, l=pairs.length; i<l; i++) { - pair = pairs[i]; - val = pair[1]; - - if (this.options.stringParams) { - if(val.depth) { - this.addDepth(val.depth); - } - this.opcode('getContext', val.depth || 0); - this.opcode('pushStringParam', val.stringModeValue, val.type); - } else { - this.accept(val); - } - - this.opcode('assignToHash', pair[0]); - } - this.opcode('popHash'); - }, - - partial: function(partial) { - var partialName = partial.partialName; - this.usePartial = true; - - if(partial.context) { - this.ID(partial.context); - } else { - this.opcode('push', 'depth0'); - } - - this.opcode('invokePartial', partialName.name); - this.opcode('append'); - }, - - content: function(content) { - this.opcode('appendContent', content.string); - }, - - mustache: function(mustache) { - var options = this.options; - var type = this.classifyMustache(mustache); - - if (type === "simple") { - this.simpleMustache(mustache); - } else if (type === "helper") { - this.helperMustache(mustache); - } else { - this.ambiguousMustache(mustache); - } - - if(mustache.escaped && !options.noEscape) { - this.opcode('appendEscaped'); - } else { - this.opcode('append'); - } - }, - - ambiguousMustache: function(mustache, program, inverse) { - var id = mustache.id, - name = id.parts[0], - isBlock = program != null || inverse != null; - - this.opcode('getContext', id.depth); - - this.opcode('pushProgram', program); - this.opcode('pushProgram', inverse); - - this.opcode('invokeAmbiguous', name, isBlock); - }, - - simpleMustache: function(mustache) { - var id = mustache.id; - - if (id.type === 'DATA') { - this.DATA(id); - } else if (id.parts.length) { - this.ID(id); - } else { - // Simplified ID for `this` - this.addDepth(id.depth); - this.opcode('getContext', id.depth); - this.opcode('pushContext'); - } - - this.opcode('resolvePossibleLambda'); - }, - - helperMustache: function(mustache, program, inverse) { - var params = this.setupFullMustacheParams(mustache, program, inverse), - name = mustache.id.parts[0]; - - if (this.options.knownHelpers[name]) { - this.opcode('invokeKnownHelper', params.length, name); - } else if (this.options.knownHelpersOnly) { - throw new Error("You specified knownHelpersOnly, but used the unknown helper " + name); - } else { - this.opcode('invokeHelper', params.length, name); - } - }, - - ID: function(id) { - this.addDepth(id.depth); - this.opcode('getContext', id.depth); - - var name = id.parts[0]; - if (!name) { - this.opcode('pushContext'); - } else { - this.opcode('lookupOnContext', id.parts[0]); - } - - for(var i=1, l=id.parts.length; i<l; i++) { - this.opcode('lookup', id.parts[i]); - } - }, - - DATA: function(data) { - this.options.data = true; - if (data.id.isScoped || data.id.depth) { - throw new Exception('Scoped data references are not supported: ' + data.original); - } - - this.opcode('lookupData'); - var parts = data.id.parts; - for(var i=0, l=parts.length; i<l; i++) { - this.opcode('lookup', parts[i]); - } - }, - - STRING: function(string) { - this.opcode('pushString', string.string); - }, - - INTEGER: function(integer) { - this.opcode('pushLiteral', integer.integer); - }, - - BOOLEAN: function(bool) { - this.opcode('pushLiteral', bool.bool); - }, - - comment: function() {}, - - // HELPERS - opcode: function(name) { - this.opcodes.push({ opcode: name, args: [].slice.call(arguments, 1) }); - }, - - declare: function(name, value) { - this.opcodes.push({ opcode: 'DECLARE', name: name, value: value }); - }, - - addDepth: function(depth) { - if(isNaN(depth)) { throw new Error("EWOT"); } - if(depth === 0) { return; } - - if(!this.depths[depth]) { - this.depths[depth] = true; - this.depths.list.push(depth); - } - }, - - classifyMustache: function(mustache) { - var isHelper = mustache.isHelper; - var isEligible = mustache.eligibleHelper; - var options = this.options; - - // if ambiguous, we can possibly resolve the ambiguity now - if (isEligible && !isHelper) { - var name = mustache.id.parts[0]; - - if (options.knownHelpers[name]) { - isHelper = true; - } else if (options.knownHelpersOnly) { - isEligible = false; - } - } - - if (isHelper) { return "helper"; } - else if (isEligible) { return "ambiguous"; } - else { return "simple"; } - }, - - pushParams: function(params) { - var i = params.length, param; - - while(i--) { - param = params[i]; - - if(this.options.stringParams) { - if(param.depth) { - this.addDepth(param.depth); - } - - this.opcode('getContext', param.depth || 0); - this.opcode('pushStringParam', param.stringModeValue, param.type); - } else { - this[param.type](param); - } - } - }, - - setupMustacheParams: function(mustache) { - var params = mustache.params; - this.pushParams(params); - - if(mustache.hash) { - this.hash(mustache.hash); - } else { - this.opcode('emptyHash'); - } - - return params; - }, - - // this will replace setupMustacheParams when we're done - setupFullMustacheParams: function(mustache, program, inverse) { - var params = mustache.params; - this.pushParams(params); - - this.opcode('pushProgram', program); - this.opcode('pushProgram', inverse); - - if(mustache.hash) { - this.hash(mustache.hash); - } else { - this.opcode('emptyHash'); - } - - return params; - } - }; - - function precompile(input, options) { - if (input == null || (typeof input !== 'string' && input.constructor !== AST.ProgramNode)) { - throw new Exception("You must pass a string or Handlebars AST to Handlebars.precompile. You passed " + input); - } - - options = options || {}; - if (!('data' in options)) { - options.data = true; - } - - var ast = parse(input); - var environment = new Compiler().compile(ast, options); - return new JavaScriptCompiler().compile(environment, options); - } - - __exports__.precompile = precompile;function compile(input, options, env) { - if (input == null || (typeof input !== 'string' && input.constructor !== AST.ProgramNode)) { - throw new Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input); - } - - options = options || {}; - - if (!('data' in options)) { - options.data = true; - } - - var compiled; - - function compileInput() { - var ast = parse(input); - var environment = new Compiler().compile(ast, options); - var templateSpec = new JavaScriptCompiler().compile(environment, options, undefined, true); - return env.template(templateSpec); - } - - // Template is only compiled on first use and cached after that point. - return function(context, options) { - if (!compiled) { - compiled = compileInput(); - } - return compiled.call(this, context, options); - }; - } - - __exports__.compile = compile; - return __exports__; -})(__module5__, __module8__, __module11__, __module7__); - -// handlebars.js -var __module0__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) { - "use strict"; - var __exports__; - /*globals Handlebars: true */ - var Handlebars = __dependency1__; - - // Compiler imports - var AST = __dependency2__; - var Parser = __dependency3__.parser; - var parse = __dependency3__.parse; - var Compiler = __dependency4__.Compiler; - var compile = __dependency4__.compile; - var precompile = __dependency4__.precompile; - var JavaScriptCompiler = __dependency5__; - - var _create = Handlebars.create; - var create = function() { - var hb = _create(); - - hb.compile = function(input, options) { - return compile(input, options, hb); - }; - hb.precompile = precompile; - - hb.AST = AST; - hb.Compiler = Compiler; - hb.JavaScriptCompiler = JavaScriptCompiler; - hb.Parser = Parser; - hb.parse = parse; - - return hb; - }; - - Handlebars = create(); - Handlebars.create = create; - - __exports__ = Handlebars; - return __exports__; -})(__module1__, __module7__, __module8__, __module10__, __module11__); - - return __module0__; -})(); diff --git a/sonar-server/src/main/webapp/javascripts/third-party/jquery-ui.tabs.js b/sonar-server/src/main/webapp/javascripts/third-party/jquery-ui.tabs.js deleted file mode 100644 index 230bd4ed604..00000000000 --- a/sonar-server/src/main/webapp/javascripts/third-party/jquery-ui.tabs.js +++ /dev/null @@ -1,832 +0,0 @@ -(function( $, undefined ) { - - var tabId = 0, - rhash = /#.*$/; - - function getNextTabId() { - return ++tabId; - } - - function isLocal( anchor ) { - return anchor.hash.length > 1 && - decodeURIComponent( anchor.href.replace( rhash, "" ) ) === - decodeURIComponent( location.href.replace( rhash, "" ) ); - } - - $.widget( "ui.tabs", { - version: "1.10.3", - delay: 300, - options: { - active: null, - collapsible: false, - event: "click", - heightStyle: "content", - hide: null, - show: null, - - // callbacks - activate: null, - beforeActivate: null, - beforeLoad: null, - load: null - }, - - _create: function() { - var that = this, - options = this.options; - - this.running = false; - - this.element - .addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" ) - .toggleClass( "ui-tabs-collapsible", options.collapsible ) - // Prevent users from focusing disabled tabs via click - .delegate( ".ui-tabs-nav > li", "mousedown" + this.eventNamespace, function( event ) { - if ( $( this ).is( ".ui-state-disabled" ) ) { - event.preventDefault(); - } - }) - // support: IE <9 - // Preventing the default action in mousedown doesn't prevent IE - // from focusing the element, so if the anchor gets focused, blur. - // We don't have to worry about focusing the previously focused - // element since clicking on a non-focusable element should focus - // the body anyway. - .delegate( ".ui-tabs-anchor", "focus" + this.eventNamespace, function() { - if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) { - this.blur(); - } - }); - - this._processTabs(); - options.active = this._initialActive(); - - // Take disabling tabs via class attribute from HTML - // into account and update option properly. - if ( $.isArray( options.disabled ) ) { - options.disabled = $.unique( options.disabled.concat( - $.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) { - return that.tabs.index( li ); - }) - ) ).sort(); - } - - // check for length avoids error when initializing empty list - if ( this.options.active !== false && this.anchors.length ) { - this.active = this._findActive( options.active ); - } else { - this.active = $(); - } - - this._refresh(); - - if ( this.active.length ) { - this.load( options.active ); - } - }, - - _initialActive: function() { - var active = this.options.active, - collapsible = this.options.collapsible, - locationHash = location.hash.substring( 1 ); - - if ( active === null ) { - // check the fragment identifier in the URL - if ( locationHash ) { - this.tabs.each(function( i, tab ) { - if ( $( tab ).attr( "aria-controls" ) === locationHash ) { - active = i; - return false; - } - }); - } - - // check for a tab marked active via a class - if ( active === null ) { - active = this.tabs.index( this.tabs.filter( ".ui-tabs-active" ) ); - } - - // no active tab, set to false - if ( active === null || active === -1 ) { - active = this.tabs.length ? 0 : false; - } - } - - // handle numbers: negative, out of range - if ( active !== false ) { - active = this.tabs.index( this.tabs.eq( active ) ); - if ( active === -1 ) { - active = collapsible ? false : 0; - } - } - - // don't allow collapsible: false and active: false - if ( !collapsible && active === false && this.anchors.length ) { - active = 0; - } - - return active; - }, - - _getCreateEventData: function() { - return { - tab: this.active, - panel: !this.active.length ? $() : this._getPanelForTab( this.active ) - }; - }, - - _tabKeydown: function( event ) { - /*jshint maxcomplexity:15*/ - var focusedTab = $( this.document[0].activeElement ).closest( "li" ), - selectedIndex = this.tabs.index( focusedTab ), - goingForward = true; - - if ( this._handlePageNav( event ) ) { - return; - } - - switch ( event.keyCode ) { - case $.ui.keyCode.RIGHT: - case $.ui.keyCode.DOWN: - selectedIndex++; - break; - case $.ui.keyCode.UP: - case $.ui.keyCode.LEFT: - goingForward = false; - selectedIndex--; - break; - case $.ui.keyCode.END: - selectedIndex = this.anchors.length - 1; - break; - case $.ui.keyCode.HOME: - selectedIndex = 0; - break; - case $.ui.keyCode.SPACE: - // Activate only, no collapsing - event.preventDefault(); - clearTimeout( this.activating ); - this._activate( selectedIndex ); - return; - case $.ui.keyCode.ENTER: - // Toggle (cancel delayed activation, allow collapsing) - event.preventDefault(); - clearTimeout( this.activating ); - // Determine if we should collapse or activate - this._activate( selectedIndex === this.options.active ? false : selectedIndex ); - return; - default: - return; - } - - // Focus the appropriate tab, based on which key was pressed - event.preventDefault(); - clearTimeout( this.activating ); - selectedIndex = this._focusNextTab( selectedIndex, goingForward ); - - // Navigating with control key will prevent automatic activation - if ( !event.ctrlKey ) { - // Update aria-selected immediately so that AT think the tab is already selected. - // Otherwise AT may confuse the user by stating that they need to activate the tab, - // but the tab will already be activated by the time the announcement finishes. - focusedTab.attr( "aria-selected", "false" ); - this.tabs.eq( selectedIndex ).attr( "aria-selected", "true" ); - - this.activating = this._delay(function() { - this.option( "active", selectedIndex ); - }, this.delay ); - } - }, - - _panelKeydown: function( event ) { - if ( this._handlePageNav( event ) ) { - return; - } - - // Ctrl+up moves focus to the current tab - if ( event.ctrlKey && event.keyCode === $.ui.keyCode.UP ) { - event.preventDefault(); - this.active.focus(); - } - }, - - // Alt+page up/down moves focus to the previous/next tab (and activates) - _handlePageNav: function( event ) { - if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_UP ) { - this._activate( this._focusNextTab( this.options.active - 1, false ) ); - return true; - } - if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_DOWN ) { - this._activate( this._focusNextTab( this.options.active + 1, true ) ); - return true; - } - }, - - _findNextTab: function( index, goingForward ) { - var lastTabIndex = this.tabs.length - 1; - - function constrain() { - if ( index > lastTabIndex ) { - index = 0; - } - if ( index < 0 ) { - index = lastTabIndex; - } - return index; - } - - while ( $.inArray( constrain(), this.options.disabled ) !== -1 ) { - index = goingForward ? index + 1 : index - 1; - } - - return index; - }, - - _focusNextTab: function( index, goingForward ) { - index = this._findNextTab( index, goingForward ); - this.tabs.eq( index ).focus(); - return index; - }, - - _setOption: function( key, value ) { - if ( key === "active" ) { - // _activate() will handle invalid values and update this.options - this._activate( value ); - return; - } - - if ( key === "disabled" ) { - // don't use the widget factory's disabled handling - this._setupDisabled( value ); - return; - } - - this._super( key, value); - - if ( key === "collapsible" ) { - this.element.toggleClass( "ui-tabs-collapsible", value ); - // Setting collapsible: false while collapsed; open first panel - if ( !value && this.options.active === false ) { - this._activate( 0 ); - } - } - - if ( key === "event" ) { - this._setupEvents( value ); - } - - if ( key === "heightStyle" ) { - this._setupHeightStyle( value ); - } - }, - - _tabId: function( tab ) { - return tab.attr( "aria-controls" ) || "ui-tabs-" + getNextTabId(); - }, - - _sanitizeSelector: function( hash ) { - return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g, "\\$&" ) : ""; - }, - - refresh: function() { - var options = this.options, - lis = this.tablist.children( ":has(a[href])" ); - - // get disabled tabs from class attribute from HTML - // this will get converted to a boolean if needed in _refresh() - options.disabled = $.map( lis.filter( ".ui-state-disabled" ), function( tab ) { - return lis.index( tab ); - }); - - this._processTabs(); - - // was collapsed or no tabs - if ( options.active === false || !this.anchors.length ) { - options.active = false; - this.active = $(); - // was active, but active tab is gone - } else if ( this.active.length && !$.contains( this.tablist[ 0 ], this.active[ 0 ] ) ) { - // all remaining tabs are disabled - if ( this.tabs.length === options.disabled.length ) { - options.active = false; - this.active = $(); - // activate previous tab - } else { - this._activate( this._findNextTab( Math.max( 0, options.active - 1 ), false ) ); - } - // was active, active tab still exists - } else { - // make sure active index is correct - options.active = this.tabs.index( this.active ); - } - - this._refresh(); - }, - - _refresh: function() { - this._setupDisabled( this.options.disabled ); - this._setupEvents( this.options.event ); - this._setupHeightStyle( this.options.heightStyle ); - - this.tabs.not( this.active ).attr({ - "aria-selected": "false", - tabIndex: -1 - }); - this.panels.not( this._getPanelForTab( this.active ) ) - .hide() - .attr({ - "aria-expanded": "false", - "aria-hidden": "true" - }); - - // Make sure one tab is in the tab order - if ( !this.active.length ) { - this.tabs.eq( 0 ).attr( "tabIndex", 0 ); - } else { - this.active - .addClass( "ui-tabs-active ui-state-active" ) - .attr({ - "aria-selected": "true", - tabIndex: 0 - }); - this._getPanelForTab( this.active ) - .show() - .attr({ - "aria-expanded": "true", - "aria-hidden": "false" - }); - } - }, - - _processTabs: function() { - var that = this; - - this.tablist = this._getList() - .addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" ) - .attr( "role", "tablist" ); - - this.tabs = this.tablist.find( "> li:has(a[href])" ) - .addClass( "ui-state-default ui-corner-top" ) - .attr({ - role: "tab", - tabIndex: -1 - }); - - this.anchors = this.tabs.map(function() { - return $( "a", this )[ 0 ]; - }) - .addClass( "ui-tabs-anchor" ) - .attr({ - role: "presentation", - tabIndex: -1 - }); - - this.panels = $(); - - this.anchors.each(function( i, anchor ) { - var selector, panel, panelId, - anchorId = $( anchor ).uniqueId().attr( "id" ), - tab = $( anchor ).closest( "li" ), - originalAriaControls = tab.attr( "aria-controls" ); - - // inline tab - if ( isLocal( anchor ) ) { - selector = anchor.hash; - panel = that.element.find( that._sanitizeSelector( selector ) ); - // remote tab - } else { - panelId = that._tabId( tab ); - selector = "#" + panelId; - panel = that.element.find( selector ); - if ( !panel.length ) { - panel = that._createPanel( panelId ); - panel.insertAfter( that.panels[ i - 1 ] || that.tablist ); - } - panel.attr( "aria-live", "polite" ); - } - - if ( panel.length) { - that.panels = that.panels.add( panel ); - } - if ( originalAriaControls ) { - tab.data( "ui-tabs-aria-controls", originalAriaControls ); - } - tab.attr({ - "aria-controls": selector.substring( 1 ), - "aria-labelledby": anchorId - }); - panel.attr( "aria-labelledby", anchorId ); - }); - - this.panels - .addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" ) - .attr( "role", "tabpanel" ); - }, - - // allow overriding how to find the list for rare usage scenarios (#7715) - _getList: function() { - return this.element.find( "ol,ul" ).eq( 0 ); - }, - - _createPanel: function( id ) { - return $( "<div>" ) - .attr( "id", id ) - .addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" ) - .data( "ui-tabs-destroy", true ); - }, - - _setupDisabled: function( disabled ) { - if ( $.isArray( disabled ) ) { - if ( !disabled.length ) { - disabled = false; - } else if ( disabled.length === this.anchors.length ) { - disabled = true; - } - } - - // disable tabs - for ( var i = 0, li; ( li = this.tabs[ i ] ); i++ ) { - if ( disabled === true || $.inArray( i, disabled ) !== -1 ) { - $( li ) - .addClass( "ui-state-disabled" ) - .attr( "aria-disabled", "true" ); - } else { - $( li ) - .removeClass( "ui-state-disabled" ) - .removeAttr( "aria-disabled" ); - } - } - - this.options.disabled = disabled; - }, - - _setupEvents: function( event ) { - var events = { - click: function( event ) { - event.preventDefault(); - } - }; - if ( event ) { - $.each( event.split(" "), function( index, eventName ) { - events[ eventName ] = "_eventHandler"; - }); - } - - this._off( this.anchors.add( this.tabs ).add( this.panels ) ); - this._on( this.anchors, events ); - this._on( this.tabs, { keydown: "_tabKeydown" } ); - this._on( this.panels, { keydown: "_panelKeydown" } ); - - this._focusable( this.tabs ); - this._hoverable( this.tabs ); - }, - - _setupHeightStyle: function( heightStyle ) { - var maxHeight, - parent = this.element.parent(); - - if ( heightStyle === "fill" ) { - maxHeight = parent.height(); - maxHeight -= this.element.outerHeight() - this.element.height(); - - this.element.siblings( ":visible" ).each(function() { - var elem = $( this ), - position = elem.css( "position" ); - - if ( position === "absolute" || position === "fixed" ) { - return; - } - maxHeight -= elem.outerHeight( true ); - }); - - this.element.children().not( this.panels ).each(function() { - maxHeight -= $( this ).outerHeight( true ); - }); - - this.panels.each(function() { - $( this ).height( Math.max( 0, maxHeight - - $( this ).innerHeight() + $( this ).height() ) ); - }) - .css( "overflow", "auto" ); - } else if ( heightStyle === "auto" ) { - maxHeight = 0; - this.panels.each(function() { - maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() ); - }).height( maxHeight ); - } - }, - - _eventHandler: function( event ) { - var options = this.options, - active = this.active, - anchor = $( event.currentTarget ), - tab = anchor.closest( "li" ), - clickedIsActive = tab[ 0 ] === active[ 0 ], - collapsing = clickedIsActive && options.collapsible, - toShow = collapsing ? $() : this._getPanelForTab( tab ), - toHide = !active.length ? $() : this._getPanelForTab( active ), - eventData = { - oldTab: active, - oldPanel: toHide, - newTab: collapsing ? $() : tab, - newPanel: toShow - }; - - event.preventDefault(); - - if ( tab.hasClass( "ui-state-disabled" ) || - // tab is already loading - tab.hasClass( "ui-tabs-loading" ) || - // can't switch durning an animation - this.running || - // click on active header, but not collapsible - ( clickedIsActive && !options.collapsible ) || - // allow canceling activation - ( this._trigger( "beforeActivate", event, eventData ) === false ) ) { - return; - } - - options.active = collapsing ? false : this.tabs.index( tab ); - - this.active = clickedIsActive ? $() : tab; - if ( this.xhr ) { - this.xhr.abort(); - } - - if ( !toHide.length && !toShow.length ) { - $.error( "jQuery UI Tabs: Mismatching fragment identifier." ); - } - - if ( toShow.length ) { - this.load( this.tabs.index( tab ), event ); - } - this._toggle( event, eventData ); - }, - - // handles show/hide for selecting tabs - _toggle: function( event, eventData ) { - var that = this, - toShow = eventData.newPanel, - toHide = eventData.oldPanel; - - this.running = true; - - function complete() { - that.running = false; - that._trigger( "activate", event, eventData ); - } - - function show() { - eventData.newTab.closest( "li" ).addClass( "ui-tabs-active ui-state-active" ); - - if ( toShow.length && that.options.show ) { - that._show( toShow, that.options.show, complete ); - } else { - toShow.show(); - complete(); - } - } - - // start out by hiding, then showing, then completing - if ( toHide.length && this.options.hide ) { - this._hide( toHide, this.options.hide, function() { - eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" ); - show(); - }); - } else { - eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" ); - toHide.hide(); - show(); - } - - toHide.attr({ - "aria-expanded": "false", - "aria-hidden": "true" - }); - eventData.oldTab.attr( "aria-selected", "false" ); - // If we're switching tabs, remove the old tab from the tab order. - // If we're opening from collapsed state, remove the previous tab from the tab order. - // If we're collapsing, then keep the collapsing tab in the tab order. - if ( toShow.length && toHide.length ) { - eventData.oldTab.attr( "tabIndex", -1 ); - } else if ( toShow.length ) { - this.tabs.filter(function() { - return $( this ).attr( "tabIndex" ) === 0; - }) - .attr( "tabIndex", -1 ); - } - - toShow.attr({ - "aria-expanded": "true", - "aria-hidden": "false" - }); - eventData.newTab.attr({ - "aria-selected": "true", - tabIndex: 0 - }); - }, - - _activate: function( index ) { - var anchor, - active = this._findActive( index ); - - // trying to activate the already active panel - if ( active[ 0 ] === this.active[ 0 ] ) { - return; - } - - // trying to collapse, simulate a click on the current active header - if ( !active.length ) { - active = this.active; - } - - anchor = active.find( ".ui-tabs-anchor" )[ 0 ]; - this._eventHandler({ - target: anchor, - currentTarget: anchor, - preventDefault: $.noop - }); - }, - - _findActive: function( index ) { - return index === false ? $() : this.tabs.eq( index ); - }, - - _getIndex: function( index ) { - // meta-function to give users option to provide a href string instead of a numerical index. - if ( typeof index === "string" ) { - index = this.anchors.index( this.anchors.filter( "[href$='" + index + "']" ) ); - } - - return index; - }, - - _destroy: function() { - if ( this.xhr ) { - this.xhr.abort(); - } - - this.element.removeClass( "ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible" ); - - this.tablist - .removeClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" ) - .removeAttr( "role" ); - - this.anchors - .removeClass( "ui-tabs-anchor" ) - .removeAttr( "role" ) - .removeAttr( "tabIndex" ) - .removeUniqueId(); - - this.tabs.add( this.panels ).each(function() { - if ( $.data( this, "ui-tabs-destroy" ) ) { - $( this ).remove(); - } else { - $( this ) - .removeClass( "ui-state-default ui-state-active ui-state-disabled " + - "ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel" ) - .removeAttr( "tabIndex" ) - .removeAttr( "aria-live" ) - .removeAttr( "aria-busy" ) - .removeAttr( "aria-selected" ) - .removeAttr( "aria-labelledby" ) - .removeAttr( "aria-hidden" ) - .removeAttr( "aria-expanded" ) - .removeAttr( "role" ); - } - }); - - this.tabs.each(function() { - var li = $( this ), - prev = li.data( "ui-tabs-aria-controls" ); - if ( prev ) { - li - .attr( "aria-controls", prev ) - .removeData( "ui-tabs-aria-controls" ); - } else { - li.removeAttr( "aria-controls" ); - } - }); - - this.panels.show(); - - if ( this.options.heightStyle !== "content" ) { - this.panels.css( "height", "" ); - } - }, - - enable: function( index ) { - var disabled = this.options.disabled; - if ( disabled === false ) { - return; - } - - if ( index === undefined ) { - disabled = false; - } else { - index = this._getIndex( index ); - if ( $.isArray( disabled ) ) { - disabled = $.map( disabled, function( num ) { - return num !== index ? num : null; - }); - } else { - disabled = $.map( this.tabs, function( li, num ) { - return num !== index ? num : null; - }); - } - } - this._setupDisabled( disabled ); - }, - - disable: function( index ) { - var disabled = this.options.disabled; - if ( disabled === true ) { - return; - } - - if ( index === undefined ) { - disabled = true; - } else { - index = this._getIndex( index ); - if ( $.inArray( index, disabled ) !== -1 ) { - return; - } - if ( $.isArray( disabled ) ) { - disabled = $.merge( [ index ], disabled ).sort(); - } else { - disabled = [ index ]; - } - } - this._setupDisabled( disabled ); - }, - - load: function( index, event ) { - index = this._getIndex( index ); - var that = this, - tab = this.tabs.eq( index ), - anchor = tab.find( ".ui-tabs-anchor" ), - panel = this._getPanelForTab( tab ), - eventData = { - tab: tab, - panel: panel - }; - - // not remote - if ( isLocal( anchor[ 0 ] ) ) { - return; - } - - this.xhr = $.ajax( this._ajaxSettings( anchor, event, eventData ) ); - - // support: jQuery <1.8 - // jQuery <1.8 returns false if the request is canceled in beforeSend, - // but as of 1.8, $.ajax() always returns a jqXHR object. - if ( this.xhr && this.xhr.statusText !== "canceled" ) { - tab.addClass( "ui-tabs-loading" ); - panel.attr( "aria-busy", "true" ); - - this.xhr - .success(function( response ) { - // support: jQuery <1.8 - // http://bugs.jquery.com/ticket/11778 - setTimeout(function() { - panel.html( response ); - that._trigger( "load", event, eventData ); - }, 1 ); - }) - .complete(function( jqXHR, status ) { - // support: jQuery <1.8 - // http://bugs.jquery.com/ticket/11778 - setTimeout(function() { - if ( status === "abort" ) { - that.panels.stop( false, true ); - } - - tab.removeClass( "ui-tabs-loading" ); - panel.removeAttr( "aria-busy" ); - - if ( jqXHR === that.xhr ) { - delete that.xhr; - } - }, 1 ); - }); - } - }, - - _ajaxSettings: function( anchor, event, eventData ) { - var that = this; - return { - url: anchor.attr( "href" ), - beforeSend: function( jqXHR, settings ) { - return that._trigger( "beforeLoad", event, - $.extend( { jqXHR : jqXHR, ajaxSettings: settings }, eventData ) ); - } - }; - }, - - _getPanelForTab: function( tab ) { - var id = $( tab ).attr( "aria-controls" ); - return this.element.find( this._sanitizeSelector( "#" + id ) ); - } - }); - -})( jQuery ); diff --git a/sonar-server/src/main/webapp/javascripts/third-party/moment.min.js b/sonar-server/src/main/webapp/javascripts/third-party/moment.min.js deleted file mode 100644 index f253488600c..00000000000 --- a/sonar-server/src/main/webapp/javascripts/third-party/moment.min.js +++ /dev/null @@ -1,6 +0,0 @@ -//! moment.js -//! version : 2.5.0 -//! authors : Tim Wood, Iskren Chernev, Moment.js contributors -//! license : MIT -//! momentjs.com -(function(a){function b(a,b){return function(c){return i(a.call(this,c),b)}}function c(a,b){return function(c){return this.lang().ordinal(a.call(this,c),b)}}function d(){}function e(a){u(a),g(this,a)}function f(a){var b=o(a),c=b.year||0,d=b.month||0,e=b.week||0,f=b.day||0,g=b.hour||0,h=b.minute||0,i=b.second||0,j=b.millisecond||0;this._milliseconds=+j+1e3*i+6e4*h+36e5*g,this._days=+f+7*e,this._months=+d+12*c,this._data={},this._bubble()}function g(a,b){for(var c in b)b.hasOwnProperty(c)&&(a[c]=b[c]);return b.hasOwnProperty("toString")&&(a.toString=b.toString),b.hasOwnProperty("valueOf")&&(a.valueOf=b.valueOf),a}function h(a){return 0>a?Math.ceil(a):Math.floor(a)}function i(a,b,c){for(var d=Math.abs(a)+"",e=a>=0;d.length<b;)d="0"+d;return(e?c?"+":"":"-")+d}function j(a,b,c,d){var e,f,g=b._milliseconds,h=b._days,i=b._months;g&&a._d.setTime(+a._d+g*c),(h||i)&&(e=a.minute(),f=a.hour()),h&&a.date(a.date()+h*c),i&&a.month(a.month()+i*c),g&&!d&&cb.updateOffset(a),(h||i)&&(a.minute(e),a.hour(f))}function k(a){return"[object Array]"===Object.prototype.toString.call(a)}function l(a){return"[object Date]"===Object.prototype.toString.call(a)||a instanceof Date}function m(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&&a[d]!==b[d]||!c&&q(a[d])!==q(b[d]))&&g++;return g+f}function n(a){if(a){var b=a.toLowerCase().replace(/(.)s$/,"$1");a=Qb[a]||Rb[b]||b}return a}function o(a){var b,c,d={};for(c in a)a.hasOwnProperty(c)&&(b=n(c),b&&(d[b]=a[c]));return d}function p(b){var c,d;if(0===b.indexOf("week"))c=7,d="day";else{if(0!==b.indexOf("month"))return;c=12,d="month"}cb[b]=function(e,f){var g,h,i=cb.fn._lang[b],j=[];if("number"==typeof e&&(f=e,e=a),h=function(a){var b=cb().utc().set(d,a);return i.call(cb.fn._lang,b,e||"")},null!=f)return h(f);for(g=0;c>g;g++)j.push(h(g));return j}}function q(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=b>=0?Math.floor(b):Math.ceil(b)),c}function r(a,b){return new Date(Date.UTC(a,b+1,0)).getUTCDate()}function s(a){return t(a)?366:365}function t(a){return a%4===0&&a%100!==0||a%400===0}function u(a){var b;a._a&&-2===a._pf.overflow&&(b=a._a[ib]<0||a._a[ib]>11?ib:a._a[jb]<1||a._a[jb]>r(a._a[hb],a._a[ib])?jb:a._a[kb]<0||a._a[kb]>23?kb:a._a[lb]<0||a._a[lb]>59?lb:a._a[mb]<0||a._a[mb]>59?mb:a._a[nb]<0||a._a[nb]>999?nb:-1,a._pf._overflowDayOfYear&&(hb>b||b>jb)&&(b=jb),a._pf.overflow=b)}function v(a){a._pf={empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1}}function w(a){return null==a._isValid&&(a._isValid=!isNaN(a._d.getTime())&&a._pf.overflow<0&&!a._pf.empty&&!a._pf.invalidMonth&&!a._pf.nullInput&&!a._pf.invalidFormat&&!a._pf.userInvalidated,a._strict&&(a._isValid=a._isValid&&0===a._pf.charsLeftOver&&0===a._pf.unusedTokens.length)),a._isValid}function x(a){return a?a.toLowerCase().replace("_","-"):a}function y(a,b){return b._isUTC?cb(a).zone(b._offset||0):cb(a).local()}function z(a,b){return b.abbr=a,ob[a]||(ob[a]=new d),ob[a].set(b),ob[a]}function A(a){delete ob[a]}function B(a){var b,c,d,e,f=0,g=function(a){if(!ob[a]&&pb)try{require("./lang/"+a)}catch(b){}return ob[a]};if(!a)return cb.fn._lang;if(!k(a)){if(c=g(a))return c;a=[a]}for(;f<a.length;){for(e=x(a[f]).split("-"),b=e.length,d=x(a[f+1]),d=d?d.split("-"):null;b>0;){if(c=g(e.slice(0,b).join("-")))return c;if(d&&d.length>=b&&m(e,d,!0)>=b-1)break;b--}f++}return cb.fn._lang}function C(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function D(a){var b,c,d=a.match(tb);for(b=0,c=d.length;c>b;b++)d[b]=Vb[d[b]]?Vb[d[b]]:C(d[b]);return function(e){var f="";for(b=0;c>b;b++)f+=d[b]instanceof Function?d[b].call(e,a):d[b];return f}}function E(a,b){return a.isValid()?(b=F(b,a.lang()),Sb[b]||(Sb[b]=D(b)),Sb[b](a)):a.lang().invalidDate()}function F(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(ub.lastIndex=0;d>=0&&ub.test(a);)a=a.replace(ub,c),ub.lastIndex=0,d-=1;return a}function G(a,b){var c,d=b._strict;switch(a){case"DDDD":return Gb;case"YYYY":case"GGGG":case"gggg":return d?Hb:xb;case"YYYYYY":case"YYYYY":case"GGGGG":case"ggggg":return d?Ib:yb;case"S":if(d)return Eb;case"SS":if(d)return Fb;case"SSS":case"DDD":return d?Gb:wb;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":return Ab;case"a":case"A":return B(b._l)._meridiemParse;case"X":return Db;case"Z":case"ZZ":return Bb;case"T":return Cb;case"SSSS":return zb;case"MM":case"DD":case"YY":case"GG":case"gg":case"HH":case"hh":case"mm":case"ss":case"ww":case"WW":return d?Fb:vb;case"M":case"D":case"d":case"H":case"h":case"m":case"s":case"w":case"W":case"e":case"E":return d?Eb:vb;default:return c=new RegExp(O(N(a.replace("\\","")),"i"))}}function H(a){a=a||"";var b=a.match(Bb)||[],c=b[b.length-1]||[],d=(c+"").match(Nb)||["-",0,0],e=+(60*d[1])+q(d[2]);return"+"===d[0]?-e:e}function I(a,b,c){var d,e=c._a;switch(a){case"M":case"MM":null!=b&&(e[ib]=q(b)-1);break;case"MMM":case"MMMM":d=B(c._l).monthsParse(b),null!=d?e[ib]=d:c._pf.invalidMonth=b;break;case"D":case"DD":null!=b&&(e[jb]=q(b));break;case"DDD":case"DDDD":null!=b&&(c._dayOfYear=q(b));break;case"YY":e[hb]=q(b)+(q(b)>68?1900:2e3);break;case"YYYY":case"YYYYY":case"YYYYYY":e[hb]=q(b);break;case"a":case"A":c._isPm=B(c._l).isPM(b);break;case"H":case"HH":case"h":case"hh":e[kb]=q(b);break;case"m":case"mm":e[lb]=q(b);break;case"s":case"ss":e[mb]=q(b);break;case"S":case"SS":case"SSS":case"SSSS":e[nb]=q(1e3*("0."+b));break;case"X":c._d=new Date(1e3*parseFloat(b));break;case"Z":case"ZZ":c._useUTC=!0,c._tzm=H(b);break;case"w":case"ww":case"W":case"WW":case"d":case"dd":case"ddd":case"dddd":case"e":case"E":a=a.substr(0,1);case"gg":case"gggg":case"GG":case"GGGG":case"GGGGG":a=a.substr(0,2),b&&(c._w=c._w||{},c._w[a]=b)}}function J(a){var b,c,d,e,f,g,h,i,j,k,l=[];if(!a._d){for(d=L(a),a._w&&null==a._a[jb]&&null==a._a[ib]&&(f=function(b){var c=parseInt(b,10);return b?b.length<3?c>68?1900+c:2e3+c:c:null==a._a[hb]?cb().weekYear():a._a[hb]},g=a._w,null!=g.GG||null!=g.W||null!=g.E?h=Y(f(g.GG),g.W||1,g.E,4,1):(i=B(a._l),j=null!=g.d?U(g.d,i):null!=g.e?parseInt(g.e,10)+i._week.dow:0,k=parseInt(g.w,10)||1,null!=g.d&&j<i._week.dow&&k++,h=Y(f(g.gg),k,j,i._week.doy,i._week.dow)),a._a[hb]=h.year,a._dayOfYear=h.dayOfYear),a._dayOfYear&&(e=null==a._a[hb]?d[hb]:a._a[hb],a._dayOfYear>s(e)&&(a._pf._overflowDayOfYear=!0),c=T(e,0,a._dayOfYear),a._a[ib]=c.getUTCMonth(),a._a[jb]=c.getUTCDate()),b=0;3>b&&null==a._a[b];++b)a._a[b]=l[b]=d[b];for(;7>b;b++)a._a[b]=l[b]=null==a._a[b]?2===b?1:0:a._a[b];l[kb]+=q((a._tzm||0)/60),l[lb]+=q((a._tzm||0)%60),a._d=(a._useUTC?T:S).apply(null,l)}}function K(a){var b;a._d||(b=o(a._i),a._a=[b.year,b.month,b.day,b.hour,b.minute,b.second,b.millisecond],J(a))}function L(a){var b=new Date;return a._useUTC?[b.getUTCFullYear(),b.getUTCMonth(),b.getUTCDate()]:[b.getFullYear(),b.getMonth(),b.getDate()]}function M(a){a._a=[],a._pf.empty=!0;var b,c,d,e,f,g=B(a._l),h=""+a._i,i=h.length,j=0;for(d=F(a._f,g).match(tb)||[],b=0;b<d.length;b++)e=d[b],c=(h.match(G(e,a))||[])[0],c&&(f=h.substr(0,h.indexOf(c)),f.length>0&&a._pf.unusedInput.push(f),h=h.slice(h.indexOf(c)+c.length),j+=c.length),Vb[e]?(c?a._pf.empty=!1:a._pf.unusedTokens.push(e),I(e,c,a)):a._strict&&!c&&a._pf.unusedTokens.push(e);a._pf.charsLeftOver=i-j,h.length>0&&a._pf.unusedInput.push(h),a._isPm&&a._a[kb]<12&&(a._a[kb]+=12),a._isPm===!1&&12===a._a[kb]&&(a._a[kb]=0),J(a),u(a)}function N(a){return a.replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e})}function O(a){return a.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function P(a){var b,c,d,e,f;if(0===a._f.length)return a._pf.invalidFormat=!0,a._d=new Date(0/0),void 0;for(e=0;e<a._f.length;e++)f=0,b=g({},a),v(b),b._f=a._f[e],M(b),w(b)&&(f+=b._pf.charsLeftOver,f+=10*b._pf.unusedTokens.length,b._pf.score=f,(null==d||d>f)&&(d=f,c=b));g(a,c||b)}function Q(a){var b,c=a._i,d=Jb.exec(c);if(d){for(a._pf.iso=!0,b=4;b>0;b--)if(d[b]){a._f=Lb[b-1]+(d[6]||" ");break}for(b=0;4>b;b++)if(Mb[b][1].exec(c)){a._f+=Mb[b][0];break}c.match(Bb)&&(a._f+="Z"),M(a)}else a._d=new Date(c)}function R(b){var c=b._i,d=qb.exec(c);c===a?b._d=new Date:d?b._d=new Date(+d[1]):"string"==typeof c?Q(b):k(c)?(b._a=c.slice(0),J(b)):l(c)?b._d=new Date(+c):"object"==typeof c?K(b):b._d=new Date(c)}function S(a,b,c,d,e,f,g){var h=new Date(a,b,c,d,e,f,g);return 1970>a&&h.setFullYear(a),h}function T(a){var b=new Date(Date.UTC.apply(null,arguments));return 1970>a&&b.setUTCFullYear(a),b}function U(a,b){if("string"==typeof a)if(isNaN(a)){if(a=b.weekdaysParse(a),"number"!=typeof a)return null}else a=parseInt(a,10);return a}function V(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function W(a,b,c){var d=gb(Math.abs(a)/1e3),e=gb(d/60),f=gb(e/60),g=gb(f/24),h=gb(g/365),i=45>d&&["s",d]||1===e&&["m"]||45>e&&["mm",e]||1===f&&["h"]||22>f&&["hh",f]||1===g&&["d"]||25>=g&&["dd",g]||45>=g&&["M"]||345>g&&["MM",gb(g/30)]||1===h&&["y"]||["yy",h];return i[2]=b,i[3]=a>0,i[4]=c,V.apply({},i)}function X(a,b,c){var d,e=c-b,f=c-a.day();return f>e&&(f-=7),e-7>f&&(f+=7),d=cb(a).add("d",f),{week:Math.ceil(d.dayOfYear()/7),year:d.year()}}function Y(a,b,c,d,e){var f,g,h=new Date(i(a,6,!0)+"-01-01").getUTCDay();return c=null!=c?c:e,f=e-h+(h>d?7:0),g=7*(b-1)+(c-e)+f+1,{year:g>0?a:a-1,dayOfYear:g>0?g:s(a-1)+g}}function Z(a){var b=a._i,c=a._f;return"undefined"==typeof a._pf&&v(a),null===b?cb.invalid({nullInput:!0}):("string"==typeof b&&(a._i=b=B().preparse(b)),cb.isMoment(b)?(a=g({},b),a._d=new Date(+b._d)):c?k(c)?P(a):M(a):R(a),new e(a))}function $(a,b){cb.fn[a]=cb.fn[a+"s"]=function(a){var c=this._isUTC?"UTC":"";return null!=a?(this._d["set"+c+b](a),cb.updateOffset(this),this):this._d["get"+c+b]()}}function _(a){cb.duration.fn[a]=function(){return this._data[a]}}function ab(a,b){cb.duration.fn["as"+a]=function(){return+this/b}}function bb(a){var b=!1,c=cb;"undefined"==typeof ender&&(a?(fb.moment=function(){return!b&&console&&console.warn&&(b=!0,console.warn("Accessing Moment through the global scope is deprecated, and will be removed in an upcoming release.")),c.apply(null,arguments)},g(fb.moment,c)):fb.moment=cb)}for(var cb,db,eb="2.5.0",fb=this,gb=Math.round,hb=0,ib=1,jb=2,kb=3,lb=4,mb=5,nb=6,ob={},pb="undefined"!=typeof module&&module.exports&&"undefined"!=typeof require,qb=/^\/?Date\((\-?\d+)/i,rb=/(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,sb=/^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/,tb=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|X|zz?|ZZ?|.)/g,ub=/(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,vb=/\d\d?/,wb=/\d{1,3}/,xb=/\d{1,4}/,yb=/[+\-]?\d{1,6}/,zb=/\d+/,Ab=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,Bb=/Z|[\+\-]\d\d:?\d\d/gi,Cb=/T/i,Db=/[\+\-]?\d+(\.\d{1,3})?/,Eb=/\d/,Fb=/\d\d/,Gb=/\d{3}/,Hb=/\d{4}/,Ib=/[+\-]?\d{6}/,Jb=/^\s*\d{4}-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,Kb="YYYY-MM-DDTHH:mm:ssZ",Lb=["YYYY-MM-DD","GGGG-[W]WW","GGGG-[W]WW-E","YYYY-DDD"],Mb=[["HH:mm:ss.SSSS",/(T| )\d\d:\d\d:\d\d\.\d{1,3}/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],Nb=/([\+\-]|\d\d)/gi,Ob="Date|Hours|Minutes|Seconds|Milliseconds".split("|"),Pb={Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6},Qb={ms:"millisecond",s:"second",m:"minute",h:"hour",d:"day",D:"date",w:"week",W:"isoWeek",M:"month",y:"year",DDD:"dayOfYear",e:"weekday",E:"isoWeekday",gg:"weekYear",GG:"isoWeekYear"},Rb={dayofyear:"dayOfYear",isoweekday:"isoWeekday",isoweek:"isoWeek",weekyear:"weekYear",isoweekyear:"isoWeekYear"},Sb={},Tb="DDD w W M D d".split(" "),Ub="M D H h m s w W".split(" "),Vb={M:function(){return this.month()+1},MMM:function(a){return this.lang().monthsShort(this,a)},MMMM:function(a){return this.lang().months(this,a)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(a){return this.lang().weekdaysMin(this,a)},ddd:function(a){return this.lang().weekdaysShort(this,a)},dddd:function(a){return this.lang().weekdays(this,a)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return i(this.year()%100,2)},YYYY:function(){return i(this.year(),4)},YYYYY:function(){return i(this.year(),5)},YYYYYY:function(){var a=this.year(),b=a>=0?"+":"-";return b+i(Math.abs(a),6)},gg:function(){return i(this.weekYear()%100,2)},gggg:function(){return this.weekYear()},ggggg:function(){return i(this.weekYear(),5)},GG:function(){return i(this.isoWeekYear()%100,2)},GGGG:function(){return this.isoWeekYear()},GGGGG:function(){return i(this.isoWeekYear(),5)},e:function(){return this.weekday()},E:function(){return this.isoWeekday()},a:function(){return this.lang().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.lang().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours()%12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return q(this.milliseconds()/100)},SS:function(){return i(q(this.milliseconds()/10),2)},SSS:function(){return i(this.milliseconds(),3)},SSSS:function(){return i(this.milliseconds(),3)},Z:function(){var a=-this.zone(),b="+";return 0>a&&(a=-a,b="-"),b+i(q(a/60),2)+":"+i(q(a)%60,2)},ZZ:function(){var a=-this.zone(),b="+";return 0>a&&(a=-a,b="-"),b+i(q(a/60),2)+i(q(a)%60,2)},z:function(){return this.zoneAbbr()},zz:function(){return this.zoneName()},X:function(){return this.unix()},Q:function(){return this.quarter()}},Wb=["months","monthsShort","weekdays","weekdaysShort","weekdaysMin"];Tb.length;)db=Tb.pop(),Vb[db+"o"]=c(Vb[db],db);for(;Ub.length;)db=Ub.pop(),Vb[db+db]=b(Vb[db],2);for(Vb.DDDD=b(Vb.DDD,3),g(d.prototype,{set:function(a){var b,c;for(c in a)b=a[c],"function"==typeof b?this[c]=b:this["_"+c]=b},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(a){return this._months[a.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(a){return this._monthsShort[a.month()]},monthsParse:function(a){var b,c,d;for(this._monthsParse||(this._monthsParse=[]),b=0;12>b;b++)if(this._monthsParse[b]||(c=cb.utc([2e3,b]),d="^"+this.months(c,"")+"|^"+this.monthsShort(c,""),this._monthsParse[b]=new RegExp(d.replace(".",""),"i")),this._monthsParse[b].test(a))return b},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(a){return this._weekdays[a.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(a){return this._weekdaysShort[a.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(a){return this._weekdaysMin[a.day()]},weekdaysParse:function(a){var b,c,d;for(this._weekdaysParse||(this._weekdaysParse=[]),b=0;7>b;b++)if(this._weekdaysParse[b]||(c=cb([2e3,1]).day(b),d="^"+this.weekdays(c,"")+"|^"+this.weekdaysShort(c,"")+"|^"+this.weekdaysMin(c,""),this._weekdaysParse[b]=new RegExp(d.replace(".",""),"i")),this._weekdaysParse[b].test(a))return b},_longDateFormat:{LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D YYYY",LLL:"MMMM D YYYY LT",LLLL:"dddd, MMMM D YYYY LT"},longDateFormat:function(a){var b=this._longDateFormat[a];return!b&&this._longDateFormat[a.toUpperCase()]&&(b=this._longDateFormat[a.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a]=b),b},isPM:function(a){return"p"===(a+"").toLowerCase().charAt(0)},_meridiemParse:/[ap]\.?m?\.?/i,meridiem:function(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},calendar:function(a,b){var c=this._calendar[a];return"function"==typeof c?c.apply(b):c},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(a,b,c,d){var e=this._relativeTime[c];return"function"==typeof e?e(a,b,c,d):e.replace(/%d/i,a)},pastFuture:function(a,b){var c=this._relativeTime[a>0?"future":"past"];return"function"==typeof c?c(b):c.replace(/%s/i,b)},ordinal:function(a){return this._ordinal.replace("%d",a)},_ordinal:"%d",preparse:function(a){return a},postformat:function(a){return a},week:function(a){return X(a,this._week.dow,this._week.doy).week},_week:{dow:0,doy:6},_invalidDate:"Invalid date",invalidDate:function(){return this._invalidDate}}),cb=function(b,c,d,e){return"boolean"==typeof d&&(e=d,d=a),Z({_i:b,_f:c,_l:d,_strict:e,_isUTC:!1})},cb.utc=function(b,c,d,e){var f;return"boolean"==typeof d&&(e=d,d=a),f=Z({_useUTC:!0,_isUTC:!0,_l:d,_i:b,_f:c,_strict:e}).utc()},cb.unix=function(a){return cb(1e3*a)},cb.duration=function(a,b){var c,d,e,g=a,h=null;return cb.isDuration(a)?g={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(g={},b?g[b]=a:g.milliseconds=a):(h=rb.exec(a))?(c="-"===h[1]?-1:1,g={y:0,d:q(h[jb])*c,h:q(h[kb])*c,m:q(h[lb])*c,s:q(h[mb])*c,ms:q(h[nb])*c}):(h=sb.exec(a))&&(c="-"===h[1]?-1:1,e=function(a){var b=a&&parseFloat(a.replace(",","."));return(isNaN(b)?0:b)*c},g={y:e(h[2]),M:e(h[3]),d:e(h[4]),h:e(h[5]),m:e(h[6]),s:e(h[7]),w:e(h[8])}),d=new f(g),cb.isDuration(a)&&a.hasOwnProperty("_lang")&&(d._lang=a._lang),d},cb.version=eb,cb.defaultFormat=Kb,cb.updateOffset=function(){},cb.lang=function(a,b){var c;return a?(b?z(x(a),b):null===b?(A(a),a="en"):ob[a]||B(a),c=cb.duration.fn._lang=cb.fn._lang=B(a),c._abbr):cb.fn._lang._abbr},cb.langData=function(a){return a&&a._lang&&a._lang._abbr&&(a=a._lang._abbr),B(a)},cb.isMoment=function(a){return a instanceof e},cb.isDuration=function(a){return a instanceof f},db=Wb.length-1;db>=0;--db)p(Wb[db]);for(cb.normalizeUnits=function(a){return n(a)},cb.invalid=function(a){var b=cb.utc(0/0);return null!=a?g(b._pf,a):b._pf.userInvalidated=!0,b},cb.parseZone=function(a){return cb(a).parseZone()},g(cb.fn=e.prototype,{clone:function(){return cb(this)},valueOf:function(){return+this._d+6e4*(this._offset||0)},unix:function(){return Math.floor(+this/1e3)},toString:function(){return this.clone().lang("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._offset?new Date(+this):this._d},toISOString:function(){var a=cb(this).utc();return 0<a.year()&&a.year()<=9999?E(a,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):E(a,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var a=this;return[a.year(),a.month(),a.date(),a.hours(),a.minutes(),a.seconds(),a.milliseconds()]},isValid:function(){return w(this)},isDSTShifted:function(){return this._a?this.isValid()&&m(this._a,(this._isUTC?cb.utc(this._a):cb(this._a)).toArray())>0:!1},parsingFlags:function(){return g({},this._pf)},invalidAt:function(){return this._pf.overflow},utc:function(){return this.zone(0)},local:function(){return this.zone(0),this._isUTC=!1,this},format:function(a){var b=E(this,a||cb.defaultFormat);return this.lang().postformat(b)},add:function(a,b){var c;return c="string"==typeof a?cb.duration(+b,a):cb.duration(a,b),j(this,c,1),this},subtract:function(a,b){var c;return c="string"==typeof a?cb.duration(+b,a):cb.duration(a,b),j(this,c,-1),this},diff:function(a,b,c){var d,e,f=y(a,this),g=6e4*(this.zone()-f.zone());return b=n(b),"year"===b||"month"===b?(d=432e5*(this.daysInMonth()+f.daysInMonth()),e=12*(this.year()-f.year())+(this.month()-f.month()),e+=(this-cb(this).startOf("month")-(f-cb(f).startOf("month")))/d,e-=6e4*(this.zone()-cb(this).startOf("month").zone()-(f.zone()-cb(f).startOf("month").zone()))/d,"year"===b&&(e/=12)):(d=this-f,e="second"===b?d/1e3:"minute"===b?d/6e4:"hour"===b?d/36e5:"day"===b?(d-g)/864e5:"week"===b?(d-g)/6048e5:d),c?e:h(e)},from:function(a,b){return cb.duration(this.diff(a)).lang(this.lang()._abbr).humanize(!b)},fromNow:function(a){return this.from(cb(),a)},calendar:function(){var a=y(cb(),this).startOf("day"),b=this.diff(a,"days",!0),c=-6>b?"sameElse":-1>b?"lastWeek":0>b?"lastDay":1>b?"sameDay":2>b?"nextDay":7>b?"nextWeek":"sameElse";return this.format(this.lang().calendar(c,this))},isLeapYear:function(){return t(this.year())},isDST:function(){return this.zone()<this.clone().month(0).zone()||this.zone()<this.clone().month(5).zone()},day:function(a){var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=U(a,this.lang()),this.add({d:a-b})):b},month:function(a){var b,c=this._isUTC?"UTC":"";return null!=a?"string"==typeof a&&(a=this.lang().monthsParse(a),"number"!=typeof a)?this:(b=this.date(),this.date(1),this._d["set"+c+"Month"](a),this.date(Math.min(b,this.daysInMonth())),cb.updateOffset(this),this):this._d["get"+c+"Month"]()},startOf:function(a){switch(a=n(a)){case"year":this.month(0);case"month":this.date(1);case"week":case"isoWeek":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===a?this.weekday(0):"isoWeek"===a&&this.isoWeekday(1),this},endOf:function(a){return a=n(a),this.startOf(a).add("isoWeek"===a?"week":a,1).subtract("ms",1)},isAfter:function(a,b){return b="undefined"!=typeof b?b:"millisecond",+this.clone().startOf(b)>+cb(a).startOf(b)},isBefore:function(a,b){return b="undefined"!=typeof b?b:"millisecond",+this.clone().startOf(b)<+cb(a).startOf(b)},isSame:function(a,b){return b=b||"ms",+this.clone().startOf(b)===+y(a,this).startOf(b)},min:function(a){return a=cb.apply(null,arguments),this>a?this:a},max:function(a){return a=cb.apply(null,arguments),a>this?this:a},zone:function(a){var b=this._offset||0;return null==a?this._isUTC?b:this._d.getTimezoneOffset():("string"==typeof a&&(a=H(a)),Math.abs(a)<16&&(a=60*a),this._offset=a,this._isUTC=!0,b!==a&&j(this,cb.duration(b-a,"m"),1,!0),this)},zoneAbbr:function(){return this._isUTC?"UTC":""},zoneName:function(){return this._isUTC?"Coordinated Universal Time":""},parseZone:function(){return this._tzm?this.zone(this._tzm):"string"==typeof this._i&&this.zone(this._i),this},hasAlignedHourOffset:function(a){return a=a?cb(a).zone():0,(this.zone()-a)%60===0},daysInMonth:function(){return r(this.year(),this.month())},dayOfYear:function(a){var b=gb((cb(this).startOf("day")-cb(this).startOf("year"))/864e5)+1;return null==a?b:this.add("d",a-b)},quarter:function(){return Math.ceil((this.month()+1)/3)},weekYear:function(a){var b=X(this,this.lang()._week.dow,this.lang()._week.doy).year;return null==a?b:this.add("y",a-b)},isoWeekYear:function(a){var b=X(this,1,4).year;return null==a?b:this.add("y",a-b)},week:function(a){var b=this.lang().week(this);return null==a?b:this.add("d",7*(a-b))},isoWeek:function(a){var b=X(this,1,4).week;return null==a?b:this.add("d",7*(a-b))},weekday:function(a){var b=(this.day()+7-this.lang()._week.dow)%7;return null==a?b:this.add("d",a-b)},isoWeekday:function(a){return null==a?this.day()||7:this.day(this.day()%7?a:a-7)},get:function(a){return a=n(a),this[a]()},set:function(a,b){return a=n(a),"function"==typeof this[a]&&this[a](b),this},lang:function(b){return b===a?this._lang:(this._lang=B(b),this)}}),db=0;db<Ob.length;db++)$(Ob[db].toLowerCase().replace(/s$/,""),Ob[db]);$("year","FullYear"),cb.fn.days=cb.fn.day,cb.fn.months=cb.fn.month,cb.fn.weeks=cb.fn.week,cb.fn.isoWeeks=cb.fn.isoWeek,cb.fn.toJSON=cb.fn.toISOString,g(cb.duration.fn=f.prototype,{_bubble:function(){var a,b,c,d,e=this._milliseconds,f=this._days,g=this._months,i=this._data;i.milliseconds=e%1e3,a=h(e/1e3),i.seconds=a%60,b=h(a/60),i.minutes=b%60,c=h(b/60),i.hours=c%24,f+=h(c/24),i.days=f%30,g+=h(f/30),i.months=g%12,d=h(g/12),i.years=d},weeks:function(){return h(this.days()/7)},valueOf:function(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*q(this._months/12)},humanize:function(a){var b=+this,c=W(b,!a,this.lang());return a&&(c=this.lang().pastFuture(b,c)),this.lang().postformat(c)},add:function(a,b){var c=cb.duration(a,b);return this._milliseconds+=c._milliseconds,this._days+=c._days,this._months+=c._months,this._bubble(),this},subtract:function(a,b){var c=cb.duration(a,b);return this._milliseconds-=c._milliseconds,this._days-=c._days,this._months-=c._months,this._bubble(),this},get:function(a){return a=n(a),this[a.toLowerCase()+"s"]()},as:function(a){return a=n(a),this["as"+a.charAt(0).toUpperCase()+a.slice(1)+"s"]()},lang:cb.fn.lang,toIsoString:function(){var a=Math.abs(this.years()),b=Math.abs(this.months()),c=Math.abs(this.days()),d=Math.abs(this.hours()),e=Math.abs(this.minutes()),f=Math.abs(this.seconds()+this.milliseconds()/1e3);return this.asSeconds()?(this.asSeconds()<0?"-":"")+"P"+(a?a+"Y":"")+(b?b+"M":"")+(c?c+"D":"")+(d||e||f?"T":"")+(d?d+"H":"")+(e?e+"M":"")+(f?f+"S":""):"P0D"}});for(db in Pb)Pb.hasOwnProperty(db)&&(ab(db,Pb[db]),_(db.toLowerCase()));ab("Weeks",6048e5),cb.duration.fn.asMonths=function(){return(+this-31536e6*this.years())/2592e6+12*this.years()},cb.lang("en",{ordinal:function(a){var b=a%10,c=1===q(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),pb?(module.exports=cb,bb(!0)):"function"==typeof define&&define.amd?define("moment",function(b,c,d){return d.config&&d.config()&&d.config().noGlobal!==!0&&bb(d.config().noGlobal===a),cb}):bb()}).call(this);
\ No newline at end of file diff --git a/sonar-server/src/main/webapp/stylesheets/icons.css b/sonar-server/src/main/webapp/stylesheets/icons.css deleted file mode 100644 index 57af1831425..00000000000 --- a/sonar-server/src/main/webapp/stylesheets/icons.css +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Fonts - */ -/* - * Colors - */ -/* - * Icons - */ -/* - * Transitions - */ -@font-face { - font-family: 'sonar'; - src: url('../fonts/sonar.eot'); - src: url('../fonts/sonar.eot?#iefix') format('embedded-opentype'), url('../fonts/sonar.ttf') format('truetype'), url('../fonts/sonar.woff') format('woff'), url('../fonts/sonar.svg#sonar') format('svg'); - font-weight: normal; - font-style: normal; -} -[class^="icon-"], -[class*=" icon-"] { - font-family: 'sonar'; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - vertical-align: middle; - /* Better Font Rendering =========== */ - - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} -/* - * Severity - */ -.icon-severity-blocker:before { - content: "\f000"; - color: #d4333f; - font-size: 14px; -} -.icon-severity-critical:before { - content: "\f001"; - color: #d4333f; - font-size: 14px; -} -.icon-severity-major:before { - content: "\f002"; - color: #d4333f; - font-size: 14px; -} -.icon-severity-minor:before { - content: "\f003"; - color: #85bb43; - font-size: 14px; -} -.icon-severity-info:before { - content: "\f004"; - color: #85bb43; - font-size: 14px; -} -/* - * Status - */ -.icon-status-open:before { - content: "\f010"; - color: #85bb43; - font-size: 14px; -} -.icon-status-confirmed:before { - content: "\f011"; - color: #d4333f; - font-size: 14px; -} -.icon-status-reopened:before { - content: "\f012"; - color: #85bb43; - font-size: 14px; -} -.icon-status-resolved:before { - content: "\f013"; - color: #4b9fd5; - font-size: 14px; -} -.icon-status-closed:before { - content: "\f014"; - color: #444444; - font-size: 14px; -} -/* - * Resolution - */ -.icon-resolution-fixed:before { - content: "\f05d"; - color: #444444; - font-size: 14px; -} -.icon-resolution-false-positive:before { - content: "\f05c"; - color: #444444; - font-size: 14px; -} -.icon-resolution-removed:before { - content: "\f05e"; - color: #444444; - font-size: 14px; -} -/* - * Common - */ -.icon-list:before { - content: "\f039"; -} -.icon-settings:before { - content: "\f015"; -} -.icon-arrow-down:before { - content: "\f0d7"; -} -.icon-arrow-up:before { - content: "\f0d8"; -} -.icon-arrow-left:before { - content: "\f0d9"; -} -.icon-arrow-right:before { - content: "\f0da"; -} -.icon-emoticon-smiley:before { - content: "\f118"; -} -.icon-emoticon-sad:before { - content: "\f119"; -} -.icon-emoticon-speechless:before { - content: "\f11a"; -} diff --git a/sonar-server/src/main/webapp/stylesheets/icons.less b/sonar-server/src/main/webapp/stylesheets/icons.less deleted file mode 100644 index a703d029165..00000000000 --- a/sonar-server/src/main/webapp/stylesheets/icons.less +++ /dev/null @@ -1,145 +0,0 @@ -@import "variables"; - -@font-face { - font-family: 'sonar'; - src: url('../fonts/sonar.eot'); - src: url('../fonts/sonar.eot?#iefix') format('embedded-opentype'), - url('../fonts/sonar.ttf') format('truetype'), - url('../fonts/sonar.woff') format('woff'), - url('../fonts/sonar.svg#sonar') format('svg'); - font-weight: normal; - font-style: normal; -} - -[class^="icon-"], [class*=" icon-"] { - font-family: 'sonar'; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - vertical-align: middle; - - /* Better Font Rendering =========== */ - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - - -/* - * Severity - */ - -.icon-severity-blocker:before { - content: "\f000"; - color: @severityBlockerColor; - font-size: @iconFontSize; -} -.icon-severity-critical:before { - content: "\f001"; - color: @severityCriticalColor; - font-size: @iconFontSize; -} -.icon-severity-major:before { - content: "\f002"; - color: @severityMajorColor; - font-size: @iconFontSize; -} -.icon-severity-minor:before { - content: "\f003"; - color: @severityMinorColor; - font-size: @iconFontSize; -} -.icon-severity-info:before { - content: "\f004"; - color: @severityInfoColor; - font-size: @iconFontSize; -} - - -/* - * Status - */ - -.icon-status-open:before { - content: "\f010"; - color: @statusOpenColor; - font-size: @iconFontSize; -} -.icon-status-confirmed:before { - content: "\f011"; - color: @statusConfirmedColor; - font-size: @iconFontSize; -} -.icon-status-reopened:before { - content: "\f012"; - color: @statusReopenedColor; - font-size: @iconFontSize; -} -.icon-status-resolved:before { - content: "\f013"; - color: @statusResolvedColor; - font-size: @iconFontSize; -} -.icon-status-closed:before { - content: "\f014"; - color: @statusClosedColor; - font-size: @iconFontSize; -} - - -/* - * Resolution - */ - -.icon-resolution-fixed:before { - content: "\f05d"; - color: @resolutionFixedColor; - font-size: @iconFontSize; -} -.icon-resolution-false-positive:before { - content: "\f05c"; - color: @resolutionFalsePositiveColor; - font-size: @iconFontSize; -} -.icon-resolution-removed:before { - content: "\f05e"; - color: @resolutionRemovedColor; - font-size: @iconFontSize; -} - - -/* - * Common - */ - -.icon-list:before { - content: "\f039"; -} -.icon-settings:before { - content: "\f015"; -} - -.icon-arrow-down:before { - content: "\f0d7"; -} -.icon-arrow-up:before { - content: "\f0d8"; -} -.icon-arrow-left:before { - content: "\f0d9"; -} -.icon-arrow-right:before { - content: "\f0da"; -} - -.icon-emoticon-smiley:before { - content: "\f118"; -} -.icon-emoticon-sad:before { - content: "\f119"; -} -.icon-emoticon-speechless:before { - content: "\f11a"; -} diff --git a/sonar-server/src/main/webapp/stylesheets/jquery-ui.css b/sonar-server/src/main/webapp/stylesheets/jquery-ui.css index a1d7c97d7cb..1a907a2e5a3 100644 --- a/sonar-server/src/main/webapp/stylesheets/jquery-ui.css +++ b/sonar-server/src/main/webapp/stylesheets/jquery-ui.css @@ -16,6 +16,8 @@ } .ui-widget-header { + border: 1px solid #e78f08; + background: #f6a828 50% 50% repeat-x; color: #ffffff; font-weight: bold; } diff --git a/sonar-server/src/main/webapp/stylesheets/mixins.css b/sonar-server/src/main/webapp/stylesheets/mixins.css index 620cf3a6072..4b2b8a6e5df 100644 --- a/sonar-server/src/main/webapp/stylesheets/mixins.css +++ b/sonar-server/src/main/webapp/stylesheets/mixins.css @@ -5,8 +5,5 @@ * Colors */ /* - * Icons - */ -/* * Transitions */ diff --git a/sonar-server/src/main/webapp/stylesheets/navigator.css b/sonar-server/src/main/webapp/stylesheets/navigator.css index 1a737a6c958..f8329954c51 100644 --- a/sonar-server/src/main/webapp/stylesheets/navigator.css +++ b/sonar-server/src/main/webapp/stylesheets/navigator.css @@ -5,174 +5,12 @@ * Colors */ /* - * Icons - */ -/* * Transitions */ -.navigator-header { - position: fixed; - z-index: 2; - -moz-box-sizing: border-box; - box-sizing: border-box; - top: 30px; - left: 0; - width: 100%; - height: 34px; -} -.navigator-filters { - position: fixed; - z-index: 2; - -moz-box-sizing: border-box; - box-sizing: border-box; - top: 64px; - left: 0; - width: 100%; - height: 37px; -} -.navigator-results { - position: fixed; - z-index: 2; - -moz-box-sizing: border-box; - box-sizing: border-box; - top: 101px; - bottom: 30px; - left: 0; - width: 320px; -} -.navigator-details { - position: fixed; - z-index: 2; - -moz-box-sizing: border-box; - box-sizing: border-box; - top: 101px; - bottom: 0; - left: 320px; - right: 0; -} -.navigator-actions { - position: fixed; - z-index: 2; - -moz-box-sizing: border-box; - box-sizing: border-box; - bottom: 0; - left: 0; - width: 320px; - height: 30px; -} -.navigator-simple .navigator-filters { - top: 30px; -} -.navigator-simple .navigator-results { - top: 67px; - bottom: 0; - left: 0; - width: 100%; -} -.navigator-header { - padding: 0 10px; - border-bottom: 1px solid #cdcdcd; - background-color: #efefef; -} -.navigator-header-title { - font-size: 20px; - line-height: 34px; -} -.navigator-results { - border-right: 1px solid #e1e1e1; - background-color: #ffffff; - overflow-x: hidden; - overflow-y: auto; -} -.navigator-results-list > li { - padding-top: 10px; - cursor: pointer; -} -.navigator-results-list > li:first-child { - padding-top: 0; -} -.navigator-results-list > li:first-child:hover .line:first-child { - border-top-color: transparent; -} -.navigator-results-list > li .line { - padding: 5px 10px; - line-height: 1; - transition: all 0.3s ease; -} -.navigator-results-list > li .line:first-child { - border-top: 1px solid transparent; - background-color: #efefef; -} -.navigator-results-list > li .line:last-child { - border-bottom: 1px solid transparent; -} -.navigator-results-list > li .line-small { - font-size: 11px; - line-height: 14px; -} -.navigator-results-list > li .line-right { - float: right; -} -.navigator-results-list > li .line-nowrap { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} -.navigator-results-list > li:hover .line, -.navigator-results-list > li.active .line { - background-color: #efefef; -} -.navigator-results-list > li:hover .line:first-child, -.navigator-results-list > li.active .line:first-child { - border-top-color: #e1e1e1; -} -.navigator-results-list > li:hover .line:last-child, -.navigator-results-list > li.active .line:last-child { - border-bottom-color: #e1e1e1; -} -.navigator-results-no-issues { - padding-top: 20%; - color: #999; - text-align: center; -} -.navigator-results-no-issues i { - font-size: 32px; -} -.navigator-results-no-issues p { - margin-top: 10px; -} -.navigator-details { - padding: 10px; - background-color: #ffffff; - overflow: auto; -} -.navigator-details.loading { - background: #ffffff url("../images/loading.gif") no-repeat 4px 2px; -} -.navigator-actions { - padding: 0 10px; - line-height: 30px; - border-right: 1px solid #e1e1e1; - border-top: 1px solid #e1e1e1; - background-color: #ffffff; -} -.navigator-actions-order { - float: left; - cursor: pointer; -} -.navigator-actions-total { - float: right; -} -.navigator-actions-bulk { - position: relative; - top: -1px; - margin-left: 8px; - font-size: 16px; - cursor: pointer; -} .navigator-filters { + margin-bottom: 10px; border-bottom: 1px solid #cdcdcd; - background-color: #efefef; + background: #efefef; font-size: 0; } .navigator-filters-list { @@ -383,7 +221,7 @@ } .navigator-filter-favorite-toggle { width: 16px; - height: 37px; + height: 36px; background: url('../images/navigator/favorite-filters.png') no-repeat center center; } @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { @@ -395,3 +233,18 @@ .navigator-filter-more-criteria { font-size: 13px; } +.navigator-results .notes { + margin-top: -10px; + padding-left: 10px; + padding-right: 10px; + border-top: none; +} +.navigator-results #issues-list { + margin: 0 10px; +} +.navigator-results #issue-filters-operations { + padding-left: 10px; + padding-right: 10px; + -moz-box-sizing: border-box; + box-sizing: border-box; +} diff --git a/sonar-server/src/main/webapp/stylesheets/navigator.less b/sonar-server/src/main/webapp/stylesheets/navigator.less index ab9401b0478..893bb84b794 100644 --- a/sonar-server/src/main/webapp/stylesheets/navigator.less +++ b/sonar-server/src/main/webapp/stylesheets/navigator.less @@ -1,6 +1,284 @@ @import "mixins"; @import "variables"; -@import "navigator/config"; -@import "navigator/base"; -@import "navigator/filters"; +@navigatorHeight: 36px; +@navigatorHover: darken(@grey, 5%); +@navigatorFilterPadding: 10px; + +.navigator { + +} + +.navigator-filters { + margin-bottom: 10px; + border-bottom: 1px solid @darkGrey; + background: @grey; + font-size: 0; +} + +.navigator-filters-list { + display: inline-block; + vertical-align: middle; + margin-bottom: -1px; + font-size: 0; +} + +.navigator-filter-submit, +.navigator-filter-new-search { + vertical-align: middle; + margin-left: 15px; + font-size: @baseFontSize; +} + +.navigator-filter-list-favorite { + position: relative; + padding-left: 36px; + overflow: hidden; +} + +.navigator-filters-actions { + display: inline-block; + vertical-align: middle; + margin-left: 20px; + font-size: @baseFontSize; +} + +.navigator-filter { + display: inline-block; + vertical-align: top; + height: @navigatorHeight; + line-height: @navigatorHeight; + margin: -1px 0 0; + padding: 0 @navigatorFilterPadding; + border: 1px solid transparent; + white-space: nowrap; + cursor: pointer; + transition: background 0.3s ease; + + &:hover { + background-color: @navigatorHover; + } + + &.active { + border-color: @darkGrey; + background: #fff; + } +} + +.navigator-filter-disabled { + display: none; +} + +.navigator-filter-optional { + padding-right: 0; +} + +.navigator-filter-inline { + cursor: default; + + &:hover, + &.active { + border-color: transparent; + background: transparent; + } + + .navigator-filter-label:after { + content: ""; + } +} + +.navigator-filter-label { + display: inline-block; + vertical-align: middle; + margin-right: 5px; + color: #333; + font-size: @baseFontSize; + + &:after { content: ":"; } +} + +.navigator-filter-value { + display: inline-block; + vertical-align: middle; + max-width: 120px; + color: #333; + font-size: @baseFontSize; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + + &.default { + color: #666; + } +} + +.navigator-filter-disable { + display: inline-block; + vertical-align: middle; + .square(20px); + line-height: 20px; + margin: 0 0 0 5px; + font-size: 18px; + text-align: center; + transition: background 0.3s ease; + + &:hover { + background-color: darken(@navigatorHover, 7%); + } +} + +.navigator-filter-range-input { + width: 120px; +} + +.navigator-filter-details { + display: none; + position: absolute; + z-index: 1200; + min-width: 100px; + border: 1px solid @darkGrey; + background: #fff; + box-shadow: 10px 10px 20px rgba(0, 0, 0, 0.5); + font-size: @baseFontSize; + transition: opacity 0.3s ease; + + &.active { + display: block; + } +} + +.navigator-filter-details-inner { + max-width: 300px; + padding: 5px @navigatorFilterPadding; + + .select2-container, + input { + margin: 5px 0; + } +} + +.navigator-filter-select-list { + min-width: 150px; + max-width: 300px; + max-height: 182px; + padding: 5px 0; + overflow-y: auto; + + label { + display: block; + padding: 5px @navigatorFilterPadding; + transition: background 0.3s ease; + cursor: pointer; + white-space: nowrap; + overflow: hidden; + + &:hover, + &.current { + background-color: darken(#fff, 7%); + } + + & > input[type=checkbox] { + vertical-align: baseline; + cursor: pointer; + } + + & > img { + vertical-align: text-bottom; + } + + & > span { + display: inline-block; + vertical-align: top; + width: 86%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + } + + .single { + padding: 5px @navigatorFilterPadding; + } + + .line { + height: 1px; + margin: 5px 0; + background: @darkGrey; + } +} + +.navigator-filter-select-list:not(.hidden) + .navigator-filter-select-list { + margin-top: 5px; + border-top: 1px solid @darkGrey; +} + +.navigator-filter-search { + position: relative; + margin: @navigatorFilterPadding 26px @navigatorFilterPadding @navigatorFilterPadding; + + input { + .size(100%, 26px); + padding: 0 7px; + border: 1px solid @darkGrey; + .box-sizing(border-box); + } + + .fetching &:after { + content: ' '; + position: absolute; + top: 6px; right: -21px; + display: block; + .square(16px); + background: #fff url(../images/loading.gif) no-repeat center center; + } +} + +.navigator-filter-load-more { + display: none; + height: 26px; + line-height: 26px; + background-color: @grey; + text-align: center; + cursor: pointer; + transition: background 0.3s ease; + + &:hover { + background-color: darken(@grey, 7%); + } +} + +.navigator-filter-favorite { + position: absolute; + top: 0; left: 0; +} + +.navigator-filter-favorite-toggle { + .size(16px, @navigatorHeight); + background: url('../images/navigator/favorite-filters.png') no-repeat center center; + + @media @retina { + background-image: url(../images/navigator/favorite-filters@2x.png); + background-size: 16px 14px; + } +} + +.navigator-filter-more-criteria { + font-size: @baseFontSize; +} + +.navigator-results { + .notes { + margin-top: -10px; + padding-left: 10px; + padding-right: 10px; + border-top: none; + } + #issues-list { + margin: 0 10px; + } + #issue-filters-operations { + padding-left: 10px; + padding-right: 10px; + .box-sizing(border-box); + } +} diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/base.css b/sonar-server/src/main/webapp/stylesheets/navigator/base.css deleted file mode 100644 index d6b2885d02a..00000000000 --- a/sonar-server/src/main/webapp/stylesheets/navigator/base.css +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Fonts - */ -/* - * Colors - */ -/* - * Icons - */ -/* - * Transitions - */ -.navigator-header { - position: fixed; - z-index: 2; - -moz-box-sizing: border-box; - box-sizing: border-box; - top: 30px; - left: 0; - width: 100%; - height: 34px; -} -.navigator-filters { - position: fixed; - z-index: 2; - -moz-box-sizing: border-box; - box-sizing: border-box; - top: 64px; - left: 0; - width: 100%; - height: 37px; -} -.navigator-results { - position: fixed; - z-index: 2; - -moz-box-sizing: border-box; - box-sizing: border-box; - top: 101px; - bottom: 30px; - left: 0; - width: 320px; -} -.navigator-details { - position: fixed; - z-index: 2; - -moz-box-sizing: border-box; - box-sizing: border-box; - top: 101px; - bottom: 0; - left: 320px; - right: 0; -} -.navigator-actions { - position: fixed; - z-index: 2; - -moz-box-sizing: border-box; - box-sizing: border-box; - bottom: 0; - left: 0; - width: 320px; - height: 30px; -} -.navigator-simple .navigator-filters { - top: 30px; -} -.navigator-simple .navigator-results { - top: 67px; - bottom: 0; - left: 0; - width: 100%; -} -.navigator-header { - padding: 0 10px; - border-bottom: 1px solid #cdcdcd; - background-color: #efefef; -} -.navigator-header-title { - font-size: 20px; - line-height: 34px; -} -.navigator-results { - border-right: 1px solid #e1e1e1; - background-color: #ffffff; - overflow-x: hidden; - overflow-y: auto; -} -.navigator-results-list > li { - padding-top: 10px; - cursor: pointer; -} -.navigator-results-list > li:first-child { - padding-top: 0; -} -.navigator-results-list > li:first-child:hover .line:first-child { - border-top-color: transparent; -} -.navigator-results-list > li .line { - padding: 5px 10px; - line-height: 1; - transition: all 0.3s ease; -} -.navigator-results-list > li .line:first-child { - border-top: 1px solid transparent; - background-color: #efefef; -} -.navigator-results-list > li .line:last-child { - border-bottom: 1px solid transparent; -} -.navigator-results-list > li .line-small { - font-size: 11px; - line-height: 14px; -} -.navigator-results-list > li .line-right { - float: right; -} -.navigator-results-list > li .line-nowrap { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} -.navigator-results-list > li:hover .line, -.navigator-results-list > li.active .line { - background-color: #efefef; -} -.navigator-results-list > li:hover .line:first-child, -.navigator-results-list > li.active .line:first-child { - border-top-color: #e1e1e1; -} -.navigator-results-list > li:hover .line:last-child, -.navigator-results-list > li.active .line:last-child { - border-bottom-color: #e1e1e1; -} -.navigator-results-no-issues { - padding-top: 20%; - color: #999; - text-align: center; -} -.navigator-results-no-issues i { - font-size: 32px; -} -.navigator-results-no-issues p { - margin-top: 10px; -} -.navigator-details { - padding: 10px; - background-color: #ffffff; - overflow: auto; -} -.navigator-details.loading { - background: #ffffff url("../images/loading.gif") no-repeat 4px 2px; -} -.navigator-actions { - padding: 0 10px; - line-height: 30px; - border-right: 1px solid #e1e1e1; - border-top: 1px solid #e1e1e1; - background-color: #ffffff; -} -.navigator-actions-order { - float: left; - cursor: pointer; -} -.navigator-actions-total { - float: right; -} -.navigator-actions-bulk { - position: relative; - top: -1px; - margin-left: 8px; - font-size: 16px; - cursor: pointer; -} diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/base.less b/sonar-server/src/main/webapp/stylesheets/navigator/base.less deleted file mode 100644 index 449b2dc4d00..00000000000 --- a/sonar-server/src/main/webapp/stylesheets/navigator/base.less +++ /dev/null @@ -1,208 +0,0 @@ -@import "../variables"; -@import "../mixins"; - -@import "config"; - - -.navigator { } - - -.navigator-element() { - position: fixed; - z-index: 2; - .box-sizing(border-box); -} - -.navigator-header { - .navigator-element; - top: @navigatorTopOffset; - left: 0; - .size(100%, @navigatorHeaderHeight); -} - -.navigator-filters { - .navigator-element; - top: @navigatorTopOffset + @navigatorHeaderHeight; - left: 0; - .size(100%, @navigatorFiltersHeight); -} - -.navigator-results { - .navigator-element; - top: @navigatorTopOffset + @navigatorHeaderHeight + @navigatorFiltersHeight; - bottom: @navigatorStatusHeight; - left: 0; - width: @navigatorResultsWidth; -} - -.navigator-details { - .navigator-element; - top: @navigatorTopOffset + @navigatorHeaderHeight + @navigatorFiltersHeight; - bottom: 0; - left: @navigatorResultsWidth; - right: 0; -} - -.navigator-actions { - .navigator-element; - bottom: 0; - left: 0; - .size(@navigatorResultsWidth, @navigatorStatusHeight); -} - - -.navigator-simple { - .navigator-filters { - top: @navigatorTopOffset; - } - - .navigator-results { - top: @navigatorTopOffset + @navigatorFiltersHeight; - bottom: 0; - left: 0; - width: 100%; - } -} - - - -// Header -.navigator-header { - padding: 0 @navigatorPadding; - border-bottom: 1px solid @navigatorBorderColor; - background-color: @navigatorBarBackground; -} - -.navigator-header-title { - font-size: 20px; - line-height: @navigatorHeaderHeight; -} - - - -// Results -.navigator-results { - border-right: 1px solid @navigatorBorderLightColor; - background-color: @white; - overflow-x: hidden; - overflow-y: auto; -} - -.navigator-results-list { - - - & > li { - padding-top: @navigatorPadding; - cursor: pointer; - - &:first-child { - padding-top: 0; - - &:hover .line:first-child { - border-top-color: transparent; - } - } - - .line { - padding: @navigatorPadding / 2 @navigatorPadding; - line-height: 1; - .trans; - - &:first-child { - border-top: 1px solid transparent; - background-color: @navigatorBarBackground; - } - - &:last-child { - border-bottom: 1px solid transparent; - } - } - - .line-small { - font-size: 11px; - line-height: 14px; - } - - .line-right { - float: right; - } - - .line-nowrap { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - - &:hover, - &.active { - .line { - background-color: @navigatorBarBackground; - - &:first-child { - border-top-color: @navigatorBorderLightColor; - } - - &:last-child { - border-bottom-color: @navigatorBorderLightColor; - } - } - } - - } - -} - -.navigator-results-no-issues { - padding-top: 20%; - color: #999; - text-align: center; - - i { - font-size: 32px; - } - - p { - margin-top: 10px; - } -} - - - -// Details -.navigator-details { - padding: @navigatorPadding; - background-color: @white; - overflow: auto; - - &.loading { - background: @white url("../images/loading.gif") no-repeat 4px 2px; - } -} - - - -// Status -.navigator-actions { - padding: 0 @navigatorPadding; - line-height: @navigatorStatusHeight; - border-right: 1px solid @navigatorBorderLightColor; - border-top: 1px solid @navigatorBorderLightColor; - background-color: @white; -} - -.navigator-actions-order { - float: left; - cursor: pointer; -} - -.navigator-actions-total { - float: right; -} - -.navigator-actions-bulk { - position: relative; - top: -1px; - margin-left: 8px; - font-size: 16px; - cursor: pointer; -} diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/config.css b/sonar-server/src/main/webapp/stylesheets/navigator/config.css deleted file mode 100644 index 620cf3a6072..00000000000 --- a/sonar-server/src/main/webapp/stylesheets/navigator/config.css +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Fonts - */ -/* - * Colors - */ -/* - * Icons - */ -/* - * Transitions - */ diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/config.less b/sonar-server/src/main/webapp/stylesheets/navigator/config.less deleted file mode 100644 index 656d3b06dfe..00000000000 --- a/sonar-server/src/main/webapp/stylesheets/navigator/config.less +++ /dev/null @@ -1,22 +0,0 @@ -@import "../variables"; - -// Layout -@navigatorTopOffset: 30px; - -@navigatorHeaderHeight: 34px; -@navigatorFiltersHeight: 37px; -@navigatorStatusHeight: 30px; - -@navigatorResultsWidth: 320px; - -@navigatorPadding: 10px; - - -// Colors -@navigatorBarBackground: @grey; -@navigatorBorderColor: @darkGrey; -@navigatorBorderLightColor: lighten(@darkGrey, 8%); - - -@navigatorHover: darken(@grey, 5%); -@navigatorFilterPadding: @navigatorPadding; diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/filters.css b/sonar-server/src/main/webapp/stylesheets/navigator/filters.css deleted file mode 100644 index dedecbb8468..00000000000 --- a/sonar-server/src/main/webapp/stylesheets/navigator/filters.css +++ /dev/null @@ -1,238 +0,0 @@ -/* - * Fonts - */ -/* - * Colors - */ -/* - * Icons - */ -/* - * Transitions - */ -.navigator-filters { - border-bottom: 1px solid #cdcdcd; - background-color: #efefef; - font-size: 0; -} -.navigator-filters-list { - display: inline-block; - vertical-align: middle; - margin-bottom: -1px; - font-size: 0; -} -.navigator-filter-submit, -.navigator-filter-new-search { - vertical-align: middle; - margin-left: 15px; - font-size: 13px; -} -.navigator-filter-list-favorite { - position: relative; - padding-left: 36px; - overflow: hidden; -} -.navigator-filters-actions { - display: inline-block; - vertical-align: middle; - margin-left: 20px; - font-size: 13px; -} -.navigator-filter { - display: inline-block; - vertical-align: top; - height: 36px; - line-height: 36px; - margin: -1px 0 0; - padding: 0 10px; - border: 1px solid transparent; - white-space: nowrap; - cursor: pointer; - transition: background 0.3s ease; -} -.navigator-filter:hover { - background-color: #e2e2e2; -} -.navigator-filter.active { - border-color: #cdcdcd; - background: #fff; -} -.navigator-filter-disabled { - display: none; -} -.navigator-filter-optional { - padding-right: 0; -} -.navigator-filter-inline { - cursor: default; -} -.navigator-filter-inline:hover, -.navigator-filter-inline.active { - border-color: transparent; - background: transparent; -} -.navigator-filter-inline .navigator-filter-label:after { - content: ""; -} -.navigator-filter-label { - display: inline-block; - vertical-align: middle; - margin-right: 5px; - color: #333; - font-size: 13px; -} -.navigator-filter-label:after { - content: ":"; -} -.navigator-filter-value { - display: inline-block; - vertical-align: middle; - max-width: 120px; - color: #333; - font-size: 13px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} -.navigator-filter-value.default { - color: #666; -} -.navigator-filter-disable { - display: inline-block; - vertical-align: middle; - width: 20px; - height: 20px; - line-height: 20px; - margin: 0 0 0 5px; - font-size: 18px; - text-align: center; - transition: background 0.3s ease; -} -.navigator-filter-disable:hover { - background-color: #d0d0d0; -} -.navigator-filter-range-input { - width: 120px; -} -.navigator-filter-details { - display: none; - position: absolute; - z-index: 1200; - min-width: 100px; - border: 1px solid #cdcdcd; - background: #fff; - box-shadow: 10px 10px 20px rgba(0, 0, 0, 0.5); - font-size: 13px; - transition: opacity 0.3s ease; -} -.navigator-filter-details.active { - display: block; -} -.navigator-filter-details-inner { - max-width: 300px; - padding: 5px 10px; -} -.navigator-filter-details-inner .select2-container, -.navigator-filter-details-inner input { - margin: 5px 0; -} -.navigator-filter-select-list { - min-width: 150px; - max-width: 300px; - max-height: 182px; - padding: 5px 0; - overflow-y: auto; -} -.navigator-filter-select-list label { - display: block; - padding: 5px 10px; - transition: background 0.3s ease; - cursor: pointer; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} -.navigator-filter-select-list label:hover, -.navigator-filter-select-list label.current { - background-color: #ededed; -} -.navigator-filter-select-list label > input[type=checkbox] { - vertical-align: baseline; - cursor: pointer; -} -.navigator-filter-select-list label > img { - vertical-align: text-bottom; -} -.navigator-filter-select-list label > span { - display: inline-block; - vertical-align: top; - width: 86%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} -.navigator-filter-select-list .single { - padding: 5px 10px; -} -.navigator-filter-select-list .line { - height: 1px; - margin: 5px 0; - background: #cdcdcd; -} -.navigator-filter-select-list:not(.hidden) + .navigator-filter-select-list { - margin-top: 5px; - border-top: 1px solid #cdcdcd; -} -.navigator-filter-search { - position: relative; - margin: 10px 26px 10px 10px; -} -.navigator-filter-search input { - width: 100%; - height: 26px; - padding: 0 7px; - border: 1px solid #cdcdcd; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.fetching .navigator-filter-search:after { - content: ' '; - position: absolute; - top: 6px; - right: -21px; - display: block; - width: 16px; - height: 16px; - background: #ffffff url(../images/loading.gif) no-repeat center center; -} -.navigator-filter-load-more { - display: none; - height: 26px; - line-height: 26px; - background-color: #efefef; - text-align: center; - cursor: pointer; - transition: background 0.3s ease; -} -.navigator-filter-load-more:hover { - background-color: #dddddd; -} -.navigator-filter-favorite { - position: absolute; - top: 0; - left: 0; -} -.navigator-filter-favorite-toggle { - width: 16px; - height: 37px; - background: url('../images/navigator/favorite-filters.png') no-repeat center center; -} -@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { - .navigator-filter-favorite-toggle { - background-image: url(../images/navigator/favorite-filters@2x.png); - background-size: 16px 14px; - } -} -.navigator-filter-more-criteria { - font-size: 13px; -} diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/filters.less b/sonar-server/src/main/webapp/stylesheets/navigator/filters.less deleted file mode 100644 index 0f8399c880f..00000000000 --- a/sonar-server/src/main/webapp/stylesheets/navigator/filters.less +++ /dev/null @@ -1,262 +0,0 @@ -@import "../variables"; -@import "../mixins"; - -@import "config"; - - -.navigator-filters { - border-bottom: 1px solid @darkGrey; - background-color: @navigatorBarBackground; - font-size: 0; -} - -.navigator-filters-list { - display: inline-block; - vertical-align: middle; - margin-bottom: -1px; - font-size: 0; -} - -.navigator-filter-submit, -.navigator-filter-new-search { - vertical-align: middle; - margin-left: 15px; - font-size: @baseFontSize; -} - -.navigator-filter-list-favorite { - position: relative; - padding-left: 36px; - overflow: hidden; -} - -.navigator-filters-actions { - display: inline-block; - vertical-align: middle; - margin-left: 20px; - font-size: @baseFontSize; -} - -.navigator-filter { - display: inline-block; - vertical-align: top; - height: @navigatorFiltersHeight - 1px; - line-height: @navigatorFiltersHeight - 1px; - margin: -1px 0 0; - padding: 0 @navigatorFilterPadding; - border: 1px solid transparent; - white-space: nowrap; - cursor: pointer; - transition: background 0.3s ease; - - &:hover { - background-color: @navigatorHover; - } - - &.active { - border-color: @darkGrey; - background: #fff; - } -} - -.navigator-filter-disabled { - display: none; -} - -.navigator-filter-optional { - padding-right: 0; -} - -.navigator-filter-inline { - cursor: default; - - &:hover, - &.active { - border-color: transparent; - background: transparent; - } - - .navigator-filter-label:after { - content: ""; - } -} - -.navigator-filter-label { - display: inline-block; - vertical-align: middle; - margin-right: 5px; - color: #333; - font-size: @baseFontSize; - - &:after { content: ":"; } -} - -.navigator-filter-value { - display: inline-block; - vertical-align: middle; - max-width: 120px; - color: #333; - font-size: @baseFontSize; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - - &.default { - color: #666; - } -} - -.navigator-filter-disable { - display: inline-block; - vertical-align: middle; - .square(20px); - line-height: 20px; - margin: 0 0 0 5px; - font-size: 18px; - text-align: center; - transition: background 0.3s ease; - - &:hover { - background-color: darken(@navigatorHover, 7%); - } -} - -.navigator-filter-range-input { - width: 120px; -} - -.navigator-filter-details { - display: none; - position: absolute; - z-index: 1200; - min-width: 100px; - border: 1px solid @darkGrey; - background: #fff; - box-shadow: 10px 10px 20px rgba(0, 0, 0, 0.5); - font-size: @baseFontSize; - transition: opacity 0.3s ease; - - &.active { - display: block; - } -} - -.navigator-filter-details-inner { - max-width: 300px; - padding: 5px @navigatorFilterPadding; - - .select2-container, - input { - margin: 5px 0; - } -} - -.navigator-filter-select-list { - min-width: 150px; - max-width: 300px; - max-height: 182px; - padding: 5px 0; - overflow-y: auto; - - label { - display: block; - padding: 5px @navigatorFilterPadding; - transition: background 0.3s ease; - cursor: pointer; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - - &:hover, - &.current { - background-color: darken(#fff, 7%); - } - - & > input[type=checkbox] { - vertical-align: baseline; - cursor: pointer; - } - - & > img { - vertical-align: text-bottom; - } - - & > span { - display: inline-block; - vertical-align: top; - width: 86%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - } - - .single { - padding: 5px @navigatorFilterPadding; - } - - .line { - height: 1px; - margin: 5px 0; - background: @darkGrey; - } -} - -.navigator-filter-select-list:not(.hidden) + .navigator-filter-select-list { - margin-top: 5px; - border-top: 1px solid @darkGrey; -} - -.navigator-filter-search { - position: relative; - margin: @navigatorFilterPadding 26px @navigatorFilterPadding @navigatorFilterPadding; - - input { - .size(100%, 26px); - padding: 0 7px; - border: 1px solid @darkGrey; - .box-sizing(border-box); - } - - .fetching &:after { - content: ' '; - position: absolute; - top: 6px; right: -21px; - display: block; - .square(16px); - background: #fff url(../images/loading.gif) no-repeat center center; - } -} - -.navigator-filter-load-more { - display: none; - height: 26px; - line-height: 26px; - background-color: @grey; - text-align: center; - cursor: pointer; - transition: background 0.3s ease; - - &:hover { - background-color: darken(@grey, 7%); - } -} - -.navigator-filter-favorite { - position: absolute; - top: 0; left: 0; -} - -.navigator-filter-favorite-toggle { - .size(16px, @navigatorFiltersHeight); - background: url('../images/navigator/favorite-filters.png') no-repeat center center; - - @media @retina { - background-image: url(../images/navigator/favorite-filters@2x.png); - background-size: 16px 14px; - } -} - -.navigator-filter-more-criteria { - font-size: @baseFontSize; -} diff --git a/sonar-server/src/main/webapp/stylesheets/select2-sonar.css b/sonar-server/src/main/webapp/stylesheets/select2-sonar.css index 07019a04423..165f820a045 100644 --- a/sonar-server/src/main/webapp/stylesheets/select2-sonar.css +++ b/sonar-server/src/main/webapp/stylesheets/select2-sonar.css @@ -5,9 +5,6 @@ * Colors */ /* - * Icons - */ -/* * Transitions */ .select2-container { diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css index b488e68897e..56d0905f47f 100644 --- a/sonar-server/src/main/webapp/stylesheets/style.css +++ b/sonar-server/src/main/webapp/stylesheets/style.css @@ -807,19 +807,11 @@ th.operations, td.operations { border: 1px solid #DDD; } -.code-issue-msg { - line-height: 1.5; - padding: 5px 10px; - border-left: 1px solid #DDD; - border-right: 1px solid #DDD; - background-color: #EFEFEF; -} - .code-issue-name img { vertical-align: text-bottom; } -.code-issue-comment, .code-issue-actions, .code-issue-form, .issue-rule, .issue-changelog, .issue-technicaldebt { +.code-issue-comment, .code-issue-msg, .code-issue-actions, .code-issue-form, .issue-rule, .issue-changelog, .issue-technicaldebt { background-color: #EFEFEF; border: 1px solid #DDD; border-top: none; @@ -848,61 +840,6 @@ th.operations, td.operations { font-size: 12px; } -.code-issue-details { - padding: 5px 0; - border-left: 1px solid #DDD; - border-right: 1px solid #DDD; - border-bottom: 1px solid #DDD; - background-color: #EFEFEF; -} - -.code-issue-details .ui-tabs-panel { - padding: 5px 10px 0; - line-height: 1.3; -} - -.code-issue-details .tabs { - height: auto; - padding: 0 5px; - border-top: 1px solid #DDD; - border-bottom: none; - background: #E4ECF3; -} - -.code-issue-details .tabs li a:link, -.code-issue-details .tabs li a:visited { - padding: 5px; -} - -.code-issue-details-list { - -} - -.code-issue-details-list > li { - font-size: 0; -} - -.code-issue-details-term, -.code-issue-details-value { - display: inline-block; - vertical-align: top; - font-size: 12px; - line-height: 20px; -} - -.code-issue-details-term { - width: 90px; -} - -.code-issue-details-term:after { - content: ":"; -} - -.code-issue-collapsed .code-issue-msg, -.code-issue-collapsed .code-issue-details { - display: none; -} - .tab_header { border-bottom: 1px solid #DDD; background-color: #EFEFEF; @@ -1665,10 +1602,6 @@ ul.bullet li { padding: 0; } -.tabs li a { - outline: none; -} - .tabs2 li a:link, .tabs2 li a:visited, .tabs li a:link, .tabs li a:visited { float: left; color: #777; @@ -1678,9 +1611,9 @@ ul.bullet li { padding: 1px 5px; } -.tabs2 li a.selected:link, .tabs2 li a.selected:visited, .tabs li a.selected:link, .tabs li a.selected:visited, .tabs .ui-tabs-active a { +.tabs2 li a.selected:link, .tabs2 li a.selected:visited, .tabs li a.selected:link, .tabs li a.selected:visited { text-decoration: none; - color: #555 !important; + color: #555; font-weight: bold; margin: 0 1px 0 0; } diff --git a/sonar-server/src/main/webapp/stylesheets/ui.css b/sonar-server/src/main/webapp/stylesheets/ui.css index 8581c07bfd5..5b96d257e1c 100644 --- a/sonar-server/src/main/webapp/stylesheets/ui.css +++ b/sonar-server/src/main/webapp/stylesheets/ui.css @@ -5,9 +5,6 @@ * Colors */ /* - * Icons - */ -/* * Transitions */ input[type=text], diff --git a/sonar-server/src/main/webapp/stylesheets/variables.css b/sonar-server/src/main/webapp/stylesheets/variables.css index 620cf3a6072..4b2b8a6e5df 100644 --- a/sonar-server/src/main/webapp/stylesheets/variables.css +++ b/sonar-server/src/main/webapp/stylesheets/variables.css @@ -5,8 +5,5 @@ * Colors */ /* - * Icons - */ -/* * Transitions */ diff --git a/sonar-server/src/main/webapp/stylesheets/variables.less b/sonar-server/src/main/webapp/stylesheets/variables.less index b57b91b5fbd..c9aca6c5d94 100644 --- a/sonar-server/src/main/webapp/stylesheets/variables.less +++ b/sonar-server/src/main/webapp/stylesheets/variables.less @@ -15,41 +15,13 @@ @white: #ffffff; @grey: #efefef; @darkGrey: #cdcdcd; - @blue: #4b9fd5; -@red: #d4333f; -@green: #85bb43; -@yellow: #fede06; @highlighted: @blue; /* - * Icons - */ - -@iconFontSize: 14px; - -@severityBlockerColor: @red; -@severityCriticalColor: @red; -@severityMajorColor: @red; -@severityMinorColor: @green; -@severityInfoColor: @green; - -@statusOpenColor: @green; -@statusConfirmedColor: @red; -@statusReopenedColor: @green; -@statusResolvedColor: @blue; -@statusClosedColor: @baseFontColor; - -@resolutionFixedColor: @baseFontColor; -@resolutionFalsePositiveColor: @baseFontColor; -@resolutionRemovedColor: @baseFontColor; - - - -/* * Transitions */ |
