Merge lp:~sil/novacut-prototypes/mousewheel-slices into lp:novacut-prototypes

Proposed by Stuart Langridge
Status: Merged
Merged at revision: 19
Proposed branch: lp:~sil/novacut-prototypes/mousewheel-slices
Merge into: lp:novacut-prototypes
Diff against target: 107 lines (+89/-1)
1 file modified
sequence-jderose-1.html (+89/-1)
To merge this branch: bzr merge lp:~sil/novacut-prototypes/mousewheel-slices
Reviewer Review Type Date Requested Status
Novacut Prototypes Dev Pending
Review via email: mp+68003@code.launchpad.net

Description of the change

Allow mousewheel adjustment of the start and end frame of a slice. Hard work done by https://github.com/brandonaaron/jquery-mousewheel/ which is MIT licensed; don't know if that's OK to use.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'sequence-jderose-1.html'
--- sequence-jderose-1.html 2011-07-14 10:28:18 +0000
+++ sequence-jderose-1.html 2011-07-14 18:13:07 +0000
@@ -17,7 +17,84 @@
17}17}
1818
1919
2020/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
21 * Licensed under the MIT License (LICENSE.txt).
22 *
23 * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
24 * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
25 * Thanks to: Seamus Leahy for adding deltaX and deltaY
26 *
27 * Version: 3.0.4
28 *
29 * Requires: 1.2.2+
30 */
31
32(function($) {
33
34var types = ['DOMMouseScroll', 'mousewheel'];
35
36$.event.special.mousewheel = {
37 setup: function() {
38 if ( this.addEventListener ) {
39 for ( var i=types.length; i; ) {
40 this.addEventListener( types[--i], handler, false );
41 }
42 } else {
43 this.onmousewheel = handler;
44 }
45 },
46
47 teardown: function() {
48 if ( this.removeEventListener ) {
49 for ( var i=types.length; i; ) {
50 this.removeEventListener( types[--i], handler, false );
51 }
52 } else {
53 this.onmousewheel = null;
54 }
55 }
56};
57
58$.fn.extend({
59 mousewheel: function(fn) {
60 return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
61 },
62
63 unmousewheel: function(fn) {
64 return this.unbind("mousewheel", fn);
65 }
66});
67
68
69function handler(event) {
70 var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
71 event = $.event.fix(orgEvent);
72 event.type = "mousewheel";
73
74 // Old school scrollwheel delta
75 if ( event.wheelDelta ) { delta = event.wheelDelta/120; }
76 if ( event.detail ) { delta = -event.detail/3; }
77
78 // New school multidimensional scroll (touchpads) deltas
79 deltaY = delta;
80
81 // Gecko
82 if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
83 deltaY = 0;
84 deltaX = -1*delta;
85 }
86
87 // Webkit
88 if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
89 if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
90
91 // Add event and delta to the front of the arguments
92 args.unshift(event, delta, deltaX, deltaY);
93
94 return $.event.handle.apply(this, args);
95}
96
97})(jQuery);
2198
22$(document).ready(function(){99$(document).ready(function(){
23 data.forEach(function(doc){100 data.forEach(function(doc){
@@ -41,6 +118,17 @@
41 div.addClass('selected');118 div.addClass('selected');
42 selected = doc._id;119 selected = doc._id;
43 });120 });
121 div.children("img").mousewheel(function(e, d, dx, dy) {
122 /* if over the top image, adjust start. Otherwise adjust end */
123 if (e.target == $('#' + doc._id + ' :first-child')[0]) {
124 docs[doc._id].start += dy;
125 } else {
126 docs[doc._id].stop += dy;
127 }
128 e.preventDefault();
129 $('#' + doc._id + ' :first-child').attr('src', thumbnail(doc._id, doc.start));
130 $('#' + doc._id + ' :last-child').attr('src', thumbnail(doc._id, doc.stop));
131 });
44132
45 });133 });
46 $('#sequence1').sortable({'axis': 'x', 'opacity': 0.6});134 $('#sequence1').sortable({'axis': 'x', 'opacity': 0.6});

Subscribers

People subscribed via source and target branches