| Index: branches/MwEmbedStandAlone/modules/TimedText/mw.TimedTextEdit.css |
| — | — | @@ -1,200 +0,0 @@ |
| 2 | | -.TimedTextEdit .leftcolumn #textinput textarea |
| 3 | | -{ |
| 4 | | - width:512px; |
| 5 | | - height:200px; |
| 6 | | -} |
| 7 | | - |
| 8 | | -.TimedTextEdit .leftcolumn #textinput |
| 9 | | -{ |
| 10 | | - display: block; |
| 11 | | - margin: auto; |
| 12 | | - position:absolute; |
| 13 | | - top: 340px; |
| 14 | | -} |
| 15 | | - |
| 16 | | -.TimedTextEdit .leftcolumn |
| 17 | | -{ |
| 18 | | - padding: 10px; |
| 19 | | - width: 890px; |
| 20 | | - margin: auto; |
| 21 | | -} |
| 22 | | - |
| 23 | | -.TimedTextEdit .rightcolumn { |
| 24 | | - background-color:#606060; |
| 25 | | - border:0 solid black; |
| 26 | | - bottom:5px; |
| 27 | | - color:#EFEFEF; |
| 28 | | - left:215px; |
| 29 | | - line-height:100%; |
| 30 | | - margin-left:300px; |
| 31 | | - padding:10px; |
| 32 | | - position:absolute; |
| 33 | | - right:5px; |
| 34 | | - top:5px; |
| 35 | | -} |
| 36 | | - |
| 37 | | -.TimedTextEdit .tabs |
| 38 | | -{ |
| 39 | | - position:absolute; |
| 40 | | - top: 530px; |
| 41 | | -} |
| 42 | | - |
| 43 | | -.TimedTextEdit .tab{ |
| 44 | | - position:absolute; |
| 45 | | - background:#888; |
| 46 | | - border:1px solid black; |
| 47 | | - height:30px; |
| 48 | | - width:160px; |
| 49 | | - padding:4px; |
| 50 | | - text-align: center; |
| 51 | | -} |
| 52 | | - |
| 53 | | -.TimedTextEdit .selected{ |
| 54 | | - background:#bbb; |
| 55 | | - height:40px; |
| 56 | | -} |
| 57 | | - |
| 58 | | -.TimedTextEdit #step1tab |
| 59 | | -{ |
| 60 | | - left: 0px; |
| 61 | | -} |
| 62 | | - |
| 63 | | -.TimedTextEdit #step2tab |
| 64 | | -{ |
| 65 | | - left: 171px; |
| 66 | | -} |
| 67 | | - |
| 68 | | -.TimedTextEdit #step3tab |
| 69 | | -{ |
| 70 | | - left: 342px; |
| 71 | | -} |
| 72 | | - |
| 73 | | -.TimedTextEdit .nextstep |
| 74 | | -{ |
| 75 | | - position:absolute; |
| 76 | | - top: 600px; |
| 77 | | - left:197px; |
| 78 | | - width:100px; |
| 79 | | - height:25px; |
| 80 | | - text-align:center; |
| 81 | | - background:#77bb40; |
| 82 | | - color:white; |
| 83 | | - font-weight:bold; |
| 84 | | - padding:12px; |
| 85 | | - border: 1px solid black; |
| 86 | | -} |
| 87 | | - |
| 88 | | -.TimedTextEdit #titles_list |
| 89 | | -{ |
| 90 | | - background: #ddd; |
| 91 | | - padding: 12px; |
| 92 | | - text-align:center; |
| 93 | | - position:absolute; |
| 94 | | - top:340px; |
| 95 | | - width:488px; |
| 96 | | - height:164px; |
| 97 | | -} |
| 98 | | - |
| 99 | | -.TimedTextEdit .current_title |
| 100 | | -{ |
| 101 | | - font-size: larger; |
| 102 | | - background: #dd8 |
| 103 | | -} |
| 104 | | - |
| 105 | | -.TimedTextEdit .time_in |
| 106 | | -{ |
| 107 | | - font-size: xx-small; |
| 108 | | - position:absolute; |
| 109 | | - margin-top:2px; |
| 110 | | - margin-left:2em; |
| 111 | | -} |
| 112 | | - |
| 113 | | -.TimedTextEdit .time_out |
| 114 | | -{ |
| 115 | | - font-size: xx-small; |
| 116 | | - position:absolute; |
| 117 | | - margin-top:2px; |
| 118 | | - margin-left:438px; |
| 119 | | -} |
| 120 | | - |
| 121 | | -.TimedTextEdit a { |
| 122 | | - color:#aaa; |
| 123 | | -} |
| 124 | | - |
| 125 | | -.TimedTextEdit video |
| 126 | | -{ |
| 127 | | - height:290px; |
| 128 | | - width:512px; |
| 129 | | -} |
| 130 | | - |
| 131 | | -.TimedTextEdit .videodiv |
| 132 | | -{ |
| 133 | | - display: block; |
| 134 | | - margin: auto; |
| 135 | | - position:absolute; |
| 136 | | -} |
| 137 | | - |
| 138 | | -.TimedTextEdit .subtitles |
| 139 | | -{ |
| 140 | | - width: 80%; |
| 141 | | - margin: auto; |
| 142 | | - position: relative; |
| 143 | | - text-align: center; |
| 144 | | - font-family: sans-serif; |
| 145 | | - line-height: 2em; |
| 146 | | - color: rgba(255,255,128, 1); |
| 147 | | - text-shadow: rgba(0,0,0, 0.6) 1px 1px; |
| 148 | | - background: rgba(0,0,0, 0.6); |
| 149 | | -} |
| 150 | | - |
| 151 | | -.TimedTextEdit .subtitleslines1 |
| 152 | | -{ |
| 153 | | - top: -4.8em; |
| 154 | | -} |
| 155 | | - |
| 156 | | -.TimedTextEdit.subtitleslines2 |
| 157 | | -{ |
| 158 | | - top: -6.8em; |
| 159 | | -} |
| 160 | | - |
| 161 | | -.TimedTextEdit.subtitleslines3 |
| 162 | | -{ |
| 163 | | - top: -8.8em; |
| 164 | | -} |
| 165 | | - |
| 166 | | -.TimedTextEdit input[type=number] |
| 167 | | -{ |
| 168 | | - width:1.2em; |
| 169 | | - padding:2px; |
| 170 | | - background: #ffd; |
| 171 | | - border:none; |
| 172 | | -} |
| 173 | | -/* |
| 174 | | -.TimedTextEdit input[type=text] |
| 175 | | -{ |
| 176 | | - background: #ffd; |
| 177 | | - border:none; |
| 178 | | -} |
| 179 | | -*/ |
| 180 | | - |
| 181 | | -.TimedTextEdit .hotkeybox { |
| 182 | | - background: #333; |
| 183 | | - padding: 5px; |
| 184 | | - line-height: 200%; |
| 185 | | - font-size: small; |
| 186 | | - position:absolute; |
| 187 | | - width:340px; |
| 188 | | - bottom:10px; |
| 189 | | -} |
| 190 | | - |
| 191 | | -.TimedTextEdit #titles_textarea { |
| 192 | | - font-family: helvetica, sans-serif; |
| 193 | | - line-height: 1.5em; |
| 194 | | -} |
| 195 | | - |
| 196 | | -.TimedTextEdit .step-help{ |
| 197 | | - bottom:155px; |
| 198 | | - overflow:auto; |
| 199 | | - position:absolute; |
| 200 | | - top:10px; |
| 201 | | -} |
| \ No newline at end of file |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js |
| — | — | @@ -1320,7 +1320,10 @@ |
| 1321 | 1321 | if( this[ attr ] == "false" ) this[attr] = false; |
| 1322 | 1322 | if( this[ attr ] == "true" ) this[attr] = true; |
| 1323 | 1323 | } |
| 1324 | | - |
| | 1324 | + // Restore the apiTitle key escaping |
| | 1325 | + if( this.apiTitleKey ) |
| | 1326 | + this.apiTitleKey = unescape( this.apiTitleKey ); |
| | 1327 | + |
| 1325 | 1328 | // Hide "controls" if using native player controls: |
| 1326 | 1329 | if( this.useNativeControls() ){ |
| 1327 | 1330 | _this.controls = false; |