Fix the Emscripten build.

alialib · Oct 2, 2020 · c5372ad · c5372ad
1 parent b8e2935
commit c5372ad
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 45 deletions.
diff --git a/examples/asm-dom/demos/context.cpp b/examples/asm-dom/demos/context.cpp
@@ -20,7 +20,7 @@ void
 internal_app_ui(app_context ctx)
 {
     dom::text(ctx,
-        alia::printf(ctx, "Welcome, %s!", get_object<username_tag>(ctx)));
+        alia::printf(ctx, "Welcome, %s!", get<username_tag>(ctx)));
 }
 
 // Our top-level UI function takes the context that the asm-dom wrapper provides

diff --git a/examples/asm-dom/dom.cpp b/examples/asm-dom/dom.cpp
@@ -29,7 +29,7 @@ install_element_callback(
     char const* event_type)
 {
     auto external_id = externalize(&data.identity);
-    auto* system = &get_object<system_tag>(ctx);
+    auto* system = &get<system_tag>(ctx);
     data.callback = [=](emscripten::val v) {
         dom_event event(v);
         dispatch_targeted_event(*system, event, external_id);
@@ -73,7 +73,7 @@ text_node_(dom::context ctx, readable<string> text)
         data->node.object.create_as_text_node("");
     if (is_refresh_event(ctx))
     {
-        refresh_tree_node(get_object<tree_traversal_tag>(ctx), data->node);
+        refresh_tree_node(get<tree_traversal_tag>(ctx), data->node);
         refresh_signal_shadow(
             data->value_id,
             text,

diff --git a/examples/asm-dom/dom.hpp b/examples/asm-dom/dom.hpp
@@ -153,7 +153,7 @@ struct element_handle : noncopyable
         if (initializing_)
             node_->object.create_as_element(type);
         if (is_refresh_event(ctx))
-            refresh_tree_node(get_object<tree_traversal_tag>(ctx), *node_);
+            refresh_tree_node(get<tree_traversal_tag>(ctx), *node_);
     }
 
     template<class Value>
@@ -238,7 +238,7 @@ struct scoped_element : noncopyable
         if (initializing_)
             node_->object.create_as_element(type);
         if (is_refresh_event(ctx))
-            tree_scoping_.begin(get_object<tree_traversal_tag>(ctx), *node_);
+            tree_scoping_.begin(get<tree_traversal_tag>(ctx), *node_);
         return *this;
     }
 
@@ -364,46 +364,6 @@ struct scoped_div : scoped_element
     }
 };
 
-struct cached_content_data
-{
-    component_container_ptr container;
-    tree_caching_data<element_object> caching;
-};
-
-template<class Context, class Function>
-void
-cached_content(Context ctx, id_interface const& id, Function&& fn)
-{
-    cached_content_data* data;
-    if (get_data(ctx, &data))
-        data->container.reset(new component_container);
-
-    scoped_component_container container(ctx, &data->container);
-
-    scoped_tree_cacher<element_object> cacher;
-
-    bool content_traversal_required;
-    if (is_refresh_event(ctx))
-    {
-        cacher.begin(
-            get_object<tree_traversal_tag>(ctx),
-            data->caching,
-            id,
-            container.is_dirty());
-        content_traversal_required = cacher.content_traversal_required();
-    }
-    else
-    {
-        content_traversal_required = container.is_on_route();
-    }
-
-    ALIA_EVENT_DEPENDENT_IF(content_traversal_required)
-    {
-        fn(ctx);
-    }
-    ALIA_END
-}
-
 struct system
 {
     std::function<void(dom::context)> controller;

diff --git a/src/alia/flow/content_caching.hpp b/src/alia/flow/content_caching.hpp
@@ -4,6 +4,7 @@
 #include <alia/context/interface.hpp>
 #include <alia/flow/components.hpp>
 #include <alia/flow/data_graph.hpp>
+#include <alia/flow/events.hpp>
 
 namespace alia {