Do not render self-closing slash for HTML5

atk4 · Oct 5, 2022 · 17adc4b · 17adc4b
1 parent c02ec94
commit 17adc4b
Show file tree

Hide file tree

Showing 35 changed files with 60 additions and 68 deletions.
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -318,7 +318,7 @@ jobs:
  run: |
  cp -r template template.orig
  find template -not -type d -not -name '*.pug' -delete
- (cd template && pug --silent --pretty .)
+ (cd template && pug --doctype html --pretty --silent .)
 
  - name: Compile CSS files (only for Slow)
  if: matrix.type == 'Chrome Slow'

diff --git a/demos/form/form.php b/demos/form/form.php
@@ -78,7 +78,7 @@
 $form->buttonSave->set('Compare Date');
 
 $form->onSubmit(function (Form $form) {
- $message = 'field = ' . print_r($form->model->get('field'), true) . '; <br /> control = ' . print_r($form->model->get('control'), true);
+ $message = 'field = ' . print_r($form->model->get('field'), true) . '; <br> control = ' . print_r($form->model->get('control'), true);
  $view = new Message('Date field vs control:');
  $view->invokeInit();
  $view->text->addHtml($message);

diff --git a/demos/layout/templates/layout1.html b/demos/layout/templates/layout1.html
@@ -2,11 +2,11 @@
 <html>
  <head>
  <!-- Standard Meta-->
- <meta charset="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
  <!-- Site Properties-->
  <title>Rainas homepage</title>
- <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.css" />
+ <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.css">
  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-serialize-object/2.5.0/jquery.serialize-object.min.js"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.min.js"></script>
@@ -60,23 +60,23 @@ <h3>Nominal Acitivity Report</h3>
  </div>
  <div class="field">
  <div class="ui left icon input"><i class="calendar icon"></i>
- <input type="text" name="email" placeholder="From" />
+ <input type="text" name="email" placeholder="From">
  </div>
  </div>
  <div class="field">
  <div class="ui left icon input"><i class="calendar icon"></i>
- <input type="text" name="email" placeholder="To" />
+ <input type="text" name="email" placeholder="To">
  </div>
  </div>
  <div class="field">
  <div class="ui checkbox">
- <input type="checkbox" name="suppress0" />
+ <input type="checkbox" name="suppress0">
  <label>Suppress 0s</label>
  </div>
  </div>
  <div class="field">
  <div class="ui checkbox">
- <input type="checkbox" name="suppress0" />
+ <input type="checkbox" name="suppress0">
  <label>Show Descriptions</label>
  </div>
  </div>

diff --git a/demos/layout/templates/layout1.pug b/demos/layout/templates/layout1.pug
@@ -2,13 +2,11 @@ doctype html
 html
  head
  // Standard Meta
- |
- | <meta charset="utf-8" />
- | <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
+ meta(charset='utf-8')
+ meta(name='viewport', content='width=device-width, initial-scale=1.0, maximum-scale=1.0')
  // Site Properties
  title Rainas homepage
- |
- | <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.css" />
+ link(rel='stylesheet', type='text/css', href='https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.css')
  script(src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js')
  script(src='https://cdnjs.cloudflare.com/ajax/libs/jquery-serialize-object/2.5.0/jquery.serialize-object.min.js')
  script(src='https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.min.js')
@@ -64,24 +62,20 @@ html
  .field
  .ui.left.icon.input
  i.calendar.icon
- |
- | <input type="text" name="email" placeholder="From" />
+ input(type='text', name='email', placeholder='From')
  .field
  .ui.left.icon.input
  i.calendar.icon
- |
- | <input type="text" name="email" placeholder="To" />
+ input(type='text', name='email', placeholder='To')
 
  .field
  .ui.checkbox
- |
- <input type="checkbox" name="suppress0" />
+ input(type='checkbox', name='suppress0')
  label Suppress 0s
 
  .field
  .ui.checkbox
- |
- <input type="checkbox" name="suppress0" />
+ input(type='checkbox', name='suppress0')
  label Show Descriptions
 
  .ui.teal.submit.button

diff --git a/demos/layout/templates/layout2.html b/demos/layout/templates/layout2.html
@@ -2,11 +2,11 @@
 <html>
  <head>
  <!-- Standard Meta-->
- <meta charset="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
  <!-- Site Properties-->
  <title>Agile UI - Button Test</title>
- <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.css" />
+ <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.css">
  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-serialize-object/2.5.0/jquery.serialize-object.min.js"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.min.js"></script>

diff --git a/demos/layout/templates/layout2.pug b/demos/layout/templates/layout2.pug
@@ -2,13 +2,11 @@ doctype html
 html
  head
  // Standard Meta
- |
- | <meta charset="utf-8" />
- | <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
+ meta(charset='utf-8')
+ meta(name='viewport', content='width=device-width, initial-scale=1.0, maximum-scale=1.0')
  // Site Properties
  title Agile UI - Button Test
- |
- | <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.css" />
+ link(rel='stylesheet', type='text/css', href='https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.css')
  script(src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js')
  script(src='https://cdnjs.cloudflare.com/ajax/libs/jquery-serialize-object/2.5.0/jquery.serialize-object.min.js')
  script(src='https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.min.js')

diff --git a/docs/form-control.rst b/docs/form-control.rst
@@ -41,7 +41,7 @@ You can set default value and interact with a form control using JavaScript::
 When used stand-alone, Form\Controls will produce a basic HTML (I have omitted id=)::
 
  <div class="ui input">
- <input name="line" type="text" placeholder="" value="hello world" />
+ <input name="line" type="text" placeholder="" value="hello world">
  </div>
 
 
@@ -59,7 +59,7 @@ page and the following HTML is now produced::
  <div class="field">
  <label for="atk_admin_form_generic_name_input">Name</label>
  <div id="atk_admin_form_generic_name" class="ui input" style="">
- <input name="name" type="text" placeholder="" id="atk_admin_form_generic_name_input" value="" />
+ <input name="name" type="text" placeholder="" id="atk_admin_form_generic_name_input" value="">
  </div>
  </div>
 

diff --git a/js/src/components/multiline/multiline-header.component.js b/js/src/components/multiline/multiline-header.component.js
@@ -10,7 +10,7 @@ export default {
  <sui-table-headerCell :colspan="getVisibleColumns()">{{caption}}</sui-table-headerCell>
  </sui-table-row>
  <sui-table-row :verticalAlign="'top'">
- <sui-table-header-cell width="one" textAlign="center"><input type="checkbox" @input="onToggleDeleteAll" :checked.prop="isChecked" :indeterminate.prop="isIndeterminate" ref="check" /></sui-table-header-cell>
+ <sui-table-header-cell width="one" textAlign="center"><input type="checkbox" @input="onToggleDeleteAll" :checked.prop="isChecked" :indeterminate.prop="isIndeterminate" ref="check"></sui-table-header-cell>
  <sui-table-header-cell v-for="(column, idx) in columns" :key="idx" v-if="column.isVisible" :textAlign="getTextAlign(column)">
  <div>{{column.caption}}</div>
  <div :style="{position: 'absolute', top: '-22px'}" v-if="false"><sui-label pointing="below" basic color="red" v-if="getErrorMsg(column)">{{getErrorMsg(column)}}</sui-label></div>

diff --git a/js/src/components/multiline/multiline-row.component.js b/js/src/components/multiline/multiline-row.component.js
@@ -13,7 +13,7 @@ export default {
  name: 'atk-multiline-row',
  template: `
  <sui-table-row :verticalAlign="'middle'">
- <sui-table-cell width="one" textAlign="center"><input type="checkbox" @input="onToggleDelete" v-model="toDelete" /></sui-table-cell>
+ <sui-table-cell width="one" textAlign="center"><input type="checkbox" @input="onToggleDelete" v-model="toDelete"></sui-table-cell>
  <sui-table-cell @keydown.tab="onTab(idx)" v-for="(column, idx) in columns" :key="idx" :state="getErrorState(column)" v-bind="column.cellProps" :style="{overflow: 'visible'}" v-if="column.isVisible">
  <atk-multiline-cell
  :cellData="column"

diff --git a/js/src/components/multiline/multiline.component.js b/js/src/components/multiline/multiline.component.js
@@ -23,7 +23,7 @@ export default {
  </sui-table-row>
  </sui-table-footer>
  </sui-table>
- <div><input :form="form" :name="name" type="hidden" :value="value" ref="atkmlInput" /></div>
+ <div><input :form="form" :name="name" type="hidden" :value="value" ref="atkmlInput"></div>
  </div>`,
  props: {
  data: Object,

diff --git a/js/src/components/query-builder/fomantic-ui-rule.component.vue b/js/src/components/query-builder/fomantic-ui-rule.component.vue
@@ -33,7 +33,7 @@
  v-model="query.value"
  :type="rule.inputType"
  :placeholder="labels.textInputPlaceholder"
- />
+ >
  </div>
  </template>
  <!-- Checkbox or Radio input -->

diff --git a/js/src/components/query-builder/query-builder.component.vue b/js/src/components/query-builder/query-builder.component.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="">
- <input :form="form" :name="name" type="hidden" :value="value" />
+ <input :form="form" :name="name" type="hidden" :value="value">
  <vue-query-builder :rules="rules" v-model="query" :maxDepth="maxDepth" :labels="labels">
  <template v-slot:default="slotProps">
  <query-builder-group v-bind="slotProps" :query.sync="query" />