ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-29 12:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'apps' of github.com:urbit/urbit into apps

Browse Source
This commit is contained in:
Galen Wolfe-Pauly 2015-08-27 18:09:15 -07:00
commit 0fecaa1d77
6 changed files with 79 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pub/work/src/js/actions/WorkActions.coffee
View File

@ -3,7 +3,7 @@ Persistence = require '../persistence/Persistence.coffee'
{uuid32} = require '../util.coffee'
module.exports =
newItem: (index,_item={}) ->
newItem: ({before,after},_item={}) ->
item =
date_created: Date.now()
date_modified: Date.now()
@ -22,7 +22,7 @@ module.exports =
if item.date_due or item.title or item.description
item.version++
Persistence.put new:item
Dispatcher.handleViewAction {type:'newItem', index, item}
Dispatcher.handleViewAction {type:'newItem', before, after, item}
setItem: ({id,version},key,val) ->
version += 1
@ -37,11 +37,11 @@ module.exports =
removeItem: ({id,version}) ->
if version >= 0
Persistence.put audience:{id,to:[]}
Persistence.put old:{id,dif:set:audience:[]}
Dispatcher.handleViewAction {type:'archiveItem',id}
setAudience: ({id},to) ->
Persistence.put old:{id,dif:audience:to}
Persistence.put old:{id,dif:set:audience:to}
Dispatcher.handleViewAction {type:'setAudienece',id,to}
addComment: ({id,version},val) ->

2
pub/work/src/js/components/FieldComponent.coffee
View File

@ -52,7 +52,7 @@ module.exports = recl
{item,_key,index} = @props
if item.version >= 0
WorkActions.setItem item, _key, val
else WorkActions.newItem index,
else WorkActions.newItem {},
id: item.id
tags: item.tags
audience: item.audience

10
pub/work/src/js/components/ItemComponent.coffee
View File

@ -42,11 +42,11 @@ module.exports = recl
_markDone: (e) ->
WorkActions.setItem @props.item,'done',(not (@props.item.done is true))
getStatus: ->
if @props.item.doer is window.urb.ship
return "owned"
if @props.item.doer is null
return "available"
getStatus: -> switch @props.item.doer
when window.urb.ship then "owned"
when undefined then ""
when null then "available"
else "taken: ~"+@props.item.doer
getAction: -> switch @props.item.doer
when null

11
pub/work/src/js/components/ListComponent.coffee
View File

@ -16,6 +16,7 @@ module.exports = recl
list:WorkStore.getList()
noNew:WorkStore.noNew()
canSort:WorkStore.canSort()
fulllist:WorkStore.getFullList()
listening:WorkStore.getListening()
sorts:WorkStore.getSorts()
filters:WorkStore.getFilters()
@ -65,19 +66,19 @@ module.exports = recl
when 13
e.preventDefault()
return if @state.noNew
{index,item} = i.props
{item} = i.props
after = null; before = null
if window.getSelection().getRangeAt(0).endOffset is 0
# console.log "new", index, "start"
ins = @state.selected
before = item.id
else
# console.log "new", index,"next"
index++
after = item.id
ins = @state.selected+1 # XX consolidate
@setState {selected:ins,select:true}
unless item.ghost
{tags,audience} = item
item = {tags,audience}
WorkActions.newItem index, item
WorkActions.newItem {before,after}, item
# backspace - remove if at 0
when 8
if (window.getSelection().getRangeAt(0).endOffset is 0)

79
pub/work/src/js/main.js
View File

@ -8,8 +8,9 @@ Persistence = require('../persistence/Persistence.coffee');
uuid32 = require('../util.coffee').uuid32;
module.exports = {
newItem: function(index, _item) {
var item, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, ref8;
newItem: function(arg, _item) {
var after, before, item, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, ref8;
before = arg.before, after = arg.after;
if (_item == null) {
_item = {};
}
@ -36,7 +37,8 @@ module.exports = {
}
return Dispatcher.handleViewAction({
type: 'newItem',
index: index,
before: before,
after: after,
item: item
});
},
@ -89,9 +91,13 @@ module.exports = {
id = arg.id, version = arg.version;
if (version >= 0) {
Persistence.put({
audience: {
old: {
id: id,
to: []
dif: {
set: {
audience: []
}
}
}
});
}
@ -107,7 +113,9 @@ module.exports = {
old: {
id: id,
dif: {
audience: to
set: {
audience: to
}
}
}
});
@ -254,7 +262,7 @@ module.exports = recl({
if (item.version >= 0) {
return WorkActions.setItem(item, _key, val);
} else {
return WorkActions.newItem(index, (
return WorkActions.newItem({}, (
obj = {
id: item.id,
tags: item.tags,
@ -510,11 +518,15 @@ module.exports = recl({
return WorkActions.setItem(this.props.item, 'done', !(this.props.item.done === true));
},
getStatus: function() {
if (this.props.item.doer === window.urb.ship) {
return "owned";
}
if (this.props.item.doer === null) {
return "available";
switch (this.props.item.doer) {
case window.urb.ship:
return "owned";
case void 0:
return "";
case null:
return "available";
default:
return "taken: ~" + this.props.item.doer;
}
},
getAction: function() {
@ -728,6 +740,7 @@ module.exports = recl({
list: WorkStore.getList(),
noNew: WorkStore.noNew(),
canSort: WorkStore.canSort(),
fulllist: WorkStore.getFullList(),
listening: WorkStore.getListening(),
sorts: WorkStore.getSorts(),
filters: WorkStore.getFilters(),
@ -803,18 +816,21 @@ module.exports = recl({
}
},
title_keyDown: function(e, i) {
var audience, index, ins, item, last, next, prev, ref1, ref2, tags;
var after, audience, before, index, ins, item, last, next, prev, ref1, tags;
switch (e.keyCode) {
case 13:
e.preventDefault();
if (this.state.noNew) {
return;
}
ref1 = i.props, index = ref1.index, item = ref1.item;
item = i.props.item;
after = null;
before = null;
if (window.getSelection().getRangeAt(0).endOffset === 0) {
ins = this.state.selected;
before = item.id;
} else {
index++;
after = item.id;
ins = this.state.selected + 1;
this.setState({
selected: ins,
@ -828,7 +844,10 @@ module.exports = recl({
audience: audience
};
}
return WorkActions.newItem(index, item);
return WorkActions.newItem({
before: before,
after: after
}, item);
case 8:
if (window.getSelection().getRangeAt(0).endOffset === 0) {
e.preventDefault();
@ -840,7 +859,7 @@ module.exports = recl({
});
}
return WorkActions.removeItem(i.props.item);
} else if (((ref2 = i.props, index = ref2.index, ref2), index > 0) && (prev = this.state.list[i.props.index - 1], prev.version < 0)) {
} else if (((ref1 = i.props, index = ref1.index, ref1), index > 0) && (prev = this.state.list[i.props.index - 1], prev.version < 0)) {
return WorkActions.removeItem(prev);
}
}
@ -1529,6 +1548,9 @@ WorkStore = assign({}, EventEmitter.prototype, {
getUpdated: function() {
return _updated;
},
getFullList: function() {
return _list;
},
getList: function(key) {
var _k, _v, add, c, ghost, i, id, k, len, list, task, v;
list = [];
@ -1550,13 +1572,6 @@ WorkStore = assign({}, EventEmitter.prototype, {
case 'tags':
case 'audience':
return _.intersection(c, _v).length !== 0;
case 'doer':
if (_v.toLowerCase() === 'none') {
_v = null;
} else {
_v = _v.replace(/\~/g, "");
}
return c === _v;
case 'creator':
return c === _v.replace(/\~/g, "");
case 'done':
@ -1601,8 +1616,20 @@ WorkStore = assign({}, EventEmitter.prototype, {
return list;
},
newItem: function(arg) {
var index, item;
index = arg.index, item = arg.item;
var after, before, index, item;
before = arg.before, after = arg.after, item = arg.item;
if (before) {
index = _list.indexOf(before);
if (index === -1) {
index = null;
}
}
if (after) {
index = 1 + _list.indexOf(after);
if (index === 0) {
index = null;
}
}
if (index == null) {
index = _list.length;
}

17
pub/work/src/js/stores/WorkStore.coffee
View File

@ -37,6 +37,7 @@ WorkStore = assign {},EventEmitter.prototype,{
getUpdated: -> _updated
getFullList: -> _list
getList: (key) ->
list = []
for id in _list
@ -50,12 +51,6 @@ WorkStore = assign {},EventEmitter.prototype,{
add = switch _k
when 'tags', 'audience'
_.intersection(c,_v).length isnt 0
when 'doer'
if _v.toLowerCase() is 'none'
_v = null
else
_v = _v.replace(/\~/g, "")
c is _v
when 'creator'
c is _v.replace(/\~/g, "")
when 'done'
@ -77,8 +72,16 @@ WorkStore = assign {},EventEmitter.prototype,{
list.push ghost
list
newItem: ({index,item}) ->
newItem: ({before,after,item}) ->
if before
index = _list.indexOf before
if index is -1 then index = null
if after
index = 1 + _list.indexOf after
if index is 0 then index = null
index ?= _list.length
if item.id is _ghost.id
_ghost.id = uuid32()
unless _tasks[item.id]?