← Back to branch summary

~jstys-z/helioviewer.org/client5

« back to all changes in this revision

Viewing changes to src/js/Media/MovieManagerUI.js

  • Committer: Jeff Stys
  • Date: 2014-12-10 19:09:53 UTC
  • Revision ID: jstys@sesda3.com-20141210190953-r1ak1apvdv244exy
Added beginnings of user interface for SDO Cut-out Service integration.
Fixed typos in VSO integration.
Fixed an uncaught exception.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/js/Media/MovieManagerUI.js
109
109
            baseParams['movieLength'] = formParams['movie-length'];
110
110
        }
111
111
 
 
112
        //console.dir(params);
 
113
        //return false;
 
114
 
112
115
        // Submit request
113
116
        this._queueMovie(params);
114
117
 
117
120
 
118
121
        this.show();
119
122
 
 
123
        //this.hideDialogs();
120
124
        this.building = false;
121
125
    },
122
126
 
236
240
 
237
241
        // ROI selection buttons
238
242
        this._fullViewportBtn.click(function () {
 
243
            self.hide();
239
244
            self._showMovieSettings();
240
245
        });
241
246
 
242
247
        this._selectAreaBtn.click(function () {
243
 
            self._cleanupFunctions = [];
244
 
 
245
 
            if ( helioviewer.drawerLeftOpened ) {
246
 
                self._cleanupFunctions.push('helioviewer.drawerLeftClick()');
247
 
                helioviewer.drawerLeftClick();
248
 
            }
249
 
            self._cleanupFunctions.push('helioviewer.drawerMoviesClick()');
250
 
            helioviewer.drawerMoviesClick();
251
 
 
 
248
            self.hide();
252
249
            $(document).trigger("enable-select-tool",
253
 
                                [$.proxy(self._showMovieSettings, self),
254
 
                                 $.proxy(self._cleanup, self)]);
 
250
                                $.proxy(self._showMovieSettings, self));
255
251
        });
256
252
 
257
253
        // Setup hover and click handlers for movie history items
333
329
        $("#movie-settings-cancel-btn").button().click(function (e) {
334
330
            self._advancedSettings.hide();
335
331
            self._settingsDialog.hide();
336
 
            self.show();
 
332
            //self.show();
337
333
        });
338
334
 
339
335
        // Submit button
533
529
        tags = [];
534
530
 
535
531
        $.each(movie.layers.split("],["), function (i, layerStr) {
536
 
console.error('MovieManagerUI.showYouTubeUploadDialog() assumes 4-level hierarchy in layerStr');
 
532
alert('MovieManagerUI.showYouTubeUploadDialog() assumes 4-level hierarchy in layerStr');
537
533
            var parts = layerStr.replace(']', "").replace('[', "")
538
534
                        .split(",").slice(0, 4);
539
535
 
812
808
                  '&format=flv';
813
809
 
814
810
            return '<div id="movie-player-' + movie.id + '">' +
815
 
                       '<iframe id="movie-player-iframe" src="' + url + '" width="' + width +
 
811
                       '<iframe src="' + url + '" width="' + width +
816
812
                       '" height="' + height + '" marginheight="0" marginwidth="0" ' +
817
 
                       'scrolling="no" frameborder="0" />' +
 
813
                       'scrolling="no" frameborder="0" style="width: 100%; margin-bottom: 2px;" />' +
818
814
                   '</div>' +
819
815
                   '<div style="width:100%;">' +
820
816
                       '<div style="float:left;" class="video-links">' +
873
869
            return false;
874
870
        }
875
871
        return this._super(roi, layerString);
876
 
    },
877
 
 
878
 
    _cleanup: function () {
879
 
        $.each(this._cleanupFunctions, function(i, func) {
880
 
            eval(func);
881
 
        });
882
872
    }
883
873
});