Переглянути джерело

fix select ico and add font prop

Nikolay Suslov 7 роки тому
батько
коміт
c948f99c50

+ 6 - 0
support/client/lib/vwf/model/aframe.js

@@ -402,6 +402,9 @@ define(["module", "vwf/model", "vwf/utility"], function (module, model, utility)
                             aframeObject.setAttribute('side', propertyValue);
                             break;
 
+                        case "font":
+                            aframeObject.setAttribute('font', propertyValue);
+                            break;
 
                         default:
                             value = undefined;
@@ -924,6 +927,9 @@ define(["module", "vwf/model", "vwf/utility"], function (module, model, utility)
                         case "side":
                             value = aframeObject.getAttribute('side');
                             break;
+                        case "font":
+                            value = aframeObject.getAttribute('font');
+                            break;
                     }
                 }
 

+ 15 - 14
support/client/lib/vwf/view/editor-new.js

@@ -234,22 +234,22 @@ define([
                                     )
                                 ]
                             },
-                            {
-                                $cell: true,
-                                $type: "div",
-                                class: "mdc-layout-grid__cell mdc-layout-grid__cell--span-4",
-                                $components: [
+                            // {
+                            //     $cell: true,
+                            //     $type: "div",
+                            //     class: "mdc-layout-grid__cell mdc-layout-grid__cell--span-4",
+                            //     $components: [
                             
-                                    widgets.simpleCard(
-                                        {
-                                            "imgSrc": "vwf/view/lib/images/ui/cylinder_normal.png",
-                                            "imgHeight": "100px",
-                                            "text": "Cylinder"
-                                        }
-                                    )
+                            //         widgets.simpleCard(
+                            //             {
+                            //                 "imgSrc": "vwf/view/lib/images/ui/cylinder_normal.png",
+                            //                 "imgHeight": "100px",
+                            //                 "text": "Cylinder"
+                            //             }
+                            //         )
                                     
-                                ]
-                            }
+                            //     ]
+                            // }
                           
                         ]
                     }
@@ -3017,6 +3017,7 @@ define([
                             ]
                         },
                         widgets.icontoggle({
+                            'styleClass': "mdc-toolbar__icon",
                             'id': "selectNodeSwitch",
                             'label': 'select',
                             'on': JSON.stringify({"content": "radio_button_checked", "label": "Select"}),

+ 1 - 1
support/client/lib/vwf/view/widgets.js

@@ -271,7 +271,7 @@ define(function () {
             return {
                 $cell: true,
                 $type: "i",
-                class: "mdc-icon-toggle material-icons",
+                class: "mdc-icon-toggle material-icons "+ obj.styleClass,
                 role: "button",
                 $text: obj.label,
                 id: obj.id,

+ 2 - 1
support/proxy/vwf.example.com/aframe/atext.vwf.yaml

@@ -5,4 +5,5 @@ type: "a-text"
 properties:
   value:
   color:
-  side:
+  side:
+  font: