Browse Source

Pass label info to the form data, to be drawn in the video.

parisminton 7 years ago
parent
commit
7740698f94
4 changed files with 5 additions and 1 deletions
  1. 1 0
      audiogram/draw-frames.js
  2. 1 0
      audiogram/index.js
  3. 2 0
      client/index.js
  4. 1 1
      client/preview.js

+ 1 - 0
audiogram/draw-frames.js View File

25
 
25
 
26
     renderer.drawFrame(context, {
26
     renderer.drawFrame(context, {
27
       caption: options.caption,
27
       caption: options.caption,
28
+      label: options.label,
28
       waveform: options.waveform[frameNumber],
29
       waveform: options.waveform[frameNumber],
29
       frame: frameNumber
30
       frame: frameNumber
30
     });
31
     });

+ 1 - 0
audiogram/index.js View File

115
       numFrames: self.numFrames,
115
       numFrames: self.numFrames,
116
       frameDir: self.frameDir,
116
       frameDir: self.frameDir,
117
       caption: self.settings.caption,
117
       caption: self.settings.caption,
118
+      label: self.settings.label,
118
       waveform: self.waveform,
119
       waveform: self.waveform,
119
       tick: function() {
120
       tick: function() {
120
         transports.incrementField(self.id, "framesComplete");
121
         transports.incrementField(self.id, "framesComplete");

+ 2 - 0
client/index.js View File

58
 
58
 
59
   var theme = preview.theme(),
59
   var theme = preview.theme(),
60
       caption = preview.caption(),
60
       caption = preview.caption(),
61
+      label = preview.label(),
61
       selection = preview.selection(),
62
       selection = preview.selection(),
62
       file = preview.file();
63
       file = preview.file();
63
 
64
 
86
   }
87
   }
87
   formData.append("theme", JSON.stringify($.extend({}, theme, { backgroundImageFile: null })));
88
   formData.append("theme", JSON.stringify($.extend({}, theme, { backgroundImageFile: null })));
88
   formData.append("caption", caption);
89
   formData.append("caption", caption);
90
+  formData.append("label", label);
89
 
91
 
90
   setClass("loading");
92
   setClass("loading");
91
   d3.select("#loading-message").text("Uploading audio...");
93
   d3.select("#loading-message").text("Uploading audio...");

+ 1 - 1
client/preview.js View File

27
 }
27
 }
28
 
28
 
29
 function _label(_) {
29
 function _label(_) {
30
-  return arguments.length ? (label = _, redraw()) : theme;
30
+  return arguments.length ? (label = _, redraw()) : label;
31
 }
31
 }
32
 
32
 
33
 function _selection(_) {
33
 function _selection(_) {