Merge remote-tracking branch 'origin/master' into developer

orchidsoftware · Feb 18, 2018 · 1e0f3f3 · 1e0f3f3
2 parents 402f4ee + 7974d78
commit 1e0f3f3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/resources/assets/js/components/menu.js b/resources/assets/js/components/menu.js
@@ -16,9 +16,9 @@ document.addEventListener('turbolinks:load', function() {
       style: '',
       target: '_self',
       errors: {
-          title: false,
-          label: false,
-          slug: false,
+        title: false,
+        label: false,
+        slug: false,
       },
     },
     methods: {
@@ -40,23 +40,22 @@ document.addEventListener('turbolinks:load', function() {
           slug: false,
         };
 
-        if(!this.title){
-            this.errors.title = valid = true;
+        if (!this.title) {
+          this.errors.title = valid = true;
         }
 
-        if(!this.label){
-            this.errors.label = valid = true;
+        if (!this.label) {
+          this.errors.label = valid = true;
         }
 
-        if(!this.slug){
-            this.errors.slug = valid = true;
+        if (!this.slug) {
+          this.errors.slug = valid = true;
         }
 
         return !valid;
       },
       add: function() {
-
-        if(!this.checkForm()){
+        if (!this.checkForm()) {
           return;
         }
 
@@ -95,9 +94,8 @@ document.addEventListener('turbolinks:load', function() {
         this.load(data);
       },
       save: function() {
-
-        if(!this.checkForm()) {
-            return;
+        if (!this.checkForm()) {
+          return;
         }
 
         $('li[data-id=' + this.id + ']').data({

diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
@@ -47,7 +47,7 @@
     ],
 
     'validation' => [
-        'required' => 'Please fill in the field.'
-    ]
+        'required' => 'Please fill in the field.',
+    ],
 
 ];
diff --git a/resources/lang/ru/common.php b/resources/lang/ru/common.php
@@ -46,10 +46,9 @@
         ],
     ],
 
-
     'validation' => [
-        'required' => 'Пожалуйста заполните поле.'
-    ]
+        'required' => 'Пожалуйста заполните поле.',
+    ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,10 +46,9 @@ @@
             ],
         ],
         'validation' => [
-            'required' => 'Пожалуйста заполните поле.'
-        ]
+            'required' => 'Пожалуйста заполните поле.',
+        ],
@@ Expand Down @@