Now drag and drop works on backlog.

stable
Andrey Antukh 2014-06-20 13:39:05 +02:00
parent ad58f609ce
commit 27c8ba8a92
7 changed files with 735 additions and 41 deletions

View File

@ -79,34 +79,184 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin)
when "bulk" then @rootscope.$broadcast("usform:bulk")
BacklogDirective = ->
BacklogDirective = ($repo) ->
linkSortable = ($scope, $el, $attrs, $ctrl) ->
resortAndSave = ->
toSave = []
for item, i in $scope.userstories
if item.order == i
continue
item.order = i
toSave = _.filter($scope.userstories, (x) -> x.isModified())
$repo.saveAll(toSave).then ->
console.log "FINISHED", arguments
onUpdateItem = (event) ->
console.log "onUpdate", event
item = angular.element(event.item)
itemScope = item.scope()
ids = _.map($scope.userstories, "id")
index = ids.indexOf(itemScope.us.id)
$scope.userstories.splice(index, 1)
$scope.userstories.splice(item.index(), 0, itemScope.us)
resortAndSave()
onAddItem = (event) ->
console.log "BacklogDirective:onAdd", event
item = angular.element(event.item)
itemScope = item.scope()
itemIndex = item.index()
itemScope.us.milestone = null
userstories = $scope.userstories
userstories.splice(itemIndex, 0, itemScope.us)
item.remove()
item.off()
$scope.$apply()
resortAndSave()
onRemoveItem = (event) ->
item = angular.element(event.item)
itemScope = item.scope()
ids = _.map($scope.userstories, "id")
index = ids.indexOf(itemScope.us.id)
console.log "BacklogDirective:onRemove:0:", itemScope.us.id, index
if index != -1
userstories = $scope.userstories
userstories.splice(index, 1)
item.off()
itemScope.$destroy()
console.log "BacklogDirective:onRemove:1:", ids
console.log "BacklogDirective:onRemove:2:", _.map($scope.userstories, "id")
dom = $el.find(".backlog-table-body")
sortable = new Sortable(dom[0], {
group: "Kaka",
selector: ".us-item-row",
onUpdate: onUpdateItem
onAdd: onAddItem
onRemove: onRemoveItem
})
link = ($scope, $el, $attrs) ->
$ctrl = $el.controller()
linkSortable($scope, $el, $attrs, $ctrl)
return {link: link}
BacklogSprintDirective = ($repo) ->
link = ($scope, $el, $attrs) ->
$ctrl = $el.closest("div.wrapper").controller()
console.log $ctrl
sprint = $scope.$eval($attrs.tgBacklogSprint)
if $scope.$first
$el.addClass("sprint-current")
# if sprint.closed
# $el.addClass("sprint-closed")
# Event Handlers
$el.on "click", ".sprint-summary > a", (event) ->
$el.find(".sprint-table").toggle()
$scope.$on "$destroy", ->
$el.off()
# Drag & Drop
resortAndSave = ->
toSave = []
for item, i in $scope.sprint.user_stories
if item.order == i
continue
item.order = i
toSave = _.filter($scope.sprint.user_stories, (x) -> x.isModified())
$repo.saveAll(toSave).then ->
console.log "FINISHED", arguments
onUpdateItem = (event) ->
console.log "onUpdate", event
item = angular.element(event.item)
itemScope = item.scope()
ids = _.map($scope.sprint.user_stories, {"id": itemScope.us.id})
index = ids.indexOf(itemScope.us.id)
$scope.sprint.user_stories.splice(index, 1)
$scope.sprint.user_stories.splice(item.index(), 0, itemScope.us)
resortAndSave()
onAddItem = (event) ->
console.log "onAdd", event
item = angular.element(event.item)
itemScope = item.scope()
itemIndex = item.index()
itemScope.us.milestone = $scope.sprint.id
userstories = $scope.sprint.user_stories
userstories.splice(itemIndex, 0, itemScope.us)
item.remove()
item.off()
$scope.$apply()
resortAndSave()
onRemoveItem = (event) ->
console.log "BacklogSprintDirective:onRemove", event
item = angular.element(event.item)
itemScope = item.scope()
ids = _.map($scope.sprint.user_stories, "id")
index = ids.indexOf(itemScope.us.id)
console.log "BacklogSprintDirective:onRemove:0:", itemScope.us.id, index
if index != -1
userstories = $scope.sprint.user_stories
userstories.splice(index, 1)
item.off()
itemScope.$destroy()
console.log "BacklogSprintDirective:onRemove:1", ids
console.log "BacklogSprintDirective:onRemove:2", _.map($scope.sprint.user_stories, "id")
dom = $el.find(".sprint-table")
sortable = new Sortable(dom[0], {
group: "Kaka",
selector: ".milestone-us-item-row",
onUpdate: onUpdateItem,
onAdd: onAddItem,
onRemove: onRemoveItem,
})
return {link: link}
BacklogSummaryDirective = ->
link = ($scope, $el, $attrs) ->
return {link:link}
BacklogSprintDirective = ->
link = (scope, element, attrs) ->
sprint = scope.$eval(attrs.tgBacklogSprint)
if scope.$first
element.addClass("sprint-current")
if sprint.closed
element.addClass("sprint-closed")
# Event Handlers
element.on "click", ".sprint-summary > a", (event) ->
element.find(".sprint-table").toggle()
return {link: link}
module = angular.module("taigaBacklog")
module.directive("tgBacklog", BacklogDirective)
module.directive("tgBacklogSprint", BacklogSprintDirective)
module.directive("tgBacklog", ["$tgRepo", BacklogDirective])
module.directive("tgBacklogSprint", ["$tgRepo", BacklogSprintDirective])
module.directive("tgBacklogSummary", BacklogSummaryDirective)
module.controller("BacklogController", [

View File

@ -39,8 +39,8 @@ class Model
getIdAttrName: ->
return "id"
getUrl: ->
return "#{$gmUrls.api(@_name)}/#{@.getAttrs()[@.getIdAttrName()]}"
getName: ->
return @._name
getAttrs: (patch=false) ->
if patch
@ -101,7 +101,7 @@ class Model
return JSON.stringify(data)
isModified: () ->
isModified: ->
return this._isModified
markSaved: () ->

View File

@ -29,7 +29,7 @@ class RepositoryService extends taiga.Service
resolveUrlForModel: (model) ->
idAttrName = model.getIdAttrName()
return "#{@urls.resolve(model.name)}/#{model[idAttrName]}"
return "#{@urls.resolve(model.getName())}/#{model[idAttrName]}"
create: (name, data, dataTypes={}, extraParams={}) ->
defered = @q.defer()
@ -45,7 +45,7 @@ class RepositoryService extends taiga.Service
return defered.promise
remove: (model) ->
defered = $q.defer()
defered = @q.defer()
url = @.resolveUrlForModel(model)
promise = @http.delete(url)
@ -57,8 +57,12 @@ class RepositoryService extends taiga.Service
return defered.promise
save: (model, extraParams, patch=true) ->
defered = $q.defer()
saveAll: (models, patch=true) ->
promises = _.map(models, (x) => @.save(x, true))
return @q.all.apply(@q, promises)
save: (model, patch=true) ->
defered = @q.defer()
if not model.isModified() and patch
defered.resolve(model)
@ -86,7 +90,7 @@ class RepositoryService extends taiga.Service
return defered.promise
refresh: (model) ->
defered = $q.defer()
defered = @q.defer()
url = @.resolveUrlForModel(model)
promise = @http.get(url)

538
app/js/Sortable.js Normal file
View File

@ -0,0 +1,538 @@
/**!
* Sortable
* @author RubaXa <trash@rubaxa.org>
* @license MIT
*/
(function (factory){
"use strict";
if( typeof define === "function" && define.amd ){
define(factory);
}
else if( typeof module != "undefined" && typeof module.exports != "undefined" ){
module.exports = factory();
}
else {
window["Sortable"] = factory();
}
})(function (){
"use strict";
var
dragEl
, ghostEl
, rootEl
, nextEl
, lastEl
, lastCSS
, lastRect
, activeGroup
, tapEvt
, touchEvt
, expando = 'Sortable' + (new Date).getTime()
, win = window
, document = win.document
, parseInt = win.parseInt
, _silent = false
, _createEvent = function (event/**String*/, item/**HTMLElement*/){
var evt = document.createEvent('Event');
evt.initEvent(event, true, true);
evt.item = item;
return evt;
}
, noop = function (){}
, slice = [].slice
, touchDragOverListeners = []
;
/**
* @class Sortable
* @param {HTMLElement} el
* @param {Object} [options]
* @constructor
*/
function Sortable(el, options){
this.el = el; // root element
this.options = options = (options || {});
// Defaults
options.group = options.group || Math.random();
options.handle = options.handle || null;
options.draggable = options.draggable || el.children[0] && el.children[0].nodeName || (/[uo]l/i.test(el.nodeName) ? 'li' : '*');
options.ghostClass = options.ghostClass || 'sortable-ghost';
options.onAdd = _bind(this, options.onAdd || noop);
options.onUpdate = _bind(this, options.onUpdate || noop);
options.onRemove = _bind(this, options.onRemove || noop);
// Export group name
el[expando] = options.group;
// Bind all private methods
for( var fn in this ){
if( fn.charAt(0) === '_' ){
this[fn] = _bind(this, this[fn]);
}
}
// Bind events
_on(el, 'add', options.onAdd);
_on(el, 'update', options.onUpdate);
_on(el, 'remove', options.onRemove);
_on(el, 'mousedown', this._onTapStart);
_on(el, 'touchstart', this._onTapStart);
_on(el, 'selectstart', this._onTapStart);
_on(el, 'dragover', this._onDragOver);
_on(el, 'dragenter', this._onDragOver);
touchDragOverListeners.push(this._onDragOver);
}
Sortable.prototype = {
constructor: Sortable,
_applyEffects: function (){
_toggleClass(dragEl, this.options.ghostClass, true);
},
_onTapStart: function (evt/**Event|TouchEvent*/){
var
touch = evt.touches && evt.touches[0]
, target = (touch || evt).target
, options = this.options
, el = this.el
;
if( options.handle ){
target = _closest(target, options.handle, el);
}
target = _closest(target, options.draggable, el);
// IE 9 Support
// if( target && evt.type == 'selectstart' ){
// if( target.tagName != 'A' && target.tagName != 'IMG'){
// target.dragDrop();
// }
// }
if( target && !dragEl && (target.parentNode === el) ){
tapEvt = evt;
target.draggable = true;
// Disable "draggable"
_find(target, 'a', _disableDraggable);
_find(target, 'img', _disableDraggable);
if( touch ){
// Touch device support
tapEvt = {
target: target
, clientX: touch.clientX
, clientY: touch.clientY
};
this._onDragStart(tapEvt, true);
evt.preventDefault();
}
_on(this.el, 'dragstart', this._onDragStart);
_on(this.el, 'dragend', this._onDrop);
_on(document, 'dragover', _globalDragOver);
try {
if( document.selection ){
document.selection.empty();
} else {
window.getSelection().removeAllRanges()
}
} catch (err){ }
}
},
_emulateDragOver: function (){
if( touchEvt ){
_css(ghostEl, 'display', 'none');
var
target = document.elementFromPoint(touchEvt.clientX, touchEvt.clientY)
, parent = target
, group = this.options.group
, i = touchDragOverListeners.length
;
do {
if( parent[expando] === group ){
while( i-- ){
touchDragOverListeners[i]({
clientX: touchEvt.clientX,
clientY: touchEvt.clientY,
target: target,
rootEl: parent
});
}
break;
}
target = parent; // store last element
}
while( parent = parent.parentNode );
_css(ghostEl, 'display', '');
}
},
_onTouchMove: function (evt/**TouchEvent*/){
if( tapEvt ){
var
touch = evt.touches[0]
, dx = touch.clientX - tapEvt.clientX
, dy = touch.clientY - tapEvt.clientY
;
touchEvt = touch;
_css(ghostEl, 'webkitTransform', 'translate3d('+dx+'px,'+dy+'px,0)');
}
},
_onDragStart: function (evt/**Event*/, isTouch/**Boolean*/){
var
target = evt.target
, dataTransfer = evt.dataTransfer
;
rootEl = this.el;
dragEl = target;
nextEl = target.nextSibling;
activeGroup = this.options.group;
if( isTouch ){
var
rect = target.getBoundingClientRect()
, css = _css(target)
, ghostRect
;
ghostEl = target.cloneNode(true);
_css(ghostEl, 'top', rect.top - parseInt(css.marginTop, 10));
_css(ghostEl, 'left', rect.left - parseInt(css.marginLeft, 10));
_css(ghostEl, 'width', rect.width);
_css(ghostEl, 'height', rect.height);
_css(ghostEl, 'opacity', '0.8');
_css(ghostEl, 'position', 'fixed');
_css(ghostEl, 'zIndex', '100000');
rootEl.appendChild(ghostEl);
// Fixing dimensions.
ghostRect = ghostEl.getBoundingClientRect();
_css(ghostEl, 'width', rect.width*2 - ghostRect.width);
_css(ghostEl, 'height', rect.height*2 - ghostRect.height);
// Bind touch events
_on(document, 'touchmove', this._onTouchMove);
_on(document, 'touchend', this._onDrop);
this._loopId = setInterval(this._emulateDragOver, 150);
}
else {
dataTransfer.effectAllowed = 'move';
dataTransfer.setData('Text', target.textContent);
_on(document, 'drop', this._onDrop);
}
setTimeout(this._applyEffects);
},
_onDragOver: function (evt/**Event*/){
if( !_silent && (activeGroup === this.options.group) && (evt.rootEl === void 0 || evt.rootEl === this.el) ){
var
el = this.el
, target = _closest(evt.target, this.options.draggable, el)
;
if( el.children.length === 0 || el.children[0] === ghostEl || (el === evt.target) && _ghostInBottom(el, evt) ){
el.appendChild(dragEl);
}
else if( target && target !== dragEl && (target.parentNode[expando] !== void 0) ){
if( lastEl !== target ){
lastEl = target;
lastCSS = _css(target);
lastRect = target.getBoundingClientRect();
}
var
rect = lastRect
, width = rect.right - rect.left
, height = rect.bottom - rect.top
, floating = /left|right|inline/.test(lastCSS.cssFloat + lastCSS.display)
, skew = (floating ? (evt.clientX - rect.left)/width : (evt.clientY - rect.top)/height) > .5
, isWide = (target.offsetWidth > dragEl.offsetWidth)
, isLong = (target.offsetHeight > dragEl.offsetHeight)
, nextSibling = target.nextSibling
, after
;
_silent = true;
setTimeout(_unsilent, 30);
if( floating ){
after = (target.previousElementSibling === dragEl) && !isWide || (skew > .5) && isWide
} else {
after = (target.nextElementSibling !== dragEl) && !isLong || (skew > .5) && isLong;
}
if( after && !nextSibling ){
el.appendChild(dragEl);
} else {
target.parentNode.insertBefore(dragEl, after ? nextSibling : target);
}
}
}
},
_onDrop: function (evt/**Event*/){
clearInterval(this._loopId);
// Unbind events
_off(document, 'drop', this._onDrop);
_off(document, 'dragover', _globalDragOver);
_off(this.el, 'dragend', this._onDrop);
_off(this.el, 'dragstart', this._onDragStart);
_off(this.el, 'selectstart', this._onTapStart);
_off(document, 'touchmove', this._onTouchMove);
_off(document, 'touchend', this._onDrop);
if( evt ){
evt.preventDefault();
evt.stopPropagation();
if( ghostEl ){
ghostEl.parentNode.removeChild(ghostEl);
}
if( dragEl ){
_toggleClass(dragEl, this.options.ghostClass, false);
if( !rootEl.contains(dragEl) ){
// Remove event
rootEl.dispatchEvent(_createEvent('remove', dragEl));
// Add event
dragEl.dispatchEvent(_createEvent('add', dragEl));
}
else if( dragEl.nextSibling !== nextEl ){
// Update event
dragEl.dispatchEvent(_createEvent('update', dragEl));
}
}
// Set NULL
rootEl =
dragEl =
ghostEl =
nextEl =
tapEvt =
touchEvt =
lastEl =
lastCSS =
activeGroup = null;
}
},
destroy: function (){
var el = this.el, options = this.options;
_off(el, 'add', options.onAdd);
_off(el, 'update', options.onUpdate);
_off(el, 'remove', options.onRemove);
_off(el, 'mousedown', this._onTapStart);
_off(el, 'touchstart', this._onTapStart);
_off(el, 'selectstart', this._onTapStart);
_off(el, 'dragover', this._onDragOver);
_off(el, 'dragenter', this._onDragOver);
//remove draggable attributes
Array.prototype.forEach.call(el.querySelectorAll('[draggable]'), function(el) {
el.removeAttribute('draggable');
});
touchDragOverListeners.splice(touchDragOverListeners.indexOf(this._onDragOver), 1);
this._onDrop();
this.el = null;
}
};
function _bind(ctx, fn){
var args = slice.call(arguments, 2);
return fn.bind ? fn.bind.apply(fn, [ctx].concat(args)) : function (){
return fn.apply(ctx, args.concat(slice.call(arguments)));
};
}
function _closest(el, selector, ctx){
if( selector === '*' ){
return el;
}
else if( el ){
ctx = ctx || document;
selector = selector.split('.');
var
tag = selector.shift().toUpperCase()
, re = new RegExp('\\s('+selector.join('|')+')\\s', 'g')
;
do {
if(
(tag === '' || el.nodeName == tag)
&& (!selector.length || ((' '+el.className+' ').match(re) || []).length == selector.length)
){
return el;
}
}
while( el !== ctx && (el = el.parentNode) );
}
return null;
}
function _globalDragOver(evt){
evt.dataTransfer.dropEffect = 'move';
evt.preventDefault();
}
function _on(el, event, fn){
el.addEventListener(event, fn, false);
}
function _off(el, event, fn){
el.removeEventListener(event, fn, false);
}
function _toggleClass(el, name, state){
if( el ){
if( el.classList ){
el.classList[state ? 'add' : 'remove'](name);
}
else {
var className = (' '+el.className+' ').replace(/\s+/g, ' ').replace(' '+name+' ', '');
el.className = className + (state ? ' '+name : '')
}
}
}
function _css(el, prop, val){
if( el && el.style ){
if( val === void 0 ){
if( document.defaultView && document.defaultView.getComputedStyle ){
val = document.defaultView.getComputedStyle(el, '');
}
else if( el.currentStyle ){
val = el.currentStyle;
}
return prop === void 0 ? val : val[prop];
} else {
el.style[prop] = val + (typeof val === 'string' ? '' : 'px');
}
}
}
function _find(ctx, tagName, iterator){
if( ctx ){
var list = ctx.getElementsByTagName(tagName), i = 0, n = list.length;
if( iterator ){
for( ; i < n; i++ ){
iterator(list[i], i);
}
}
return list;
}
return [];
}
function _disableDraggable(el){
return el.draggable = false;
}
function _unsilent(){
_silent = false;
}
function _ghostInBottom(el, evt){
var last = el.lastElementChild.getBoundingClientRect();
return evt.clientY - (last.top + last.height) > 5; // min delta
}
// Export utils
Sortable.utils = {
on: _on,
off: _off,
css: _css,
find: _find,
bind: _bind,
closest: _closest,
toggleClass: _toggleClass
};
Sortable.version = '0.1.8';
// Export
return Sortable;
});

View File

@ -1,4 +1,4 @@
div.row(ng-repeat="us in userstories")
div.row.us-item-row(ng-repeat="us in userstories track by us.id")
div.user-stories
div.user-story-name
input(type="checkbox", name="")

View File

@ -26,7 +26,7 @@ section.sprints
div.sprint-progress-bar
div.current-progress
div.sprint-table
div.row(ng-repeat="us in sprint.user_stories track by us.id")
div.row.milestone-us-item-row(ng-repeat="us in sprint.user_stories track by us.id")
div.column-us.width-8
a.us-name(href="", title="")
span(tg-bo-ref="us.ref")

View File

@ -41,21 +41,22 @@ paths = {
"app/coffee/modules/locales/*.coffee",
"app/coffee/modules/base/*.coffee",
"app/coffee/modules/resources/*.coffee"]
vendorJsLibs: [
"app/vendor/jquery/dist/jquery.js",
"app/vendor/lodash/dist/lodash.js",
"app/vendor/emoticons/lib/emoticons.js",
"app/vendor/underscore.string/lib/underscore.string.js",
"app/vendor/angular/angular.js",
"app/vendor/angular-route/angular-route.js",
"app/vendor/angular-sanitize/angular-sanitize.js",
"app/vendor/angular-animate/angular-animate.js",
"app/vendor/i18next/i18next.js",
"app/js/Sortable.js"
]
}
# Ordered list of vendor/external libraries.
vendorJsLibs = [
"app/vendor/jquery/dist/jquery.js",
"app/vendor/lodash/dist/lodash.js",
"app/vendor/emoticons/lib/emoticons.js",
"app/vendor/underscore.string/lib/underscore.string.js",
"app/vendor/angular/angular.js",
"app/vendor/angular-route/angular-route.js",
"app/vendor/angular-sanitize/angular-sanitize.js",
"app/vendor/angular-animate/angular-animate.js",
"app/vendor/i18next/i18next.js"
]
##############################################################################
@ -123,7 +124,7 @@ gulp.task "coffee", ->
.pipe(gulp.dest("dist/js/"))
gulp.task "jslibs", ->
gulp.src(vendorJsLibs)
gulp.src(paths.vendorJsLibs)
.pipe(plumber())
.pipe(concat("libs.js"))
.pipe(gulp.dest("dist/js/"))
@ -166,6 +167,7 @@ gulp.task "watch", ->
gulp.watch(paths.jade, ["jade"])
gulp.watch(paths.appStyles, ["scss-lint", "sass", "css"])
gulp.watch(paths.coffee, ["coffee"])
gulp.watch(paths.vendorJsLibs, ["jslibs"])
gulp.watch(paths.locales, ["locales"])