File tree 3 files changed +9
-8
lines changed
3 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -25,18 +25,17 @@ function OrgFiles:new(opts)
25
25
}
26
26
setmetatable (data , self )
27
27
self .__index = self
28
- data :load_sync ()
29
28
return data
30
29
end
31
30
32
31
--- @param force ? boolean Force reload all files
33
- --- @return OrgPromise
32
+ --- @return OrgPromise<OrgFiles>
34
33
function OrgFiles :load (force )
35
34
if not force and self .load_state then
36
35
if self .load_state == ' loading' then
37
36
self :ensure_loaded ()
38
37
end
39
- return Promise .resolve (self . files )
38
+ return Promise .resolve (self )
40
39
end
41
40
42
41
self .load_state = ' loading'
@@ -51,7 +50,7 @@ function OrgFiles:load(force)
51
50
52
51
return Promise .all (actions ):next (function ()
53
52
self .load_state = ' loaded'
54
- return self . files
53
+ return self
55
54
end )
56
55
end
57
56
Original file line number Diff line number Diff line change @@ -48,9 +48,11 @@ function Org:init()
48
48
require (' orgmode.events' ).init ()
49
49
self .highlighter = require (' orgmode.colors.highlighter' ):new ()
50
50
require (' orgmode.colors.highlights' ).define_highlights ()
51
- self .files = require (' orgmode.files' ):new ({
52
- paths = require (' orgmode.config' ).org_agenda_files ,
53
- })
51
+ self .files = require (' orgmode.files' )
52
+ :new ({
53
+ paths = require (' orgmode.config' ).org_agenda_files ,
54
+ })
55
+ :load_sync ()
54
56
self .agenda = require (' orgmode.agenda' ):new ({
55
57
files = self .files ,
56
58
})
Original file line number Diff line number Diff line change 26
26
27
27
function Files .load (callback )
28
28
Files .loader ():load ():next (function (files )
29
- Files .orgfiles = files
29
+ Files .orgfiles = Files . loader (). files
30
30
Files ._build_tags ()
31
31
if callback then
32
32
callback ()
You can’t perform that action at this time.
0 commit comments