Index: trunk/phase3/js2/mwEmbed/libSequencer/mvPlayList.js |
— | — | @@ -180,6 +180,9 @@ |
181 | 181 | } |
182 | 182 | this.cur_clip.embed.showShare( embed_code ); |
183 | 183 | }, |
| 184 | + timedTextSources:function(){ |
| 185 | + return false; |
| 186 | + }, |
184 | 187 | getPlaylist:function(){ |
185 | 188 | js_log("f:getPlaylist: " + this.srcType ); |
186 | 189 | //@@todo lazy load plLib |
Index: trunk/phase3/js2/mwEmbed/libClipEdit/mvClipEdit.js |
— | — | @@ -524,7 +524,7 @@ |
525 | 525 | '<a href="#" class="mv_crop_msg">' + gM('mv_crop') + '</a> '+ |
526 | 526 | '<span style="display:none" class="mv_crop_msg_load">' + gM('mwe-loading_txt') + '</span> '+ |
527 | 527 | '<a href="#" style="display:none" class="mv_apply_crop">' + gM('mv_apply_crop') + '</a> '+ |
528 | | - '<a href="#" style="display:none" class="mv_rest_crop">' + gM('mv_reset_crop') + '</a> '+ |
| 528 | + '<a href="#" style="display:none" class="mv_reset_crop">' + gM('mv_reset_crop') + '</a> '+ |
529 | 529 | '<hr style="clear:both"/><br>'+ |
530 | 530 | '<span style="float:left;">Layout:</span>' + |
531 | 531 | '<input type="radio" name="mv_layout" id="mv_layout_left" style="float:left"><div id="mv_layout_left_img" title="'+gM('mv_layout_left')+'"/>'+ |
— | — | @@ -539,7 +539,7 @@ |
540 | 540 | '<div class="mv_edit_button mv_scale_button_base" id="mv_scale_button" alt="crop" title="'+gM('mv_scale')+'"></div>'+ |
541 | 541 | '<a href="#" class="mv_scale_msg">' + gM('mv_scale') + '</a><br>'+ |
542 | 542 | '<a href="#" style="display:none" class="mv_apply_scale">' + gM('mv_apply_scale') + '</a> '+ |
543 | | - '<a href="#" style="display:none" class="mv_rest_scale">' + gM('mv_reset_scale') + '</a><br> '+ |
| 543 | + '<a href="#" style="display:none" class="mv_reset_scale">' + gM('mv_reset_scale') + '</a><br> '+ |
544 | 544 | |
545 | 545 | */ |
546 | 546 | //add bindings: |
— | — | @@ -570,8 +570,8 @@ |
571 | 571 | _this.enableCrop(); |
572 | 572 | } |
573 | 573 | }); |
574 | | - $j('.mv_rest_crop').click(function(){ |
575 | | - $j('.mv_apply_crop,.mv_rest_crop').hide(); |
| 574 | + $j('.mv_reset_crop').click(function(){ |
| 575 | + $j('.mv_apply_crop,.mv_reset_crop').hide(); |
576 | 576 | $j('.mv_crop_msg').show(); |
577 | 577 | $j('#mv_crop_button').removeClass('mv_crop_button_selected').addClass('mv_crop_button_base').attr('title',gM('mv_crop')); |
578 | 578 | _this.rObj.crop=null; |
— | — | @@ -627,7 +627,7 @@ |
628 | 628 | $j('.mv_crop_msg_load').show(); |
629 | 629 | var doEnableCrop = function(){ |
630 | 630 | $j('.mv_crop_msg_load').hide(); |
631 | | - $j('.mv_rest_crop,.mv_apply_crop').show(); |
| 631 | + $j('.mv_reset_crop,.mv_apply_crop').show(); |
632 | 632 | $j('#mv_crop_button').removeClass('mv_crop_button_base').addClass('mv_crop_button_selected').attr('title',gM('mv_crop_done')); |
633 | 633 | $j('#' + _this.clip_disp_ct + ' img').Jcrop({ |
634 | 634 | onSelect: function(c){ |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/styles.css |
— | — | @@ -739,4 +739,122 @@ |
740 | 740 | height:10px; |
741 | 741 | position:absolute; |
742 | 742 | left:-1px; |
743 | | -} |
\ No newline at end of file |
| 743 | +} |
| 744 | + |
| 745 | + |
| 746 | +/*** player styles ***/ |
| 747 | + |
| 748 | +.k-player { width:400px; height:340px; position:relative;} /* inline via jq */ |
| 749 | +.k-player * { padding:0; margin:0;} /* inline via jq */ |
| 750 | + .k-edit-bar { } |
| 751 | + .k-edit-bar a { width:33px; padding: 1px 0 0; display:block; text-align:center; font-weight:bold; color:#888; text-decoration:none; background:#F2F2F2;} |
| 752 | + |
| 753 | + .k-video { width:400px; height:300px; background:#000; margin-bottom:1px;} /* h & w inline via jq */ |
| 754 | + .k-control-bar { height:21px; padding: 2px 0 0 6px; border:none; margin-top:1px; background: url(images/ksprite.png) repeat-x 0 -81px; font: normal 11px arial,sans-serif; color:#555;} |
| 755 | + .k-control-bar button, .k-control-bar div.ui-slider, .k-control-bar div.k-timer { float:left;} |
| 756 | + .k-timer { width:36px; margin-top:2px; overflow:hidden;} |
| 757 | + .k-volume-slider { width:26px;} |
| 758 | + .k-control-bar .k-options { width:50px; height:22px; margin-top:-2px; border: solid 1px #aaa !important; border-top:none; float:right; font: bold 11px arial,sans-serif; color:#555;} |
| 759 | + .k-player span.ui-icon.ui-icon-k-menu { width:auto; padding-left:2px; text-indent:0; background:none; outline:none; cursor:default;} |
| 760 | + |
| 761 | + .k-menu { width:400px; height:300px; border:none; background:#181818; position:absolute; top:0; left:0; z-index:999; display:none} /* h, w, top inline via jq top:15px*/ |
| 762 | + ul.k-menu-bar{ height:128px; padding: 0 0 5px;position:absolute; bottom:5px;right:0px; list-style: none outside none; background: url(images/ksprite.png) -99px -104px no-repeat;} /* eventually: mtop inline via jq */ |
| 763 | + .k-menu-bar li a { display:block; width:49px; height:32px; margin-left:1px; text-indent:99999px; background: url(images/ksprite.png) -51px -110px no-repeat; overflow:hidden;} |
| 764 | + .k-menu-bar li a:hover { background-position: -1px -110px;} |
| 765 | + .k-menu-bar li.k-download-btn a { background-position: -51px -141px;} |
| 766 | + .k-menu-bar li.k-download-btn a:hover { background-position: -1px -141px;} |
| 767 | + .k-menu-bar li.k-share-btn a { background-position: -51px -172px;} |
| 768 | + .k-menu-bar li.k-share-btn a:hover { background-position: -1px -172px;} |
| 769 | + .k-menu-bar li.k-credits-btn a { background-position: -51px -203px;} |
| 770 | + .k-menu-bar li.k-credits-btn a:hover { background-position: -1px -203px;} |
| 771 | + |
| 772 | +.k-menu-screens { width:320px; padding: 13px 10px 15px 15px; float:left;} /* w & h inline via jq */ |
| 773 | + .k-menu-screens h2 { padding: 0 0 5px 1px; clear:both; font-size:12px; color:#666;} |
| 774 | + .k-menu-screens p { margin: 6px 0;} |
| 775 | + .k-menu-screens a { ;} |
| 776 | + .k-menu-screens a img { border:none;} |
| 777 | + .k-menu-screens ul { padding:0; margin: 6px 0 0; list-style: none outside none;} |
| 778 | + |
| 779 | +.k-edit-screen { width:370px; height:223px; padding-top:77px; text-align:center; background:#181818; color:#fff;} |
| 780 | + .k-edit-screen div { } |
| 781 | + .k-edit-screen a { color:#7BB8FC;} |
| 782 | + .k-edit-screen a img { border:none;} |
| 783 | + |
| 784 | +/* end player */ |
| 785 | + |
| 786 | +.k-slide-window { overflow:hidden;} |
| 787 | +.k-screen.k-credits ul { float:left;} |
| 788 | +.k-screen.k-credits li { height:39px; padding: 11px 11px 11px 11px; margin-bottom:12px; display:block; background:#333;} |
| 789 | + .k-screen.k-credits li a { padding:0; background:none;} |
| 790 | + .k-screen.k-credits li img { float:left; background:blue;} |
| 791 | + .k-screen.k-credits li div { height:39px; padding-left:11px; floats:left; overflow:hidden;} |
| 792 | + |
| 793 | + a.k-prev-credit, a.k-next-credit { width:65px; height:28px; margin: -13px auto -6px; display:block; background: url(images/ksprite.png) 0px -320px no-repeat;} |
| 794 | + a.k-next-credit { margin: 0 0 1px; position:absolute; bottom:0; background-position: -0px -290px;} |
| 795 | + a:hover.k-prev-credit { background-position: 0px -238px;} |
| 796 | + a:hover.k-next-credit { background-position: 0px -260px;} |
| 797 | + |
| 798 | + .k-logo { margin:8px 0 0 1px; display:block;} |
| 799 | + |
| 800 | + .k_field_wrap { border: solid 1px #444; margin-bottom:7px;} |
| 801 | + .k-screen.k-share button { width:70px; padding:2px 5px 3px; border:1px solid #000; float:right; background: #D4D4D4 url(images/ksprite.png) no-repeat -32px 0; color:#000; float:right;} |
| 802 | + .k-menu textarea { width:100%; height:15px; border: solid 2px #000; border-bottom:none; border-right:none; background:transparent; color:#ccc; overflow:hidden;} |
| 803 | + |
| 804 | + .k-screen.k-share div.ui-state-highlight { width:90px; padding:2px 5px; border-color:#554926; float:left; background:none; color:#FFE96E;} |
| 805 | + .k-screen.k-share div.ui-state-highlight a { color:#FFE96E; font-weight:bold;} |
| 806 | + .k-screen.k-share div.ui-state-highlight a:hover { } |
| 807 | + |
| 808 | +.k-menu-screens li { height:14px; margin-bottom:6px;} |
| 809 | +.k-menu-screens li a { padding-left:22px; background:url(images/ksprite.png) no-repeat -85px -274px; text-decoration:none;} |
| 810 | +.k-menu-screens li a.active, .k-menu-screens li a:hover.active { background-position: -85px -247px;} |
| 811 | +.k-menu-screens li a:hover { background-position: -85px -260px;} |
| 812 | + |
| 813 | +.k-options.ui-state-hover { color:blue;} |
| 814 | + |
| 815 | +.k-players { display:none} |
| 816 | +.k-credits { display:nones} |
| 817 | + |
| 818 | +.k-player .ui-state-default .ui-icon, .k-player .ui-state-hover .ui-icon { background: url(images/ksprite.png) no-repeat 0 -48px;} |
| 819 | +.k-player .ui-state-default .ui-icon-play { background:url(images/ksprite.png) no-repeat 0 0;} |
| 820 | +.k-player .ui-state-hover .ui-icon-play { background-position: -16px 0;} |
| 821 | + |
| 822 | +.k-player .ui-state-default .ui-icon-pause { background:url(images/ksprite.png) no-repeat 0 -17px;} |
| 823 | +.k-player .ui-state-hover .ui-icon-pause { background-position: -16px -17px;} |
| 824 | + |
| 825 | + .k-player .ui-state-default .ui-icon-arrow-4-diag { background-position: 0 -32px;} /* fullscreen */ |
| 826 | + .k-player .ui-state-hover .ui-icon-arrow-4-diag { background-position: -16px -32px;} |
| 827 | + .k-player .ui-state-default .ui-icon-volume-on, .k-player .ui-state-hover .ui-icon-volume-off, { margin-left:-6px; background-position: -16px -48px;} |
| 828 | + .k-player .ui-state-hover .ui-icon-volume-on, .k-player .ui-state-default .ui-icon-volume-off { margin-left:-6px; background-position: 0 -48px;} |
| 829 | + |
| 830 | + .k-control-bar .ui-slider { height:8px; border: solid 1px #eee; margin: 4px 10px 0 7px; position:relative; background:url(images/ksprite.png) repeat-x 0 -350px;} |
| 831 | + .k-control-bar .ui-slider-handle { width:8px; height:8px; border: solid 1px #888; margin: -1px 0 0 -5px; display:block; position:relative; top:0; background: url(images/ksprite.png) no-repeat -67px -341px; position:absolute;} |
| 832 | + .k-control-bar .ui-slider-range { height:8px; position:absolute; background: url(images/ksprite.png) repeat-x 0 -368px; -moz-border-radius:5px; -webkit-border-radius:5px;} |
| 833 | + .k-control-bar .ui-slider-buffer { height:8px; position:absolute; background: url(images/ksprite.png) repeat-x 0 -359px; -moz-border-radius:5px; -webkit-border-radius:5px;} |
| 834 | + |
| 835 | + .k-control-bar .ui-slider.k-volume-slider { height:15px; margin: 2px 3px 0 -4px; /* ie = m: 3 3 0 -2 */ border:none; background-position: -66px -323px; -moz-border-radius:0px; -webkit-border-radius:0px;} |
| 836 | + .k-control-bar .k-volume-slider a.ui-slider-handle { width:8px; height:18px; margin: -3px 5px 0 -1px; border:none; display:block; position:absolute; background:none;} |
| 837 | + .k-control-bar .k-volume-slider a:hover.ui-slider-handle { border: solid 1px #999;} |
| 838 | + .k-control-bar .k-volume-slider .ui-slider-range { height:17px; position:absolute; background: url(images/ksprite.png) repeat-x -66px -306px; -moz-border-radius:0; -webkit-border-radius:0;} |
| 839 | + |
| 840 | + .play-btn-large { width:120px; height:55px; border:none; background: url(images/ksprite.png) no-repeat 28px -433px; position:absolute; cursor:pointer;} /*.ui-state-default */ |
| 841 | + .play-btn-large.ui-state-hover { background: url(images/ksprite.png) no-repeat 28px -377px; } |
| 842 | + |
| 843 | + .k-volume.ui-state-hover { margin-left:6px; } |
| 844 | + |
| 845 | + |
| 846 | + /* redmond overrides */ |
| 847 | + .k-player button.ui-state-default, button.ui-state-hover { background:none; border:none;} |
| 848 | + |
| 849 | + /* end redmond overrides*/ |
| 850 | + |
| 851 | + |
| 852 | + /* move to ie css */ |
| 853 | + .k-volume-slider span, span.ui-icon-play, span.ui-icon-volume-on, button.k-fullscreen { *margin-top:-1px;} |
| 854 | + span.ui-icon-volume-on { *margin-left:0 !important;} |
| 855 | + .ui-state-hover.k-volume { *margin-left:0 !important;} |
| 856 | + span.ui-icon-k-menu { *margin-top:3px;} |
| 857 | + .k-control-bar .ui-slider.k-volume-slider { *margin-left:-2px;} |
| 858 | + /* end css */ |
| 859 | + |
| 860 | + |
| 861 | +/*** end player ***/ |
\ No newline at end of file |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-icons_454545_256x240.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-icons_454545_256x240.png |
___________________________________________________________________ |
Added: svn:mime-type |
744 | 862 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-icons_cd0a0a_256x240.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-icons_cd0a0a_256x240.png |
___________________________________________________________________ |
Added: svn:mime-type |
745 | 863 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-icons_2e83ff_256x240.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-icons_2e83ff_256x240.png |
___________________________________________________________________ |
Added: svn:mime-type |
746 | 864 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ksprite.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ksprite.png |
___________________________________________________________________ |
Added: svn:mime-type |
747 | 865 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_glass_55_fbf9ee_1x400.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_glass_55_fbf9ee_1x400.png |
___________________________________________________________________ |
Added: svn:mime-type |
748 | 866 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_glass_75_dadada_1x400.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_glass_75_dadada_1x400.png |
___________________________________________________________________ |
Added: svn:mime-type |
749 | 867 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/kaltura_open_source_video_platform.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/kaltura_open_source_video_platform.png |
___________________________________________________________________ |
Added: svn:mime-type |
750 | 868 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_flat_75_ffffff_40x100.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_flat_75_ffffff_40x100.png |
___________________________________________________________________ |
Added: svn:mime-type |
751 | 869 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_glass_65_ffffff_1x400.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_glass_65_ffffff_1x400.png |
___________________________________________________________________ |
Added: svn:mime-type |
752 | 870 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/kaltura_open_source_video_platform.gif |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/kaltura_open_source_video_platform.gif |
___________________________________________________________________ |
Added: svn:mime-type |
753 | 871 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_glass_95_fef1ec_1x400.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_glass_95_fef1ec_1x400.png |
___________________________________________________________________ |
Added: svn:mime-type |
754 | 872 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-icons_888888_256x240.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-icons_888888_256x240.png |
___________________________________________________________________ |
Added: svn:mime-type |
755 | 873 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_highlight-soft_75_cccccc_1x100.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_highlight-soft_75_cccccc_1x100.png |
___________________________________________________________________ |
Added: svn:mime-type |
756 | 874 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/Thumbs.db |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/Thumbs.db |
___________________________________________________________________ |
Added: svn:mime-type |
757 | 875 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_flat_0_aaaaaa_40x100.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_flat_0_aaaaaa_40x100.png |
___________________________________________________________________ |
Added: svn:mime-type |
758 | 876 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-icons_222222_256x240.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-icons_222222_256x240.png |
___________________________________________________________________ |
Added: svn:mime-type |
759 | 877 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_glass_75_e6e6e6_1x400.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/phase3/js2/mwEmbed/skins/mvpcf/images/ui-bg_glass_75_e6e6e6_1x400.png |
___________________________________________________________________ |
Added: svn:mime-type |
760 | 878 | + application/octet-stream |
Index: trunk/phase3/js2/mwEmbed/skins/kskin/styles.css |
— | — | @@ -18,14 +18,14 @@ |
19 | 19 | .k-menu-bar li a { display:block; width:49px; height:32px; margin-left:1px; text-indent:99999px; background: url(images/ksprite.png) -51px -110px no-repeat; overflow:hidden;}
|
20 | 20 | .k-menu-bar li a:hover { background-position: -1px -110px;}
|
21 | 21 | |
22 | | -.k-menu-bar li.k-download-btn a { background-position: -51px -141px;}
|
23 | | -.k-menu-bar li.k-download-btn a:hover { background-position: -1px -141px;} |
| 22 | +.k-menu-bar li.k-download-btn a { background-position: -51px -203px;}
|
| 23 | +.k-menu-bar li.k-download-btn a:hover { background-position: -1px -203px;} |
24 | 24 |
|
25 | 25 | .k-menu-bar li.k-share-btn a { background-position: -51px -172px;}
|
26 | 26 | .k-menu-bar li.k-share-btn a:hover { background-position: -1px -172px;} |
27 | 27 |
|
28 | | -.k-menu-bar li.k-credits-btn a { background-position: -51px -203px;}
|
29 | | -.k-menu-bar li.k-credits-btn a:hover { background-position: -1px -203px;}
|
| 28 | +.k-menu-bar li.k-credits-btn a { background-position: -51px -141px;}
|
| 29 | +.k-menu-bar li.k-credits-btn a:hover { background-position: -1px -141px;}
|
30 | 30 |
|
31 | 31 | .k-menu-screens { width:320px; padding: 13px 10px 15px 15px; float:left;} /* w & h inline via jq */
|
32 | 32 | .k-menu-screens h2 { padding: 0 0 5px 1px; clear:both; font-size:12px; color:#666;}
|
Index: trunk/phase3/js2/mwEmbed/mv_embed.js |
— | — | @@ -28,7 +28,7 @@ |
29 | 29 | * @@ more config valuse on the way ;) |
30 | 30 | */ |
31 | 31 | var defaultMwConfig = { |
32 | | - 'skin_name': 'kskin', |
| 32 | + 'skin_name': 'mvpcf', |
33 | 33 | 'video_size':'400x300' |
34 | 34 | } |
35 | 35 | |
— | — | @@ -62,7 +62,7 @@ |
63 | 63 | } |
64 | 64 | |
65 | 65 | //setup the skin path: |
66 | | -var mv_jquery_skin_path = mv_embed_path + 'jquery/jquery.ui/themes/base/'; |
| 66 | +var mv_jquery_skin_path = mv_embed_path + 'jquery/jquery.ui/themes/redmond/'; |
67 | 67 | var mv_skin_img_path = mv_embed_path + 'skins/' + mwConfig['skin_name'] + '/images/'; |
68 | 68 | var mv_default_thumb_url = mv_skin_img_path + 'vid_default_thumb.jpg'; |
69 | 69 | |
Index: trunk/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js |
— | — | @@ -134,17 +134,16 @@ |
135 | 135 | }; |
136 | 136 | |
137 | 137 | //check for close_captions tracks: |
138 | | - if( ( embedObj.roe || embedObj.timedTextSources() ) |
| 138 | + if( ( embedObj.roe || embedObj.timedTextSources() ) |
139 | 139 | && embedObj.show_meta_link ) |
140 | 140 | this.supports['closed_captions']=true; |
141 | 141 | |
142 | 142 | var o=''; |
143 | | - //get the length of the scruber |
| 143 | + //get the length of the play_head |
144 | 144 | this.player_head_length = embedObj.playerPixelWidth(); |
145 | 145 | for( var i in this.components ){ |
146 | 146 | if( this.supports[i] ){ |
147 | 147 | if( i != 'play_head'){ |
148 | | - js_log(this.player_head_length + ' - ph: ' + this.components[i].w ); |
149 | 148 | this.player_head_length -= this.components[i].w; |
150 | 149 | } |
151 | 150 | } |
— | — | @@ -1518,8 +1517,8 @@ |
1519 | 1518 | if(this.width < 300){ |
1520 | 1519 | return ; |
1521 | 1520 | } |
1522 | | - this.onClipDone_disp=true; |
1523 | | - this.thumbnail_disp=true; |
| 1521 | + this.onClipDone_disp = true; |
| 1522 | + this.thumbnail_disp = true; |
1524 | 1523 | //make sure we are not in preview mode( no end clip actions in preview mode) |
1525 | 1524 | if( this.preview_mode ) |
1526 | 1525 | return ; |
Index: trunk/phase3/js2/mwEmbed/libEmbedVideo/nativeEmbed.js |
— | — | @@ -85,14 +85,14 @@ |
86 | 86 | } |
87 | 87 | }else if(this.vid && this.vid.duration ){ |
88 | 88 | //(could also check bufferedPercent > perc seek (and issue oggz_chop request or not) |
89 | | - this.doNativeSeek(perc); |
| 89 | + this.doNativeSeek( perc ); |
90 | 90 | }else{ |
91 | | - this.doPlayThenSeek(perc) |
| 91 | + this.doPlayThenSeek( perc ) |
92 | 92 | } |
93 | 93 | }, |
94 | | - doNativeSeek:function(perc){ |
| 94 | + doNativeSeek:function(perc){ |
95 | 95 | this.seek_time_sec=0; |
96 | | - this.vid.currentTime = perc * this.vid.duration; |
| 96 | + this.vid.currentTime = perc * this.vid.duration; |
97 | 97 | this.parent_monitor(); |
98 | 98 | }, |
99 | 99 | doPlayThenSeek:function(perc){ |
Index: trunk/phase3/js2/mwEmbed/example_usage/Player_Simple_Video_Tag.html |
— | — | @@ -13,7 +13,7 @@ |
14 | 14 | <br /> |
15 | 15 | <table border="1" cellpadding="6" width="600"> |
16 | 16 | <tr> |
17 | | - <td valign="top"><video durationHint="31" |
| 17 | + <td valign="top"><video durationHint="70" |
18 | 18 | style="width:400px;height:288px" |
19 | 19 | poster="http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/B-36_bomber.ogg/mid-B-36_bomber.ogg.jpg" |
20 | 20 | src="http://upload.wikimedia.org/wikipedia/commons/0/0d/B-36_bomber.ogg"></video></video></td> |
Index: trunk/phase3/js2/mwEmbed/libAddMedia/simpleUploadForm.js |
— | — | @@ -32,7 +32,7 @@ |
33 | 33 | } |
34 | 34 | |
35 | 35 | //first do a reality check on the options: |
36 | | - if(!opt.api_target){ |
| 36 | + if( !opt.api_target ){ |
37 | 37 | $(this.selector).html('Error: Missing api target'); |
38 | 38 | return false; |
39 | 39 | } |
— | — | @@ -40,7 +40,6 @@ |
41 | 41 | //@@todo this is just a proof of concept |
42 | 42 | //much todo to improved this web form |
43 | 43 | get_mw_token('File:MyRandomFileTokenCheck', opt.api_target, function(eToken){ |
44 | | - |
45 | 44 | if( !eToken || eToken == '+\\' ){ |
46 | 45 | $(this.selector).html( gM('error_not_loggedin') ); |
47 | 46 | return false; |
Index: trunk/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js |
— | — | @@ -278,7 +278,7 @@ |
279 | 279 | * @param licence_url the url of the license |
280 | 280 | */ |
281 | 281 | getLicenceFromUrl: function( license_url ){ |
282 | | - js_log("getLicenceFromUrl::" + license_url); |
| 282 | + //js_log("getLicenceFromUrl::" + license_url); |
283 | 283 | //first do a direct lookup check: |
284 | 284 | for(var i in this.licenses.cc.licenses){ |
285 | 285 | var lkey = this.licenses.cc.licenses[i].split('/')[0]; |