pinkman 0.9.4.2 → 0.9.4.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/pinkman_base/controller.coffee +10 -3
- data/lib/pinkman/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 797683a4eb67f989dca3c3bdd663b73086ce4156
|
4
|
+
data.tar.gz: 14d63f14dba4c44b97b6abfe364bf74ff99d36d4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4debf7d79ee461a2a1725f19c9e3714a5491dc60f2aba3edb84be0cca74819e0ad687fbc2660989434cc5d6a4cbe4db28bf468125b80e8ad0f59d4c6669c2fcf
|
7
|
+
data.tar.gz: 71564174d48c0146311fa4a34ee6e13582c2577abfc2f9af50bc8807e8dc6f2913637e4ec66ee717c03edd53be4bb3a38f2e1e040bbd6005072554bdbce0600d
|
@@ -114,10 +114,17 @@ class window.PinkmanController extends window.PinkmanObject
|
|
114
114
|
@action action, 'dragleave', (obj,j,ev) ->
|
115
115
|
options.leave(obj,j,ev if options.leave? and typeof options.leave == 'function')
|
116
116
|
@action action, 'drop', (obj,j,ev) ->
|
117
|
-
|
117
|
+
if Pinkman.dragged?
|
118
|
+
options.drop(obj, j,Pinkman.dragged.obj, Pinkman.dragged.j,ev) if options.drop? and typeof options.drop == 'function'
|
119
|
+
else
|
120
|
+
options.drop(obj,j,ev) if options.drop? and typeof options.drop == 'function'
|
118
121
|
options.files(obj,ev.originalEvent.dataTransfer.files,j) if options.files? and typeof options.files == 'function'
|
119
122
|
|
120
|
-
|
123
|
+
drag: (action,options) ->
|
124
|
+
@action action, 'mousedown', (obj,j,ev) ->
|
125
|
+
j.attr('draggable','true')
|
126
|
+
Pinkman.dragged = new Pinkman.object(obj: obj, j: j, ev: ev)
|
127
|
+
|
121
128
|
isActive: () ->
|
122
129
|
$("##{@id}").length > 0
|
123
130
|
|
@@ -150,7 +157,7 @@ class window.PinkmanAction extends window.PinkmanObject
|
|
150
157
|
if Pinkman.isString(eventName) and $("##{@controller.id}").length
|
151
158
|
action = this
|
152
159
|
$('body').on eventName, action.selector, (ev) ->
|
153
|
-
ev.preventDefault()
|
160
|
+
ev.preventDefault() if eventName != 'keypress' and eventName != 'mousedown'
|
154
161
|
obj = window.Pinkman.closest($(this))
|
155
162
|
action.call(obj,$(this),ev)
|
156
163
|
|
data/lib/pinkman/version.rb
CHANGED