merge upstream

src/component/bookmarkForm/index.js

@@ -771,8 +771,8 @@ export const BookmarkForm = function({
         form.wrap({
           children: [
             node('div|class:bookmark-form-description', [
-              node(`h2:${message.get('bookmarkFormSectionVisualHeading')}`),
-              node(`p:${message.get('bookmarkFormSectionVisualDescription')}`)
+              node(`h2:${message.get('bookmarkFormSectionVisualHeading') || 'Content'}`),
+              node(`p:${message.get('bookmarkFormSectionVisualDescription') || 'Text'}`)
             ])
           ]
         }),
@@ -801,8 +801,8 @@ export const BookmarkForm = function({
         form.wrap({
           children: [
             node('div|class:bookmark-form-description', [
-              node(`h2:${message.get('bookmarkFormSectionAddressHeading')}`),
-              complexNode({ tag: 'p', text: message.get('bookmarkFormSectionAddressDescription'), complexText: true })
+              node(`h2:${message.get('bookmarkFormSectionAddressHeading') || 'Content'}`),
+              complexNode({ tag: 'p', text: message.get('bookmarkFormSectionAddressDescription') || 'Text', complexText: true })
             ])
           ]
         }),
@@ -825,8 +825,8 @@ export const BookmarkForm = function({
         form.wrap({
           children: [
             node('div|class:bookmark-form-description', [
-              node(`h2:${message.get('bookmarkFormSectionPositionHeading')}`),
-              node(`p:${message.get('bookmarkFormSectionPositionDescription')}`)
+              node(`h2:${message.get('bookmarkFormSectionPositionHeading') || 'Content'}`),
+              node(`p:${message.get('bookmarkFormSectionPositionDescription') || 'Text'}`)
             ])
           ]
         }),
@@ -870,8 +870,8 @@ export const BookmarkForm = function({
         form.wrap({
           children: [
             node('div|class:bookmark-form-description', [
-              node(`h2:${message.get('bookmarkFormSectionLayoutHeading')}`),
-              node(`p:${message.get('bookmarkFormSectionLayoutDescription')}`)
+              node(`h2:${message.get('bookmarkFormSectionLayoutHeading') || 'Content'}`),
+              node(`p:${message.get('bookmarkFormSectionLayoutDescription') || 'Text'}`)
             ])
           ]
         }),
@@ -917,8 +917,8 @@ export const BookmarkForm = function({
         form.wrap({
           children: [
             node('div|class:bookmark-form-description', [
-              node(`h2:${message.get('bookmarkFormSectionThemeHeading')}`),
-              node(`p:${message.get('bookmarkFormSectionThemeDescription')}`)
+              node(`h2:${message.get('bookmarkFormSectionThemeHeading') || 'Content'}`),
+              node(`p:${message.get('bookmarkFormSectionThemeDescription') || 'Text'}`)
             ])
           ]
         }),

src/component/control/checkbox/index.js

@@ -7,7 +7,7 @@ export const Control_checkbox = function ({
   object = {},
   id = 'name',
   path = false,
-  labelText = 'name',
+  labelText = 'Label',
   description = false,
   action = false,
   //FIXME deprecated properties

src/component/control/color/index.js

@@ -13,7 +13,7 @@ export const Control_color = function ({
   object = {},
   path = false,
   id = 'name',
-  labelText = 'Name',
+  labelText = 'Label',
   srOnly = false,
   //FIXME deprecated property
   value = '#000000', //eslint-disable-line

src/component/control/colorMixer/index.js

@@ -19,7 +19,7 @@ export const Control_colorMixer = function ({
   defaultValue = false,
   minMaxObject = false,
   id = 'name',
-  labelText = 'name',
+  labelText = 'Label',
   srOnly = false,
   randomColor = false,
   action = false

src/component/control/helperText/index.js

@@ -10,7 +10,7 @@ export const Control_helperText = function ({
   text.forEach((item) => {
     this.para.push(form.helper({
       tag: 'p',
-      text: item,
+      text: item || 'Text',
       complexText: complexText
     }));
   });

src/component/control/inputButton/index.js

@@ -12,7 +12,7 @@ export const Control_inputButton = function ({
   inputButtonClassList = [],
   type = false,
   inputHide = false,
-  labelText = 'Name',
+  labelText = 'Label',
   srOnly = false,
   inputButtonStyle = [],
   action = false

src/component/control/label/index.js

@@ -1,7 +1,7 @@
 import * as form from '../../form';
 
 export const Control_label = function({
-  text = 'label',
+  text = 'Label',
   description = false,
   srOnly = false,
   icon = false,

src/component/control/radio/index.js

@@ -7,7 +7,7 @@ export const Control_radio = function ({
   radioGroup = [],
   object = {},
   label = false,
-  groupName = 'group',
+  groupName = 'Group',
   path = false,
   action = false,
   inputButton = false,

src/component/control/radioGrid/index.js

@@ -5,7 +5,7 @@ import { set } from '../../../utility/set';
 
 export const Control_radioGrid = function ({
   radioGroup = [],
-  label = false,
+  label = 'Label',
   object = {},
   groupName = 'group',
   path = false,

src/component/control/select/index.js

@@ -12,7 +12,7 @@ export const Control_select = function({
   object = {},
   id = 'name',
   path = false,
-  labelText = 'name',
+  labelText = 'Label',
   srOnly = false,
   description = false,
   action = false

src/component/control/slider/index.js

@@ -12,7 +12,7 @@ export const Control_slider = function({
   object = {},
   path = false,
   id = 'name',
-  labelText = 'Name',
+  labelText = 'Label',
   value = 0,
   defaultValue = false,
   min = 0,

src/component/control/sliderDouble/index.js

@@ -10,12 +10,12 @@ import { set } from '../../../utility/set';
 
 export const Control_sliderDouble = function ({
   object = {},
-  labelText = 'Name',
+  labelText = 'Label',
   style = false,
   left = {
     path: false,
     id: 'name',
-    labelText: 'Name',
+    labelText: 'Label',
     hue: false,
     value: 0,
     defaultValue: false,
@@ -34,7 +34,7 @@ export const Control_sliderDouble = function ({
   right = {
     path: false,
     id: 'name',
-    labelText: 'Name',
+    labelText: 'Label',
     hue: false,
     value: 0,
     defaultValue: false,

src/component/control/sliderSlim/index.js

@@ -12,7 +12,7 @@ export const Control_sliderSlim = function({
   object = {},
   path = false,
   id = 'name',
-  labelText = 'Name',
+  labelText = 'Label',
   hue = false,
   value = 0,
   defaultValue = false,

src/component/control/text/index.js

@@ -12,7 +12,7 @@ export const Control_text = function ({
   max = false,
   placeholder = false,
   classList = [],
-  labelText = 'Name',
+  labelText = 'Label',
   srOnly = false,
   action = false
 } = {}) {

src/component/control/textReset/index.js

@@ -17,7 +17,7 @@ export const Control_textReset = function({
   max = false,
   placeholder = false,
   classList = [],
-  labelText = 'Name',
+  labelText = 'Label',
   srOnly = false,
   action = false
 } = {}) {

src/component/control/textarea/index.js

@@ -12,7 +12,7 @@ export const Control_textarea = function ({
   max = false,
   placeholder = false,
   classList = [],
-  labelText = 'Name',
+  labelText = 'Label',
   srOnly = false,
   action = false
 } = {}) {

src/component/data/index.js

@@ -409,7 +409,7 @@ data.feedback = {};
 
 data.feedback.empty = {
   render: (feedback) => {
-    feedback.appendChild(node(`p:${message.get('dataFeedbackEmpty')}|class:muted small`));
+    feedback.appendChild(node(`p:${message.get('dataFeedbackEmpty') || 'Text'}|class:muted small`));
   }
 };
 

src/component/dropFile/index.js

@@ -6,7 +6,7 @@ import { node } from '../../utility/node';
 import './index.css';
 
 export const DropFile = function ({
-  heading = 'Drop file here',
+  heading = 'Text',
   dropAaction = false,
   enterAction = false,
   leaveAction = false,

src/component/form/feedback/index.js

@@ -4,7 +4,7 @@ import { complexNode } from '../../../utility/complexNode';
 import './index.css';
 
 export const feedback = ({
-  text = false
+  text = 'Text'
 } = {}) => {
 
   const feedback = node('div|class:form-feedback');

src/component/form/helper/index.js

@@ -3,7 +3,7 @@ import { node } from '../../../utility/node';
 import './index.css';
 
 export const helper = function ({
-  text = 'text',
+  text = 'Text',
   complexText = false,
   classList = []
 } = {}) {

src/component/form/label/index.js

@@ -4,7 +4,7 @@ import './index.css';
 
 export const label = ({
   forInput = false,
-  text = 'label',
+  text = 'Label',
   description = false,
   srOnly = false,
   icon = false,
@@ -42,12 +42,12 @@ export const label = ({
     if (Array.isArray(description)) {
 
       description.forEach((item) => {
-        labelBlock.appendChild(node('span:' + item + '|class:label-block-item small muted'));
+        labelBlock.appendChild(node('span:' + (item || 'Description') + '|class:label-block-item small muted'));
       });
 
     } else if (typeof description === 'string') {
 
-      labelBlock.appendChild(node('span:' + description + '|class:label-block-item small muted'));
+      labelBlock.appendChild(node('span:' + (description || 'Description') + '|class:label-block-item small muted'));
 
     }
   }

src/component/groupForm/index.js

@@ -141,8 +141,8 @@ export const GroupForm = function({
           form.wrap({
             children: [
               node('div|class:group-form-description', [
-                node(`h2:${message.get('groupFormSectionNameHeading')}`),
-                node(`p:${message.get('groupFormSectionNameDescription')}`)
+                node(`h2:${message.get('groupFormSectionNameHeading') || 'Content'}`),
+                node(`p:${message.get('groupFormSectionNameDescription') || 'Text'}`)
               ])
             ]
           }),
@@ -179,8 +179,8 @@ export const GroupForm = function({
           form.wrap({
             children: [
               node('div|class:group-form-description', [
-                node(`h2:${message.get('groupFormSectionToolbarHeading')}`),
-                node(`p:${message.get('groupFormSectionToolbarDescription')}`)
+                node(`h2:${message.get('groupFormSectionToolbarHeading') || 'Content'}`),
+                node(`p:${message.get('groupFormSectionToolbarDescription') || 'Text'}`)
               ])
             ]
           }),
@@ -208,8 +208,8 @@ export const GroupForm = function({
           form.wrap({
             children: [
               node('div|class:group-form-description', [
-                node(`h2:${message.get('groupFormSectionOrderingHeading')}`),
-                node(`p:${message.get('groupFormSectionOrderingDescription')}`)
+                node(`h2:${message.get('groupFormSectionOrderingHeading') || 'Content'}`),
+                node(`p:${message.get('groupFormSectionOrderingDescription') || 'Text'}`)
               ])
             ]
           }),

src/component/link/index.js

@@ -46,6 +46,10 @@ export const Link = function ({
               this.element.link.classList.add('button-ring');
               break;
 
+            case 'small':
+              this.element.link.classList.add('button-small');
+              break;
+
           }
         });
 

src/component/menuContent/appSetting/index.js

@@ -13,15 +13,15 @@ const appSetting = {};
 
 appSetting.app = (parent) => {
 
-  appSetting.app.para1 = node(`p:${message.get('menuContentAppPara1')}`);
+  appSetting.app.para1 = node(`p:${message.get('menuContentAppPara1') || 'Text'}`);
 
   appSetting.app.link1 = new Link({
     text: message.get('menuContentAppLink1'),
     href: `https://www.reddit.com/r/${APP_NAME}`,
     openNew: true
   });
 
-  appSetting.app.para2 = node(`p:${message.get('menuContentAppPara2')}`);
+  appSetting.app.para2 = node(`p:${message.get('menuContentAppPara2') || 'Text'}`);
 
   appSetting.app.link2 = new Link({
     text: message.get('menuContentAppLink2'),

src/component/menuContent/dataSetting/index.js

@@ -160,7 +160,7 @@ dataSetting.clear = (parent) => {
   dataSetting.control.clear.alert = new Alert({
     iconName: 'warning',
     children: [
-      node(`p:${message.get('menuContentDataClearAlertPara')}|class:small`),
+      node(`p:${message.get('menuContentDataClearAlertPara') || 'Text'}|class:small`),
       node('p|class:small', dataSetting.control.clear.link.link())
     ]
   });

src/component/menuContent/index.js

@@ -29,7 +29,7 @@ export const MenuContent = function({
     },
     header: (name) => {
       return node('div|class:menu-item-header', [
-        node('h1:' + name + '|class:menu-item-header-text')
+        node('h1:' + (name || 'Content') + '|class:menu-item-header-text')
       ]);
     },
     form: ({ indent = false } = {}) => {

src/component/menuContent/supportSetting/index.js

@@ -99,7 +99,7 @@ supportSetting.support = (parent) => {
 
   supportSetting.support.para = node('p');
 
-  supportSetting.support.para.innerHTML = message.get('menuContentSupportPara');
+  supportSetting.support.para.innerHTML = message.get('menuContentSupportPara') || 'Text';
 
   supportSetting.support.linkIssue = new Link({
     text: message.get('menuContentSupportLink1'),

src/component/menuNav/index.js

@@ -1,6 +1,7 @@
 import { message } from '../message';
 
 import { Button } from '../button';
+import { Link } from '../link';
 
 import { node } from '../../utility/node';
 import { uppercaseFirstLetter } from '../../utility/uppercaseFirstLetter';
@@ -153,11 +154,17 @@ export const MenuNav = function({
 
         item.sub.forEach((item) => {
 
-          const subLevelLink = node('a:' + message.get(`menuNav${uppercaseFirstLetter(navTop)}SubNav${uppercaseFirstLetter(item)}`) + '|href:#menu-content-item-' + this.makeId(item) + ',class:menu-nav-sub button button-link button-small,tabindex:1');
+          const subLevelLink = new Link({
+            text: message.get(`menuNav${uppercaseFirstLetter(navTop)}SubNav${uppercaseFirstLetter(item)}`),
+            href: '#menu-content-item-' + this.makeId(item),
+            linkButton: true,
+            style: ['link', 'small'],
+            classList: ['menu-nav-sub']
+          });
 
-          subNav.appendChild(subLevelLink);
+          subNav.appendChild(subLevelLink.link());
 
-          navItem.subLevelItem.push(subLevelLink);
+          navItem.subLevelItem.push(subLevelLink.link());
 
         });
 

src/component/message/index.js

@@ -137,7 +137,7 @@ message.get = (stringId) => {
 
   }
 
-  if (string.indexOf('{appName}') > -1) {
+  if (string && string.indexOf('{appName}') > -1) {
 
     string = string.replaceAll('{appName}', APP_NAME);