repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 63095f515bf4d148b28440e4b2ffa583826de819:
path_to: 
revision_to: 

commit 63095f515bf4d148b28440e4b2ffa583826de819
Author: James Baicoianu 
Date:   Tue Mar 31 13:18:01 2020 -0700

    Inventory draggable item fixes

diff --git a/media/assets/webui/apps/inventory/inventory-item-poly.html b/media/assets/webui/apps/inventory/inventory-item-poly.html

--- a/media/assets/webui/apps/inventory/inventory-item-poly.html
+++ b/media/assets/webui/apps/inventory/inventory-item-poly.html
@@ -1,4 +1,4 @@
-      
+      
         
         
{value.displayName}
         
By {value.authorName}
diff --git a/media/assets/webui/apps/inventory/inventory.css b/media/assets/webui/apps/inventory/inventory.css

--- a/media/assets/webui/apps/inventory/inventory.css
+++ b/media/assets/webui/apps/inventory/inventory.css
@@ -1,7 +1,7 @@
 ui-grid.models {
-  height: 40vh;
-  grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
-  grid-template-rows: repeat(auto-fill, minmax(80px, 1fr));
+  height: 20vh;
+  grid-template-columns: repeat(auto-fill, minmax(60px, 1fr));
+  grid-template-rows: repeat(auto-fill, minmax(60px, 1fr));
 }
 ui-grid.models>* {
   height: auto;
@@ -83,4 +83,10 @@ ui-input {
 */
 janus-ui-inventory>ui-tabs>ui-tab {
   height: 40vh;
+  padding: 0;
+}
+janus-ui-inventory ui-flexpanel {
+  padding: 0;
+  max-height: 20vh;
+  width: 100%;
 }
diff --git a/media/assets/webui/apps/inventory/inventory.html b/media/assets/webui/apps/inventory/inventory.html

--- a/media/assets/webui/apps/inventory/inventory.html
+++ b/media/assets/webui/apps/inventory/inventory.html
@@ -1,3 +1,4 @@
+    
Inventory
     
        
-        
-          cube
-          sphere
-          cone
-          cylinder
-          pyramid
-          torus
-          capsule
-          pipe
-          plane
+        
+          cube
+          sphere
+          cone
+          cylinder
+          pyramid
+          torus
+          capsule
+          pipe
+          plane

-          point light
+          point light
         
       
        
         
           
-          
+          
           Load More
         
       
diff --git a/media/assets/webui/apps/inventory/inventory.js b/media/assets/webui/apps/inventory/inventory.js

--- a/media/assets/webui/apps/inventory/inventory.js
+++ b/media/assets/webui/apps/inventory/inventory.js
@@ -1,9 +1,28 @@
 elation.elements.define('janus.ui.inventory', class extends elation.elements.base {
   create() {
-    this.innerHTML = elation.template.get('janus.ui.inventory');
+    //this.innerHTML = elation.template.get('janus.ui.inventory');
+    let elements = elation.elements.fromTemplate('janus.ui.inventory', this);
+
+    console.log('INVENTORY ELEMENTS', elements);
+    if (elements.primitives) {
+      elation.events.add(elements.primitives, 'select', (ev) => this.handlePrimitiveSelect(ev));
+      elation.events.add(elements.polyobjects, 'select', (ev) => this.handleAssetSelect(ev));
+    }
   }
   addSource(name, collection) {
   }
+  handlePrimitiveSelect(ev) {
+    let item = ev.data;
+    elation.events.fire({type: 'assetselect', data: item.url, element: this});
+    ev.preventDefault();
+    ev.stopPropagation();
+  }
+  handleAssetSelect(ev) {
+    let item = ev.data;
+    elation.events.fire({type: 'assetselect', data: item.url, element: this});
+    ev.preventDefault();
+    ev.stopPropagation();
+  }
 });
 elation.elements.define('janus.ui.inventory.item.poly', class extends elation.elements.ui.item {
   create() {
@@ -19,5 +38,6 @@ elation.elements.define('janus.ui.inventory.item.poly', class extends elation.el
     }

     let elements = elation.elements.fromTemplate('janus.ui.inventory.item.poly', this);
+    elation.events.add(this, 'click', (ev) => this.click(ev));
   }
 });

-----END OF PAGE-----