lib/volt/page/tasks.rb in volt-0.9.4.pre3 vs lib/volt/page/tasks.rb in volt-0.9.4.pre5

- old
+ new

@@ -2,16 +2,16 @@ module Volt # The tasks class provides an interface to call tasks on # the backend server. This class is setup as page.task (as a singleton) class Tasks - def initialize(page) - @page = page + def initialize(volt_app) + @volt_app = volt_app @promise_id = 0 @promises = {} - page.channel.on('message') do |*args| + volt_app.channel.on('message') do |*args| received_message(*args) end end def call(class_name, method_name, meta_data, *args) @@ -21,11 +21,11 @@ # Track the callback promise = Promise.new @promises[promise_id] = promise # TODO: Timeout on these callbacks - @page.channel.send_message([promise_id, class_name, method_name, meta_data, *args]) + @volt_app.channel.send_message([promise_id, class_name, method_name, meta_data, *args]) promise end def received_message(name, promise_id, *args) @@ -63,16 +63,16 @@ query_obj.send(method_name, *args) end def reload # Stash the current page value - value = EJSON.stringify($page.page.to_h) + value = EJSON.stringify(Volt.current_app.page.to_h) # If this browser supports session storage, store the page, so it will # be in the same state when we reload. `sessionStorage.setItem('___page', value);` if `sessionStorage` - $page.page._reloading = true + Volt.current_app.page._reloading = true `window.location.reload(false);` end end end