Use original document views node to open a new document
Used when the active view is a locked node.
This commit is contained in:
+7
-10
@@ -432,20 +432,17 @@ function RootView:get_active_node()
|
|||||||
return self.root_node:get_node_for_view(core.active_view)
|
return self.root_node:get_node_for_view(core.active_view)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Get un unlocked node with at least one view.
|
local function get_main_document_view(node)
|
||||||
local function get_node_unlocked(node)
|
if node.has_documents_view then
|
||||||
if not node.locked and #node.views > 0 then
|
|
||||||
return node
|
return node
|
||||||
end
|
end
|
||||||
if node.type ~= "leaf" then
|
if node.type ~= "leaf" then
|
||||||
local a = get_node_unlocked(node.a)
|
return get_main_document_view(node.a) or get_main_document_view(node.b)
|
||||||
if a then return a end
|
|
||||||
return get_node_unlocked(node.b)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function RootView:get_document_view()
|
function RootView:get_main_document_view()
|
||||||
local node = get_node_unlocked(self.root_node)
|
local node = get_main_document_view(self.root_node)
|
||||||
if node then
|
if node then
|
||||||
return node.views[1]
|
return node.views[1]
|
||||||
end
|
end
|
||||||
@@ -454,8 +451,8 @@ end
|
|||||||
function RootView:open_doc(doc)
|
function RootView:open_doc(doc)
|
||||||
local node = self:get_active_node()
|
local node = self:get_active_node()
|
||||||
if node.locked then
|
if node.locked then
|
||||||
local default_view = self:get_document_view()
|
local default_view = self:get_main_document_view()
|
||||||
assert(default_view, "Cannot find an unlocked node to open the document.")
|
assert(default_view, "internal error: cannot find original document node.")
|
||||||
core.set_active_view(default_view)
|
core.set_active_view(default_view)
|
||||||
node = self:get_active_node()
|
node = self:get_active_node()
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user