Index: frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/iframe/widgets.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/iframe/widgets.js	(revision 38387)
+++ frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/iframe/widgets.js	(revision )
@@ -679,6 +679,25 @@
     });
     Hippo.ChannelManager.TemplateComposer.IFrame.UI.Factory.register('HST.vBox', Hippo.ChannelManager.TemplateComposer.IFrame.UI.Container.VerticalBox);
 
+    Hippo.ChannelManager.TemplateComposer.IFrame.UI.Container.HorizontalBox = Hippo.ChannelManager.TemplateComposer.IFrame.UI.Container.Base.extend({
+
+        init : function(id, element, resources) {
+            this._super(id, element, resources);
+
+            this.sel.append.item = this.sel.container + ' > div.' + this.cls.item;
+            this.sel.append.container = this.sel.container;
+            this.sel.append.insertAt = this.sel.container + ' > div';
+
+            this.direction = HST.DIR.HORIZONTAL;
+        },
+
+        createItemElement : function(element) {
+            return $('<div class="' + this.cls.item + '"></div>').append(element);
+        }
+
+    });
+    Hippo.ChannelManager.TemplateComposer.IFrame.UI.Factory.register('HST.hBox', Hippo.ChannelManager.TemplateComposer.IFrame.UI.Container.HorizontalBox);
+
     Hippo.ChannelManager.TemplateComposer.IFrame.UI.Container.Span = Hippo.ChannelManager.TemplateComposer.IFrame.UI.Container.Base.extend({
 
         init : function(id, element, resources) {
\ No newline at end of file
Index: frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/iframe/factory.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/iframe/factory.js	(revision 38387)
+++ frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/iframe/factory.js	(revision )
@@ -165,7 +165,7 @@
             getContainerMetaData : function(element) {
                 var childNodes, children, i, descendants, j, len, childrenLen, descendantsLen, hstMetaData, tmpElement;
 
-                if (element.className === HST.CLASS.ITEM) {
+                if ($(element).hasClass(HST.CLASS.ITEM)) {
                     if (element.tagName === 'TR') {
                         children = element.childNodes;
                         childNodes = [];
@@ -190,7 +190,7 @@
                             iframeToHost.exception(this.resources['factory-error-parsing-hst-data'].format(childNodes[i].data, Hippo.Util.getElementPath(element)) + ' ' + e);
                         }
                     }
-                } else if (element.className === HST.CLASS.CONTAINER) {
+                } else if ($(element).hasClass(HST.CLASS.CONTAINER)) {
                     tmpElement = element;
                     while (tmpElement.previousSibling !== null) {
                         tmpElement = tmpElement.previousSibling;