Skip to content

Commit

Permalink
[#112] updated index.html and popcorn-complete hack, fixing popcorn c…
Browse files Browse the repository at this point in the history
…omplete in popcorn ticket #568
  • Loading branch information
ScottDowne committed Jun 10, 2011
1 parent c70550f commit 3de2af4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions index.html
Expand Up @@ -69,7 +69,6 @@

</head>
<body>

<!-- Overlay Scenes -->
<div id="ui-loading-html" class="ui-load-ready hide">
<img src="img/loading.gif">
Expand All @@ -82,8 +81,9 @@

<div class="ui-layout-north">

<div style="display: none" id="ui-panel-preview" class="span-17 last" data-export="true">
<ul class="sortable">
<div id="ui-panel-preview" class="span-17 last" data-export="true">
<div id="ui-trackTitle-div"></div>
<ul id="ui-panel-preview-sortable" class="sortable">

</ul>
<!--
Expand All @@ -97,9 +97,9 @@
<hr class="space">
<div id="footnote-container" data-plugin="footnote" class="ui-plugin-pane span-17 last" style="height:52px;width:670px;"></div>
-->
</div>
</div>
<div id="preview-pane" style="height: 395px" >
<div id="ui-trackTitle-div"></div>

<div id="ui-track-div">
<!-- reusable -->
</div>
Expand Down Expand Up @@ -134,7 +134,7 @@
<div id="video-div" width="430px" height="300px">
<video id="video" preload="auto" autobuffer>
<p>Your user agent does not support the HTML5 Video element.</p>
</video>
</video>
</div>

<div id="ui-video-controls" class="span-11 last">
Expand Down
6 changes: 3 additions & 3 deletions js/popcorn-complete.js
Expand Up @@ -4068,19 +4068,19 @@ var googleCallback;
options:{
start : {elem:'input', type:'text', label:'In'},
end : {elem:'input', type:'text', label:'Out'},
target : 'Subtitle-container',
target : 'subtitle-container',
text : {elem:'input', type:'text', label:'Text'}
}
},

_setup: function( options ) {

// Creates a div for all subtitles to use
( !this.container && !options.target || options.target === 'Subtitle-container' ) &&
( !this.container && !options.target || options.target === 'subtitle-container' ) &&
createDefaultContainer( this );

// if a target is specified, use that
if ( options.target && options.target !== 'Subtitle-container' ) {
if ( options.target && options.target !== 'subtitle-container' ) {
options.container = document.getElementById( options.target );
} else { // use shared default container

Expand Down

0 comments on commit 3de2af4

Please sign in to comment.