Selaa lähdekoodia

HUE-9290 [frontend] Properly close certain html tags

This takes care of a recent issue where knockout is complaining about missing end tags.
Johan Ahlen 5 vuotta sitten
vanhempi
commit
d70fbcc72f
25 muutettua tiedostoa jossa 86 lisäystä ja 86 poistoa
  1. 10 10
      apps/jobbrowser/src/jobbrowser/templates/job_browser.mako
  2. 2 2
      apps/metastore/src/metastore/templates/components.mako
  3. 5 5
      apps/oozie/src/oozie/templates/editor/action_utils.mako
  4. 3 3
      apps/oozie/src/oozie/templates/editor/control_utils.mako
  5. 1 1
      apps/oozie/src/oozie/templates/editor/coordinator_properties.mako
  6. 1 1
      apps/oozie/src/oozie/templates/editor/edit_bundle.mako
  7. 1 1
      apps/oozie/src/oozie/templates/editor/edit_coordinator.mako
  8. 1 1
      apps/oozie/src/oozie/templates/editor/job_action_properties.mako
  9. 1 1
      apps/oozie/src/oozie/templates/editor/list_bundles.mako
  10. 1 1
      apps/oozie/src/oozie/templates/editor/list_coordinators.mako
  11. 1 1
      apps/oozie/src/oozie/templates/editor/workflow_utils.mako
  12. 16 16
      apps/oozie/src/oozie/templates/editor2/common_workflow.mako
  13. 1 1
      apps/pig/src/pig/templates/app.mako
  14. 2 2
      apps/sqoop/src/sqoop/templates/app.mako
  15. 7 7
      desktop/core/src/desktop/js/apps/notebook2/components/resultChart/ko.resultChart.js
  16. 1 1
      desktop/core/src/desktop/js/ext/fileuploader.custom.js
  17. 1 1
      desktop/core/src/desktop/js/ko/bindings/ko.autogrowInput.js
  18. 1 1
      desktop/core/src/desktop/js/ko/components/ko.executionAnalysis.js
  19. 1 1
      desktop/core/src/desktop/js/ko/components/ko.pollingCatalogEntriesList.js
  20. 1 1
      desktop/core/src/desktop/static/desktop/js/freshereditor.js
  21. 1 1
      desktop/core/src/desktop/static/desktop/js/jquery.scrollleft.js
  22. 1 1
      desktop/core/src/desktop/static/desktop/js/jquery.scrollup.js
  23. 2 2
      desktop/core/src/desktop/templates/common_dashboard.mako
  24. 22 22
      desktop/libs/dashboard/src/dashboard/templates/common_search.mako
  25. 2 2
      desktop/libs/notebook/src/notebook/templates/editor_components2.mako

+ 10 - 10
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -1709,7 +1709,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
           <div data-bind="visible:properties.plan && properties.plan().plan_json && properties.plan().plan_json.plan_nodes.length">
             <div class="query-plan" id="queries-page-plan-graph${ SUFFIX }" data-bind="impalaDagre: { value: properties.plan && properties.plan(), height:$root.isMini() ? 535 : 600 }">
               <svg style="width:100%;height:100%;position:relative;" id="queries-page-plan-svg${ SUFFIX }">
-                <g/>
+                <g></g>
               </svg>
             </div>
           </div>
@@ -1726,10 +1726,10 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
           <!-- /ko -->
         </div>
         <div class="tab-pane" id="queries-page-plan-text${ SUFFIX }" data-profile="plan">
-          <pre data-bind="text: (properties.plan && properties.plan().plan) || _('The selected tab has no data')"/>
+          <pre data-bind="text: (properties.plan && properties.plan().plan) || _('The selected tab has no data')"></pre>
         </div>
         <div class="tab-pane" id="queries-page-summary${ SUFFIX }" data-profile="plan">
-          <pre data-bind="text: (properties.plan && properties.plan().summary) || _('The selected tab has no data')"/>
+          <pre data-bind="text: (properties.plan && properties.plan().summary) || _('The selected tab has no data')"></pre>
         </div>
         <div class="tab-pane" id="queries-page-profile${ SUFFIX }" data-profile="profile">
           <button class="btn" type="button" data-clipboard-target="#query-impala-profile" style="float: right;" data-bind="
@@ -1744,10 +1744,10 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
           </button>
           <div id="downloadProgressModal"></div>
           <pre id="query-impala-profile" style="float: left; margin-top: 8px" data-bind="
-              text: (properties.profile && properties.profile().profile) || _('The selected tab has no data')"/>
+              text: (properties.profile && properties.profile().profile) || _('The selected tab has no data')"></pre>
         </div>
         <div class="tab-pane" id="queries-page-memory${ SUFFIX }" data-profile="mem_usage">
-          <pre data-bind="text: (properties.memory && properties.memory().mem_usage) || _('The selected tab has no data')"/>
+          <pre data-bind="text: (properties.memory && properties.memory().mem_usage) || _('The selected tab has no data')"></pre>
         </div>
         <div class="tab-pane" id="queries-page-backends${ SUFFIX }" data-profile="backends">
           <!-- ko if: properties.backends && properties.backends().backend_states -->
@@ -1771,7 +1771,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
           </div>
           <!-- /ko -->
           <!-- ko if: !properties.backends || !properties.backends().backend_states -->
-          <pre data-bind="text: _('The selected tab has no data')"/>
+          <pre data-bind="text: _('The selected tab has no data')"></pre>
           <!-- /ko -->
         </div>
         <div class="tab-pane" id="queries-page-finstances${ SUFFIX }" data-profile="finstances">
@@ -1796,20 +1796,20 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
           </div>
           <!-- /ko -->
           <!-- ko if: !properties.finstances || !properties.finstances().backend_instances -->
-          <pre data-bind="text: _('The selected tab has no data')"/>
+          <pre data-bind="text: _('The selected tab has no data')"></pre>
           <!-- /ko -->
         </div>
         <!-- /ko -->
 
         <!-- ko if: $root.job().mainType() == 'queries-hive' -->
         <div class="tab-pane active" id="queries-page-hive-plan-text${ SUFFIX }" data-profile="plan">
-          <pre data-bind="text: properties.plan && properties.plan().plan"/>
+          <pre data-bind="text: properties.plan && properties.plan().plan"></pre>
         </div>
         <div class="tab-pane" id="queries-page-hive-stmt${ SUFFIX }" data-profile="stmt">
-          <pre data-bind="text: (properties.plan && properties.plan().stmt) || _('The selected tab has no data')"/>
+          <pre data-bind="text: (properties.plan && properties.plan().stmt) || _('The selected tab has no data')"></pre>
         </div>
         <div class="tab-pane" id="queries-page-hive-perf${ SUFFIX }" data-profile="perf">
-          <pre data-bind="text: (properties.plan && properties.plan().perf && properties.plan().perf && JSON.stringify(JSON.parse(properties.plan().perf), null, 2)) || _('The selected tab has no data')"/>
+          <pre data-bind="text: (properties.plan && properties.plan().perf && properties.plan().perf && JSON.stringify(JSON.parse(properties.plan().perf), null, 2)) || _('The selected tab has no data')"></pre>
         </div>
         <!-- /ko -->
       </div>

+ 2 - 2
apps/metastore/src/metastore/templates/components.mako

@@ -131,9 +131,9 @@
             ${unicode(field) | n}
         % else:
             % if tag == 'textarea':
-                <textarea name="${field.html_name | n}" ${make_attr_str(attrs) | n} class="${cls}" />${extract_field_data(field) or ''}</textarea>
+                <textarea name="${field.html_name | n}" ${make_attr_str(attrs) | n} class="${cls}">${extract_field_data(field) or ''}</textarea>
             % elif tag == 'button':
-                <button name="${field.html_name | n}" ${make_attr_str(attrs) | n} value="${value}"/>${button_text or field.name or ''}</button>
+                <button name="${field.html_name | n}" ${make_attr_str(attrs) | n} value="${value}">${button_text or field.name or ''}</button>
             % elif tag == 'checkbox':
                 % if help:
                     <input type="checkbox" name="${field.html_name | n}" ${make_attr_str(attrs) | n} ${value and "CHECKED" or ""}/ /> <span rel="tooltip" data-original-title="${help}" >${button_text or field.name or ''}</span>

+ 5 - 5
apps/oozie/src/oozie/templates/editor/action_utils.mako

@@ -398,7 +398,7 @@
           <tr>
             <th>${ _('Property name') }</th>
             <th>${ _('Value') }</th>
-            <th/>
+            <th></th>
           </tr>
         </thead>
         <tbody data-bind="foreach: ${ javascript_attrs['name'] }">
@@ -432,7 +432,7 @@
           <tr>
             <th>${ _('Source') }</th>
             <th>${ _('Destination') }</th>
-            <th/>
+            <th></th>
           </tr>
         </thead>
         <tbody data-bind="foreach: ${ javascript_attrs['name'] }">
@@ -467,7 +467,7 @@
             <th>${ _('Path') }</th>
             <th>${ _('Permissions') }</th>
             <th>${ _('Recursive') }</th>
-            <th/>
+            <th></th>
           </tr>
         </thead>
         <tbody data-bind="foreach: ${ javascript_attrs['name'] }">
@@ -502,7 +502,7 @@
           <tr>
             <th>${ _('Type') }</th>
             <th>${ _('Value') }</th>
-            <th/>
+            <th></th>
           </tr>
         </thead>
         <tbody data-bind="foreach: ${ javascript_attrs['name'] }">
@@ -542,7 +542,7 @@
           <tr>
             <th>${ _('Type') }</th>
             <th>${ _('Value') }</th>
-            <th/>
+            <th></th>
           </tr>
         </thead>
         <tbody data-bind="foreach: ${ javascript_attrs['name'] }">

+ 3 - 3
apps/oozie/src/oozie/templates/editor/control_utils.mako

@@ -136,7 +136,7 @@
             <thead>
               <tr>
                 <th>${ _('Predicate') }</th>
-                <th/>
+                <th></th>
                 <th>${ _('Action') }</th>
               </tr>
             </thead>
@@ -208,13 +208,13 @@
           <tr>
             <th>${ _('Type') }</th>
             <th>${ _('Value') }</th>
-            <th/>
+            <th></th>
           </tr>
         </thead>
         <tbody data-bind="foreach: ${ javascript_attrs['name'] }">
           <tr>
             <td>
-              <span class="span4 required" data-bind="text: type" />
+              <span class="span4 required" data-bind="text: type"></span>
             </td>
             <td>
               <input type="text" class="input-xxlarge required" data-bind="fileChooser: $data, value: value, uniqueName: false" />

+ 1 - 1
apps/oozie/src/oozie/templates/editor/coordinator_properties.mako

@@ -31,7 +31,7 @@
           <tr>
             <th>${ _('Name') }</th>
             <th>${ _('Value') }</th>
-            <th/>
+            <th></th>
           </tr>
         </thead>
         <tbody data-bind="foreach: ${ element }">

+ 1 - 1
apps/oozie/src/oozie/templates/editor/edit_bundle.mako

@@ -170,7 +170,7 @@ ${ layout.menubar(section='bundles') }
                     % if bundle.is_editable(user):
                       <a href="javascript:void(0)" class="editBundledCoordinator"
                          data-url="${ url('oozie:edit_bundled_coordinator', bundle=bundle.id, bundled_coordinator=form.instance.id) }" data-row-selector="true"
-                         />
+                      ></a>
                     % endif
                     ${ form.instance.coordinator.description }
                   </td>

+ 1 - 1
apps/oozie/src/oozie/templates/editor/edit_coordinator.mako

@@ -359,7 +359,7 @@ ${ layout.menubar(section='coordinators') }
                 <tr title="${ _('Click to view the dataset') }" rel="tooltip">
                   <td>
                   % if coordinator.is_editable(user):
-                    <a href="javascript:void(0)" class="editDataset" data-url="${ url('oozie:edit_coordinator_dataset', dataset=form.instance.id) }" data-row-selector="true"/>
+                    <a href="javascript:void(0)" class="editDataset" data-url="${ url('oozie:edit_coordinator_dataset', dataset=form.instance.id) }" data-row-selector="true"></a>
                   % endif
                   ${ form.instance.name }
                   </td>

+ 1 - 1
apps/oozie/src/oozie/templates/editor/job_action_properties.mako

@@ -31,7 +31,7 @@
           <tr>
             <th>${ _('Name') }</th>
             <th>${ _('Value') }</th>
-            <th/>
+            <th></th>
           </tr>
         </thead>
         <tbody data-bind="foreach: ${ element }">

+ 1 - 1
apps/oozie/src/oozie/templates/editor/list_bundles.mako

@@ -93,7 +93,7 @@ ${ layout.menubar(section='bundles') }
               >
             </div>
             % if bundle.can_read(user):
-              <a href="${ url('oozie:edit_bundle', bundle=bundle.id) }" data-row-selector="true"/>
+              <a href="${ url('oozie:edit_bundle', bundle=bundle.id) }" data-row-selector="true"></a>
             % endif
           </td>
           <td>${ bundle.name }</td>

+ 1 - 1
apps/oozie/src/oozie/templates/editor/list_coordinators.mako

@@ -96,7 +96,7 @@ ${ layout.menubar(section='coordinators') }
               >
             </div>
             % if coordinator.can_read(user):
-              <a href="${ url('oozie:edit_coordinator', coordinator=coordinator.id) }" data-row-selector="true"/>
+              <a href="${ url('oozie:edit_coordinator', coordinator=coordinator.id) }" data-row-selector="true"></a>
             % endif
           </td>
           <td>${ coordinator.name }</td>

+ 1 - 1
apps/oozie/src/oozie/templates/editor/workflow_utils.mako

@@ -30,7 +30,7 @@
           <tr>
             <th>${ _('Name') }</th>
             <th>${ _('Value') }</th>
-            <th/>
+            <th></th>
           </tr>
         </thead>
         <tbody data-bind="foreach: ${ javascript_attrs['name'] }">

+ 16 - 16
apps/oozie/src/oozie/templates/editor2/common_workflow.mako

@@ -49,7 +49,7 @@
   </div>
   %endif
   % if layout_json == '':
-   <div class="container-fluid" id="workflow_graph"/>
+    <div class="container-fluid" id="workflow_graph"></div>
   %endif
 </div>
 
@@ -353,7 +353,7 @@
     <div data-bind="visible: $root.isEditing" style="margin: 10px">
       <div data-bind="visible: $parent.ooziePropertiesExpanded">
         <h6 class="field-title">${ _('Message') }</h6>
-        <textarea class="span12" data-bind="value: properties.message" />
+        <textarea class="span12" data-bind="value: properties.message"></textarea>
 
         <h6 class="field-title">${ _('Email on error') } <input type="checkbox" data-bind="checked: properties.enableMail" style="margin-top: -3px;margin-left: 4px;" /></h6>
 
@@ -1323,7 +1323,7 @@
 
     <div data-bind="visible: ! $root.isEditing()">
       <span data-bind="template: { name: 'logs-icon' }"></span>
-      <span data-bind="text: properties.main_class" />
+      <span data-bind="text: properties.main_class"></span>
     </div>
 
     <div data-bind="visible: $root.isEditing">
@@ -1415,7 +1415,7 @@
     <div data-bind="visible: ! $root.isEditing()">
       <span data-bind="template: { name: 'logs-icon' }"></span>
       <div class="command-ellipsis">
-        <span data-bind="text: properties.command(), attr: { title: properties.command() }" />
+        <span data-bind="text: properties.command(), attr: { title: properties.command() }"></span>
       </div>
     </div>
 
@@ -1829,9 +1829,9 @@
 
     <div data-bind="visible: ! $root.isEditing()">
       <span data-bind="template: { name: 'logs-icon' }"></span>
-      <span data-bind="text: properties.host" />
+      <span data-bind="text: properties.host"></span>
       <div class="command-ellipsis">
-        <span data-bind="text: properties.ssh_command(), attr: { title: properties.ssh_command() }" />
+        <span data-bind="text: properties.ssh_command(), attr: { title: properties.ssh_command() }"></span>
       </div>
     </div>
 
@@ -1907,10 +1907,10 @@
         <li>
           <span data-bind='template: { name: "common-fs-link", data: {path: value(), with_label: true} }, visible: value().length > 0'></span>
           ${ _('to') }
-          <span data-bind="text: permissions"/>
-          <span data-bind="visible: ! dir_files(), text: '${ _ko('for directories') }'"/>
-          <span data-bind="visible: dir_files(), text: '${ _ko('for directories and files') }'"/>
-          <span data-bind="visible: recursive, text: '${ _ko('recursively') }'"/>
+          <span data-bind="text: permissions"></span>
+          <span data-bind="visible: ! dir_files(), text: '${ _ko('for directories') }'"></span>
+          <span data-bind="visible: dir_files(), text: '${ _ko('for directories and files') }'"></span>
+          <span data-bind="visible: recursive, text: '${ _ko('recursively') }'"></span>
         </li>
       </ul>
 
@@ -1919,10 +1919,10 @@
         <li>
           <span data-bind='template: { name: "common-fs-link", data: {path: value(), with_label: true} }, visible: value().length > 0'></span>
           ${ _('to') }
-          <span data-bind="text: group"/>
-          <span data-bind="visible: ! dir_files(), text: '${ _ko('for directories') }'"/>
-          <span data-bind="visible: dir_files(), text: '${ _ko('for directories and files') }'"/>
-          <span data-bind="visible: recursive, text: '${ _ko('recursively') }'"/>
+          <span data-bind="text: group"></span>
+          <span data-bind="visible: ! dir_files(), text: '${ _ko('for directories') }'"></span>
+          <span data-bind="visible: dir_files(), text: '${ _ko('for directories and files') }'"></span>
+          <span data-bind="visible: recursive, text: '${ _ko('recursively') }'"></span>
         </li>
       </ul>
     </div>
@@ -2116,10 +2116,10 @@
     <div data-bind="visible: ! $root.isEditing()">
       <span data-bind="template: { name: 'logs-icon' }"></span>
       ${ _('To') }
-      <span data-bind="text: properties.to"/>
+      <span data-bind="text: properties.to"></span>
       <br/>
       ${ _('About') }
-      <span data-bind="text: properties.subject"/>
+      <span data-bind="text: properties.subject"></span>
     </div>
 
     <div data-bind="visible: $parent.ooziePropertiesExpanded">

+ 1 - 1
apps/pig/src/pig/templates/app.mako

@@ -531,7 +531,7 @@ ${ commonheader(None, "pig", user, request) | n,unicode }
             <script id="logTemplate" type="text/html">
               <div data-bind="css:{'alert-modified': name != '', 'alert': name != '', 'alert-success': (status == 'SUCCEEDED' || status == 'OK') && isReallyDone, 'alert-error': status != 'RUNNING' && status != 'SUCCEEDED' && status != 'OK' && status != 'PREP' && status != 'SUSPENDED'}">
                 <div class="pull-right">
-                    ${ _('Status:') } <a data-bind="text: status, visible: absoluteUrl != '', attr: {'href': absoluteUrl}" target="_blank"/> <i class="fa fa-share"></i>
+                  ${ _('Status:') } <a data-bind="text: status, visible: absoluteUrl != '', attr: {'href': absoluteUrl}" target="_blank"></a> <i class="fa fa-share"></i>
                 </div>
                 <h4>${ _('Progress:') } <span data-bind="text: progress"></span>${ _('%') }</h4>
                 <div data-bind="css: {'progress': name != '', 'progress-striped': name != '', 'active': status == 'RUNNING'}" style="margin-top:10px">

+ 2 - 2
apps/sqoop/src/sqoop/templates/app.mako

@@ -491,7 +491,7 @@ ${ commonheader(None, "sqoop", user, request) | n,unicode }
         <tr>
           <th>${ _('Property name') }</th>
           <th>${ _('Value') }</th>
-          <th/>
+          <th></th>
         </tr>
       </thead>
       <tbody data-bind="foreach: value()">
@@ -585,7 +585,7 @@ ${ commonheader(None, "sqoop", user, request) | n,unicode }
         <tr>
           <th>${ _('Property name') }</th>
           <th>${ _('Value') }</th>
-          <th/>
+          <th></th>
         </tr>
       </thead>
       <tbody data-bind="foreach: value()">

+ 7 - 7
desktop/core/src/desktop/js/apps/notebook2/components/resultChart/ko.resultChart.js

@@ -451,31 +451,31 @@ const TEMPLATE = `
 
     <div data-bind="visible: hasDataForChart" style="display:none">
       <!-- ko if: isPieChart -->
-      <div class="chart" data-bind="attr: { 'id': chartId }, pieChart: pieChartParams()" />
+      <div class="chart" data-bind="attr: { 'id': chartId }, pieChart: pieChartParams()"></div>
       <!-- /ko -->
 
       <!-- ko if: isBarChart -->
-      <div class="chart" data-bind="attr: { 'id': chartId }, barChart: barChartParams()" />
+      <div class="chart" data-bind="attr: { 'id': chartId }, barChart: barChartParams()"></div>
       <!-- /ko -->
 
       <!-- ko if: isLineChart -->
-      <div class="chart" data-bind="attr: { 'id': chartId }, lineChart: lineChartParams()" />
+      <div class="chart" data-bind="attr: { 'id': chartId }, lineChart: lineChartParams()"></div>
       <!-- /ko -->
 
       <!-- ko if: isTimelineChart -->
-      <div class="chart" data-bind="attr:{ 'id': chartId }, timelineChart: timeLineChartParams()" />
+      <div class="chart" data-bind="attr:{ 'id': chartId }, timelineChart: timeLineChartParams()"></div>
       <!-- /ko -->
 
       <!-- ko if: isMapChart -->
-      <div class="chart" data-bind="attr:{ 'id': chartId }, leafletMapChart: leafletMapChartParams()" />
+      <div class="chart" data-bind="attr:{ 'id': chartId }, leafletMapChart: leafletMapChartParams()"></div>
       <!-- /ko -->
 
       <!-- ko if: isGradientMapChart -->
-      <div class="chart" data-bind="attr:{ 'id': chartId }, mapChart: mapChartParams()" />
+      <div class="chart" data-bind="attr:{ 'id': chartId }, mapChart: mapChartParams()"></div>
       <!-- /ko -->
 
       <!-- ko if: isScatterChart -->
-      <div class="chart" data-bind="attr:{ 'id': chartId }, scatterChart: scatterChartParams()" />
+      <div class="chart" data-bind="attr:{ 'id': chartId }, scatterChart: scatterChartParams()"></div>
       <!-- /ko -->
     </div>
   </div>

+ 1 - 1
desktop/core/src/desktop/js/ext/fileuploader.custom.js

@@ -1141,7 +1141,7 @@ qq.extend(qq.UploadHandlerForm.prototype, {
         // var iframe = document.createElement('iframe');
         // iframe.setAttribute('name', id);
 
-        var iframe = qq.toElement('<iframe src="javascript:false;" name="' + id + '" />');
+        var iframe = qq.toElement('<iframe src="javascript:false;" name="' + id + '"></iframe>');
         // src="javascript:false;" removes ie6 prompt on https
 
         iframe.setAttribute('id', id);

+ 1 - 1
desktop/core/src/desktop/js/ko/bindings/ko.autogrowInput.js

@@ -30,7 +30,7 @@ ko.bindingHandlers.autogrowInput = {
 
     const minWidth = o.minWidth || $(element).width();
     const input = $(element);
-    const testSubject = $('<tester/>').css({
+    const testSubject = $('<tester></tester>').css({
       position: 'absolute',
       top: -9999,
       left: -9999,

+ 1 - 1
desktop/core/src/desktop/js/ko/components/ko.executionAnalysis.js

@@ -42,7 +42,7 @@ const TEMPLATE = `
         <h4>${I18n('Heatmap')}</h4>
         <div>
             <select data-bind="options: heatmapMetrics, event: { change: $parent.heatmapMetricChanged.bind($parent) }"></select>
-            <svg class="heatmap"/>
+            <svg class="heatmap"></svg>
         </div>
       </div>
       <div>

+ 1 - 1
desktop/core/src/desktop/js/ko/components/ko.pollingCatalogEntriesList.js

@@ -52,7 +52,7 @@ class PollingCatalogEntriesList {
    *   compute: ko.observable({ id: 'default' }),
    *   path: ko.observable('default.foo'),
    *   refreshSampleInterval: 3000
-   * }}" />
+   * }}"></div>
    *
    * @param params
    * @constructor

+ 1 - 1
desktop/core/src/desktop/static/desktop/js/freshereditor.js

@@ -544,7 +544,7 @@
           var $this, data, tooltip;
           $this = $(this);
           data = $this.data('fresheditor');
-          tooltip = $('<div/>', {
+          tooltip = $('<div></div>', {
             text: $this.attr('title')
           });
           if (!data) {

+ 1 - 1
desktop/core/src/desktop/static/desktop/js/jquery.scrollleft.js

@@ -55,7 +55,7 @@
       $(document).off("click", "#jHueScrollLeftAnchor");
     }
     else {
-      link = $("<a/>").attr("id", "jHueScrollLeftAnchor").addClass("hueAnchor hueAnchorScroller").attr("href", "javascript:void(0)").html("<i class='fa fa-fw fa-chevron-left'></i>").appendTo('body');
+      link = $("<a></a>").attr("id", "jHueScrollLeftAnchor").addClass("hueAnchor hueAnchorScroller").attr("href", "javascript:void(0)").html("<i class='fa fa-fw fa-chevron-left'></i>").appendTo('body');
     }
 
     $(_this.element).attr("jHueLeftScrollified", "true");

+ 1 - 1
desktop/core/src/desktop/static/desktop/js/jquery.scrollup.js

@@ -58,7 +58,7 @@
       $(document).off("click", "#jHueScrollUpAnchor");
     }
     else {
-      link = $("<a/>").attr("id", "jHueScrollUpAnchor").addClass("hueAnchor hueAnchorScroller").attr("href", "javascript:void(0)").html("<i class='fa fa-fw fa-chevron-up'></i>").appendTo('body');
+      link = $("<a></a>").attr("id", "jHueScrollUpAnchor").addClass("hueAnchor hueAnchorScroller").attr("href", "javascript:void(0)").html("<i class='fa fa-fw fa-chevron-up'></i>").appendTo('body');
     }
 
     $(_this.element).attr("jHueScrollified", "true");

+ 2 - 2
desktop/core/src/desktop/templates/common_dashboard.mako

@@ -223,11 +223,11 @@
                 <select data-bind="selectize: $root.collection.template.filteredModalFields().sort(function (l, r) { return l.name() > r.name() ? 1 : -1 }), value: fieldName, optionsValue: 'name', optionsText: 'name', optionsCaption: '${ _ko('Field...') }'" class="hit-options input-small" style="margin-bottom: 0"></select>
                 <!-- ko if: fieldName -->
                 <a class="inactive-action context-popover-icon" href="javascript:void(0);" data-bind="sqlContextPopover: { sourceType: 'solr', namespace: $root.collection.activeNamespace(), compute: $root.collection.activeCompute(), path: 'default.' + $root.collection.name() + '.' + fieldName()  }">
-                  <i class="fa fa-fw fa-info" title="${_('Show Details')}"/>
+                  <i class="fa fa-fw fa-info" title="${_('Show Details')}"></i>
                 </a>
                 <!-- /ko -->
                 <!-- ko ifnot: fieldName  -->
-                  <i class="fa fa-fw"/>
+                <i class="fa fa-fw"></i>
                 <!-- /ko -->
 
 

+ 22 - 22
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -800,7 +800,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
           <!-- /ko -->
        <!-- /ko -->
        <!-- ko ifnot: properties.facets()[0].multiselect -->
-        <select data-bind="selectize: $parent.counts, optionsText: 'text', optionsValue:'value', value: $parent.countsSelected"/>
+      <select data-bind="selectize: $parent.counts, optionsText: 'text', optionsValue:'value', value: $parent.countsSelected"></select>
        <!-- /ko -->
       <!-- /ko -->
       <!-- ko if: properties.facets()[0].type() == 'range' -->
@@ -1270,7 +1270,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
         onSelectRange: function(from, to){ $root.collection.selectTimelineFacet({from: from, to: to, cat: field, widget_id: $parent.id()}) },
         onStateChange: function(state){ $root.collection.getFacetById($parent.id()).properties.stacked(state.stacked); $root.collection.getFacetById($parent.id()).properties.enableSelection(state.selectionEnabled); },
         onClick: function(d){ $root.query.selectRangeFacet({count: d.obj.value, widget_id: $parent.id(), from: d.obj.from, to: d.obj.to, cat: d.obj.field}) },
-        onComplete: function(){ $root.getWidgetById($parent.id()).isLoading(false); }}"/>
+        onComplete: function(){ $root.getWidgetById($parent.id()).isLoading(false); }}"></div>
       <div class="clearfix"></div>
       </div>
     <!-- /ko -->
@@ -1364,7 +1364,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
       onSelectRange: function(from, to){ searchViewModel.collection.selectTimelineFacet({from: from, to: to, cat: field, widget_id: $parent.id()}) },
       onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); },
       type: $root.collection.getFacetById($parent.id()).properties.timelineChartType }"
-    />
+    ></div>
     </div>
     <div class="clearfix"></div>
     <!-- /ko -->
@@ -1634,7 +1634,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
               onSelectRange: function(from, to){ searchViewModel.collection.selectTimelineFacet2({from: from, to: to, cat: field, widget_id: $parent.id()}) },
               onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); },
               type: $root.collection.getFacetById($parent.id()).properties.timelineChartType }"
-            />
+            ></div>
             <div class="clearfix"></div>
           <!-- /ko -->
 
@@ -1654,7 +1654,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
               },
               onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); },
               type: $root.collection.getFacetById($parent.id()).properties.timelineChartType }"
-            />
+            ></div>
             <div class="clearfix"></div>
           <!-- /ko -->
 
@@ -1670,7 +1670,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
             onSelectRange: function(from, to){ $root.collection.selectTimelineFacet2({from: from, to: to, cat: field, widget_id: $parent.id()}) },
             onStateChange: function(state){ $root.collection.getFacetById($parent.id()).properties.stacked(state.stacked); },
             onClick: function(d){ $root.query.selectRangeFacet({count: d.obj.value, widget_id: $parent.id(), from: d.obj.from, to: d.obj.to, cat: d.obj.field}) },
-            onComplete: function(){ $root.getWidgetById($parent.id()).isLoading(false); }}" />
+            onComplete: function(){ $root.getWidgetById($parent.id()).isLoading(false); }}" ></div>
             <div class="clearfix"></div>
           <!-- /ko -->
 
@@ -1686,7 +1686,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
               onClick: function(d) {
                 $root.query.togglePivotFacet({facet: {'fq_fields': d.fields, 'fq_values': d.value}, widget_id: id()});
               },
-              onComplete: function(){ var widget = searchViewModel.getWidgetById($parent.id()); if (widget != null) { widget.isLoading(false)}; }}" />
+              onComplete: function(){ var widget = searchViewModel.getWidgetById($parent.id()); if (widget != null) { widget.isLoading(false)}; }}"></div>
            <!-- /ko -->
         <!-- /ko -->
 
@@ -1703,7 +1703,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
             onSelectRange: function(from, to){ $root.collection.selectTimelineFacet2({from: from, to: to, cat: field, widget_id: $parent.id()}) },
             onStateChange: function(state){ $root.collection.getFacetById($parent.id()).properties.stacked(state.stacked); },
             onClick: function(d){ $root.query.selectRangeFacet({count: d.obj.value, widget_id: $parent.id(), from: d.obj.from, to: d.obj.to, cat: d.obj.field}) },
-            onComplete: function(){ $root.getWidgetById($parent.id()).isLoading(false); }}" />
+            onComplete: function(){ $root.getWidgetById($parent.id()).isLoading(false); }}"></div>
           <div class="clearfix"></div>
           <!-- /ko -->
         <!-- /ko -->
@@ -1714,7 +1714,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
             transformer: rangePieChartDataTransformer,
             maxWidth: 250,
             onClick: function(d){ searchViewModel.query.selectRangeFacet({count: d.data.obj.value, widget_id: d.data.obj.widget_id, from: d.data.obj.from, to: d.data.obj.to, cat: d.data.obj.field}) },
-            onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}" />
+            onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}"></div>
           <div class="clearfix"></div>
           <!-- /ko -->
 
@@ -1724,7 +1724,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
             rangeUp: true,
             maxWidth: 250,
             onClick: function(d){ searchViewModel.query.selectRangeUpFacet({count: d.data.obj.value, widget_id: d.data.obj.widget_id, from: d.data.obj.from, to: d.data.obj.to, cat: d.data.obj.field, 'exclude': false, is_up: d.data.obj.is_up}) },
-            onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}" />
+            onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}"></div>
           <div class="clearfix"></div>
           <!-- /ko -->
 
@@ -1733,7 +1733,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
             transformer: pieChartDataTransformer,
             maxWidth: 250,
             onClick: function(d){ $parent.dimension() == 2 ? $root.query.togglePivotFacet({facet: d.data.obj, widget_id: id()}) : searchViewModel.query.toggleFacet({facet: d.data.obj, widget_id: d.data.obj.widget_id}) },
-            onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}" />
+            onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}"></div>
           <div class="clearfix"></div>
           <!-- /ko -->
         <!-- /ko -->
@@ -1762,7 +1762,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
           <!-- /ko -->
           <!-- ko if: template.chartSettings.chartType() == window.HUE_CHARTS.TYPES.GRADIENTMAP -->
           <div data-bind="attr:{'id': 'gradientMapChart_'+id()}, mapChart: {data: {counts: $parent.results(), scope: template.chartSettings.chartScope(), snippet: $data, widget_id: $parent.id(), chartX: template.chartSettings.chartX, chartY: template.chartSettings.chartYSingle},
-              transformer: gradientMapChartDataTransformerGrid, maxWidth: 750, isScale: true}" />
+              transformer: gradientMapChartDataTransformerGrid, maxWidth: 750, isScale: true}"></div>
           <!-- /ko -->
           <div class="clearfix"></div>
         <!-- /ko -->
@@ -1790,7 +1790,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
           <!-- /ko -->
           <!-- ko if: $root.collection.template.chartSettings.chartType() == window.HUE_CHARTS.TYPES.GRADIENTMAP -->
           <div data-bind="attr:{'id': 'gradientMapChart_'+id()}, mapChart: {data: {counts: $root.results(), scope: $root.collection.template.chartSettings.chartScope(), snippet: $data},
-              transformer: gradientMapChartDataTransformerGrid, maxWidth: 750, isScale: true}" />
+              transformer: gradientMapChartDataTransformerGrid, maxWidth: 750, isScale: true}"></div>
           <div class="clearfix"></div>
           <!-- /ko -->
         <!-- /ko -->
@@ -1889,7 +1889,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
       onClick: function(d){ searchViewModel.query.selectRangeFacet({count: d.obj.value, widget_id: d.obj.widget_id, from: d.obj.from, to: d.obj.to, cat: d.obj.field}) },
       onSelectRange: function(from, to){ searchViewModel.collection.selectTimelineFacet({from: from, to: to, cat: field, widget_id: $parent.id()}) },
       onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); huePubSub.publish('gridster.autoheight'); }}"
-    />
+    ></div>
     </div>
     <div class="clearfix"></div>
   </div>
@@ -1911,7 +1911,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
         transformer: rangePieChartDataTransformer,
         maxWidth: 250,
         onClick: function(d){ searchViewModel.query.selectRangeFacet({count: d.data.obj.value, widget_id: d.data.obj.widget_id, from: d.data.obj.from, to: d.data.obj.to, cat: d.data.obj.field}) },
-        onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}" />
+        onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}"></div>
       <div class="clearfix"></div>
       <!-- /ko -->
       <!-- ko if: type() == 'range-up' -->
@@ -1920,7 +1920,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
         rangeUp: true,
         maxWidth: 250,
         onClick: function(d){ searchViewModel.query.selectRangeUpFacet({count: d.data.obj.value, widget_id: d.data.obj.widget_id, from: d.data.obj.from, to: d.data.obj.to, cat: d.data.obj.field, 'exclude': false, is_up: d.data.obj.is_up}) },
-        onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}" />
+        onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}"></div>
       <div class="clearfix"></div>
       <!-- /ko -->
       <!-- ko if: type().indexOf('range') == -1 -->
@@ -1928,7 +1928,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
         transformer: pieChartDataTransformer,
         maxWidth: 250,
         onClick: function(d){ searchViewModel.query.toggleFacet({facet: d.data.obj, widget_id: d.data.obj.widget_id}) },
-        onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}" />
+        onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}"></div>
       <div class="clearfix"></div>
       <!-- /ko -->
     </div>
@@ -2017,7 +2017,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
             $root.query.togglePivotFacet({facet: d.obj, widget_id: id()});
           },
           onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}"
-        />
+        ></div>
       <div class="clearfix"></div>
       <!-- /ko -->
     </div>
@@ -2048,7 +2048,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
             $root.query.togglePivotFacet({facet: d.obj, widget_id: id()});
           },
           onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}"
-        />
+        ></div>
       <div class="clearfix"></div>
       <!-- /ko -->
     </div>
@@ -2121,7 +2121,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
             $root.query.togglePivotFacet({facet: d.obj, widget_id: id()});
           },
           onComplete: function(){ searchViewModel.getWidgetById($parent.id()).isLoading(false); }}"
-        />
+        ></div>
         </div>
       <div class="clearfix"></div>
       <!-- /ko -->
@@ -2263,7 +2263,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
       <select data-bind="selectize: facetFieldsNames, value: $parent.field, optionsValue: 'name', optionsText: 'name', optionsCaption: '${ _ko('Field...') }'" class="hit-options input-small" style="margin-bottom: 0"></select>
         <!-- ko if: $parent.field -->
         <a class="inactive-action context-popover-icon" href="javascript:void(0);" data-bind="sqlContextPopover: { sourceType: 'solr', namespace: $root.collection.activeNamespace(), compute: $root.collection.activeCompute(), path: 'default.' + $root.collection.name() + '.' + $parent.field()  }">
-          <i class="fa fa-fw fa-info" title="${_('Show Details')}"/>
+          <i class="fa fa-fw fa-info" title="${_('Show Details')}"></i>
         </a>
         <!-- /ko -->
       <!-- /ko -->
@@ -2730,7 +2730,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
         <li data-bind="visibleOnHover: { 'selector': '.entity-field-picker' }">
             <span class="badge badge-info" data-bind="text: name(), attr: {'title': type()}, click: addFacetDemiModalFieldPreview"></span>
             <a class="entity-field-picker inactive-action margin-right-10" href="javascript:void(0);" data-bind="sqlContextPopover: { sourceType: 'solr', namespace: $root.collection.activeNamespace(), compute: $root.collection.activeCompute(), path: 'default.' + $root.collection.name() + '.' + name()  }" style="margin-left: 2px;">
-              <i class="fa fa-info" title="${_('Show Details')}"/>
+              <i class="fa fa-info" title="${_('Show Details')}"></i>
             </a>
         </li>
       </ul>

+ 2 - 2
desktop/libs/notebook/src/notebook/templates/editor_components2.mako

@@ -1233,9 +1233,9 @@
 
   <script type ="text/html" id="snippet-execution-controls${ suffix }">
     <div class="snippet-actions clearfix">
-      <div class="pull-left" data-bind="component: { name: 'executable-actions', params: { activeExecutable: activeExecutable, beforeExecute: beforeExecute } }" />
+      <div class="pull-left" data-bind="component: { name: 'executable-actions', params: { activeExecutable: activeExecutable, beforeExecute: beforeExecute } }"></div>
       <!-- ko if: isSqlDialect() && !$root.isPresentationMode() -->
-      <div class="pull-right" data-bind="component: { name: 'snippet-editor-actions', params: { snippet: $data } }" />
+      <div class="pull-right" data-bind="component: { name: 'snippet-editor-actions', params: { snippet: $data } }"></div>
       <!-- /ko -->
       <div class="pull-right">
         <!-- ko if: status() === 'loading' -->