Commit ff7e889b authored by Tomáš Peterka's avatar Tomáš Peterka

[renderjs_ui] RJS Header clears buttons when page title or icon is changed

parent 8c5ab2e5
...@@ -143,15 +143,6 @@ ...@@ -143,15 +143,6 @@
sub_header_list = [], sub_header_list = [],
i; i;
if (options.hasOwnProperty("page_title")) {
// if a new page title is specified then we are displaying different
// view so we force-reload all menu buttons
state.main_link = {};
state.right_link = {};
state.right_button = {};
state.left_button = {};
}
// Main title // Main title
if (options.hasOwnProperty("page_title") || options.hasOwnProperty("page_icon")) { if (options.hasOwnProperty("page_title") || options.hasOwnProperty("page_icon")) {
state.main_link = { state.main_link = {
...@@ -165,6 +156,11 @@ ...@@ -165,6 +156,11 @@
state.main_link.url = options[possible_main_link_list[i][0]]; state.main_link.url = options[possible_main_link_list[i][0]];
} }
} }
// if a new page title|icon is specified then we clear all menu buttons
// because the view changed completely
state.right_link = {};
state.right_button = {};
state.left_button = {};
} }
// Left button // Left button
......
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.62564.2001.54681</string> </value> <value> <string>962.1014.20681.8021</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1504882942.48</float> <float>1505297561.5</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment