repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 0f0ae56757dbb4653f9dc9b8cc98288be330309d:
path_to: 
revision_to: 

commit 0f0ae56757dbb4653f9dc9b8cc98288be330309d
Author: James Baicoianu 
Date:   Sat Jul 29 16:29:40 2017 -0700

    Added  tag support

diff --git a/scripts/room.js b/scripts/room.js

--- a/scripts/room.js
+++ b/scripts/room.js
@@ -506,7 +506,9 @@ elation.require([
     this.loadRoomAssets = function(roomdata) {
       if (roomdata && roomdata.assets && roomdata.assets.assetlist && roomdata.assets.assetlist.length > 0) {
         elation.engine.assets.loadJSON(roomdata.assets.assetlist, this.baseurl);
-        this.websurfaces = roomdata.assets.websurfaces;
+        if (roomdata.assets.websurfaces) {
+          elation.utils.merge(roomdata.assets.websurfaces, this.websurfaces);
+        }
       }
     }
     this.clear = function() {
@@ -794,6 +796,11 @@ elation.require([
             'col': args.col, //(args.col ? new THREE.Color().setRGB(args.col[0], args.col[1], args.col[2]) : new THREE.Color(0xffffff)),
           }, objectargs);
           break;
+        case 'janusparagraph':
+          elation.utils.merge({
+            'text': args.text || args._content || '',
+          }, objectargs);
+          break;
         case 'janusportal':
           // If it's an absolute URL or we have a translator for this URL type, use the url unmodified.  Otherwise, treat it as relative
           if (args.url) {

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