mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-29 18:30:09 +00:00
Merge branch 'master' of github.com:flynx/ImageGrid
This commit is contained in:
commit
c42db539a1
@ -1950,7 +1950,7 @@ var JournalActions = actions.Actions({
|
|||||||
// for format docs see: .updateJournalableActions(..)
|
// for format docs see: .updateJournalableActions(..)
|
||||||
journal: null,
|
journal: null,
|
||||||
rjournal: null,
|
rjournal: null,
|
||||||
|
// XXX make this a cached prop...
|
||||||
journalable: null,
|
journalable: null,
|
||||||
|
|
||||||
// XXX docs...
|
// XXX docs...
|
||||||
@ -2041,7 +2041,7 @@ var JournalActions = actions.Actions({
|
|||||||
.map(function(action){
|
.map(function(action){
|
||||||
that.on(action+'.pre', 'journal-handler', handler(action))
|
that.on(action+'.pre', 'journal-handler', handler(action))
|
||||||
return action }) }],
|
return action }) }],
|
||||||
|
// XXX unify names (globally) -> .journal<Action>(..) or .<action>Journal(..)
|
||||||
journalPush: ['- System/Journal/Add an item to journal',
|
journalPush: ['- System/Journal/Add an item to journal',
|
||||||
function(data){
|
function(data){
|
||||||
// clear the reverse journal...
|
// clear the reverse journal...
|
||||||
@ -2266,8 +2266,8 @@ module.Journal = ImageGridFeatures.Feature({
|
|||||||
// XXX is this a good idea???
|
// XXX is this a good idea???
|
||||||
['load clear',
|
['load clear',
|
||||||
function(){
|
function(){
|
||||||
delete this.journal
|
this.clearJournal() }],
|
||||||
delete this.rjournal }],
|
|
||||||
// log saved event to journal...
|
// log saved event to journal...
|
||||||
['saved',
|
['saved',
|
||||||
function(res, ...args){
|
function(res, ...args){
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user