controller: Add config.search_jump_mode, to make search results use f…

…lights #91
OneZoom · Jun 20, 2018 · 97fe44b · 97fe44b
1 parent 66635b8
commit 97fe44b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/OZprivate/rawJS/OZTreeModule/src/controller/controller_search.js b/OZprivate/rawJS/OZTreeModule/src/controller/controller_search.js
@@ -193,10 +193,15 @@ export default function (Controller) {
 
     /**
      * Jump to OZid and record URL of the new location
+     * config.search_jump_mode controls how the movement is performed
      * @param src the OZid of the place we want to jump to
      */
     Controller.prototype.jump_to_OZid = function(OZid) {
-        this.perform_leap_animation(OZid);
+        if (config.search_jump_mode === 'flight') {
+            this.perform_flight_transition(null, OZid);
+        } else {
+            this.perform_leap_animation(OZid);
+        }
         record_url();
     }
 

diff --git a/OZprivate/rawJS/OZTreeModule/src/global_config.js b/OZprivate/rawJS/OZTreeModule/src/global_config.js
@@ -30,6 +30,10 @@ config.generation_on_subbranch_during_fly = 7;
 /** @property {number}  generation_at_searched_node - generation to develop on the searched node if the searched node is an interior node.
  */
 config.generation_at_searched_node = 9;
+
+/** @property {string}  search_jump_mode - How to move to a new node: "flight" or "leap"
+ */
+config.search_jump_mode = "leap";
 
 config.api = {
   /* These configure how API calls are made, and to where.

diff --git a/views/treeviewer/layout.html b/views/treeviewer/layout.html
@@ -985,7 +985,7 @@
         window.polytomy_cut_position_map_json_str, 
         window.cut_threshold,
         window.tree_date);
-    {{=";\n".join(setup_params.get('pre_ui_setup', []))}}
+    {{response.write(";\n".join(setup_params.get('pre_ui_setup', [])), escape=False)}}
     setupUI();
 })
 

diff --git a/views/treeviewer/otop.html b/views/treeviewer/otop.html
@@ -46,6 +46,7 @@
       ']'
     ),
   'pre_ui_setup': [
+    'onezoom.config.search_jump_mode = "flight"',
     'onezoom.config.projection.draw_sponsors = false',
     'onezoom.config.projection.sign_thres = 170'
     ]