Index: trunk/phase3/js2/mwEmbed/skins/kskin/playerSkin.css |
— | — | @@ -1,235 +1,388 @@ |
2 | 2 | /* |
3 | 3 | * K-skin player |
4 | 4 | */ |
| 5 | +.k-player { |
| 6 | + color: white; |
| 7 | +} |
5 | 8 | |
6 | 9 | /* large play button */ |
7 | | -.k-player .play-btn-large { width:120px; height:55px; background: url(images/ksprite.png) no-repeat 28px -433px; position:absolute; cursor:pointer; border:none;} /*.ui-state-default */ |
8 | | -.k-player .play-btn-large.ui-state-hover { background: url(images/ksprite.png) no-repeat 28px -377px; } |
| 10 | +.k-player .play-btn-large { |
| 11 | + width: 120px; |
| 12 | + height: 55px; |
| 13 | + background: url(images/ksprite.png) no-repeat 28px -433px; |
| 14 | + position: absolute; |
| 15 | + cursor: pointer; |
| 16 | + border: none; |
| 17 | +} /*.ui-state-default */ |
| 18 | +.k-player .play-btn-large.ui-state-hover { |
| 19 | + background: url(images/ksprite.png) no-repeat 28px -377px; |
| 20 | +} |
9 | 21 | |
10 | 22 | /* control icons: */ |
11 | | -.k-player .ui-state-default .ui-icon, .k-player .ui-state-hover .ui-icon {background:transparent url(images/ksprite.png) no-repeat scroll 0 -48px;} |
12 | | - |
13 | | -.k-player .ui-state-default .ui-icon-arrow-4-diag { background-position: 0 -32px;} /* fullscreen */ |
14 | | -.k-player .ui-state-hover .ui-icon-arrow-4-diag { background-position: -16px -32px;} |
15 | | -.k-player .ui-state-default .ui-icon-volume-on, .ui-state-hover .ui-icon-volume-off, { margin-left:-6px; background-position: -16px -48px;} |
16 | | -.k-player .ui-state-hover .ui-icon-volume-on, .ui-state-default .ui-icon-volume-off { margin-left:-6px; background-position: 0 -48px;} |
| 23 | +.k-player .ui-state-default .ui-icon,.k-player .ui-state-hover .ui-icon |
| 24 | + { |
| 25 | + background: transparent url(images/ksprite.png) no-repeat scroll 0 -48px |
| 26 | + ; |
| 27 | +} |
17 | 28 | |
18 | | -.k-player .ui-state-default .ui-icon-play { background:url(images/ksprite.png) no-repeat 0 0;} |
19 | | -.k-player .ui-state-hover .ui-icon-play { background-position: -16px 0;} |
| 29 | +.k-player .ui-state-default .ui-icon-arrow-4-diag { |
| 30 | + background-position: 0 -32px; |
| 31 | +} /* fullscreen */ |
| 32 | +.k-player .ui-state-hover .ui-icon-arrow-4-diag { |
| 33 | + background-position: -16px -32px; |
| 34 | +} |
20 | 35 | |
21 | | -.k-player .ui-state-default .ui-icon-pause { background:url(images/ksprite.png) no-repeat 0 -17px;} |
22 | | -.k-player .ui-state-hover .ui-icon-pause { background-position: -16px -17px;} |
| 36 | +.k-player .ui-state-hover .ui-icon-volume-on{ |
| 37 | + background-position: -16px -48px; |
| 38 | +} |
23 | 39 | |
| 40 | +.k-player .ui-state-default .ui-icon-play { |
| 41 | + background: url(images/ksprite.png) no-repeat 0 0; |
| 42 | +} |
| 43 | + |
| 44 | +.k-player .ui-state-hover .ui-icon-play { |
| 45 | + background-position: -16px 0; |
| 46 | +} |
| 47 | + |
| 48 | +.k-player .ui-state-default .ui-icon-pause { |
| 49 | + background: url(images/ksprite.png) no-repeat 0 -17px; |
| 50 | +} |
| 51 | + |
| 52 | +.k-player .ui-state-hover .ui-icon-pause { |
| 53 | + background-position: -16px -17px; |
| 54 | +} |
| 55 | + |
24 | 56 | .k-player .control-bar { |
25 | | - border: 0px; |
26 | | - height:21px; |
27 | | - padding: 2px 0 0 6px; |
28 | | - margin-top:0px; |
29 | | - background: url(images/ksprite.png) repeat-x 0 -81px; |
30 | | - font: normal 11px arial,sans-serif; |
31 | | - color:#555; |
| 57 | + border: 0px; |
| 58 | + height: 21px; |
| 59 | + padding: 2px 0 0 6px; |
| 60 | + margin-top: 0px; |
| 61 | + background: url(images/ksprite.png) repeat-x 0 -81px; |
| 62 | + font: normal 11px arial, sans-serif; |
| 63 | + color: #555; |
32 | 64 | } |
33 | 65 | |
34 | 66 | .k-player .play_head { |
35 | | - background:url("images/ksprite.png") repeat-x scroll 0 -350px transparent; |
36 | | - display:inline; |
37 | | - float:left; |
38 | | - margin-left:10px; |
39 | | - border:1px solid #EEEEEE; |
40 | | - height:8px; |
41 | | - margin:6px 10px 0 7px; |
42 | | - position:relative; |
| 67 | + background: url("images/ksprite.png") repeat-x scroll 0 -350px |
| 68 | + transparent; |
| 69 | + display: inline; |
| 70 | + float: left; |
| 71 | + margin-left: 10px; |
| 72 | + border: 1px solid #EEEEEE; |
| 73 | + height: 8px; |
| 74 | + margin: 6px 10px 0 7px; |
| 75 | + position: relative; |
43 | 76 | } |
44 | 77 | |
45 | 78 | .k-player .play_head .ui-slider-handle { |
46 | | - background:url("images/ksprite.png") no-repeat scroll -67px -341px transparent; |
47 | | - border:1px solid #888888; |
48 | | - display:block; |
49 | | - height:8px; |
50 | | - margin:-1px 0 0 -5px; |
51 | | - position:absolute; |
52 | | - top:0; |
53 | | - width:8px; |
54 | | - cursor:pointer; |
| 79 | + background: url("images/ksprite.png") no-repeat scroll -67px -341px |
| 80 | + transparent; |
| 81 | + border: 1px solid #888888; |
| 82 | + display: block; |
| 83 | + height: 8px; |
| 84 | + margin: -1px 0 0 -5px; |
| 85 | + position: absolute; |
| 86 | + top: 0; |
| 87 | + width: 8px; |
| 88 | + cursor: pointer; |
55 | 89 | } |
56 | 90 | |
57 | 91 | .k-player .time-disp { |
58 | | -border:medium none; |
59 | | -display:inline; |
60 | | -color:#555555; |
61 | | -font:11px arial,sans-serif; |
62 | | -line-height:20px; |
63 | | -overflow:hidden; |
64 | | -width:36px; |
| 92 | + border: medium none; |
| 93 | + display: inline; |
| 94 | + color: #555555; |
| 95 | + font: 11px arial, sans-serif; |
| 96 | + line-height: 20px; |
| 97 | + overflow: hidden; |
| 98 | + width: 36px; |
| 99 | + float: right; |
65 | 100 | } |
66 | 101 | |
67 | 102 | .k-player .lButton { |
68 | | - cursor:pointer; |
69 | | - float:left; |
70 | | - list-style:none outside none; |
71 | | - margin:2px; |
72 | | - padding:0px 0; |
| 103 | + cursor: pointer; |
| 104 | + float: left; |
| 105 | + list-style: none outside none; |
| 106 | + margin: 2px; |
| 107 | + padding: 0px 0; |
73 | 108 | width: 24px; |
74 | | - height:16px; |
75 | | - position:relative; |
76 | | - background:none repeat scroll 0 0 transparent; |
77 | | - border:medium none; |
| 109 | + height: 16px; |
| 110 | + position: relative; |
| 111 | + background: none repeat scroll 0 0 transparent; |
| 112 | + border: medium none; |
78 | 113 | } |
| 114 | + |
79 | 115 | .k-player .rButton { |
80 | | - cursor:pointer; |
81 | | - float:right; |
82 | | - list-style:none outside none; |
83 | | - margin:2px; |
84 | | - padding:0px 0; |
| 116 | + cursor: pointer; |
| 117 | + float: right; |
| 118 | + list-style: none outside none; |
| 119 | + margin: 2px; |
| 120 | + padding: 0px 0; |
85 | 121 | width: 23px; |
86 | | - height:16px; |
87 | | - position:relative; |
88 | | - background:none repeat scroll 0 0 transparent; |
89 | | - border:medium none; |
| 122 | + height: 16px; |
| 123 | + position: relative; |
| 124 | + background: none repeat scroll 0 0 transparent; |
| 125 | + border: medium none; |
90 | 126 | } |
91 | 127 | |
92 | 128 | .k-player .k-options { |
93 | | - border:1px solid #AAAAAA !important; |
94 | | - color:#555555; |
95 | | - float:right; |
96 | | - height:22px; |
97 | | - margin-top:-2px; |
| 129 | + border: 1px solid #AAAAAA !important; |
| 130 | + color: #555555; |
| 131 | + float: right; |
| 132 | + height: 22px; |
| 133 | + margin-top: -2px; |
98 | 134 | margin-right: 0px; |
99 | | - width:50px; |
100 | | - float:right; |
101 | | - background:none repeat scroll 0 0 transparent; |
102 | | - font-family:Lucida Grande,Lucida Sans,Arial,sans-serif; |
103 | | - font-size:11px; |
104 | | - text-transform:uppercase; |
| 135 | + width: 50px; |
| 136 | + float: right; |
| 137 | + background: none repeat scroll 0 0 transparent; |
| 138 | + font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; |
| 139 | + font-size: 11px; |
| 140 | + text-transform: uppercase; |
105 | 141 | } |
106 | | -.k-player .k-options span{ |
107 | | - position:relative; |
108 | | - top:4px; |
109 | | - left:7px; |
| 142 | + |
| 143 | +.k-player .k-options span { |
| 144 | + position: relative; |
| 145 | + top: 4px; |
| 146 | + left: 7px; |
110 | 147 | } |
111 | 148 | |
112 | | -.k-player .k-menu-screens { |
113 | | - float:left; |
114 | | - font-size:11px; |
115 | | - padding:13px 10px 15px 15px; |
116 | | - width:320px; |
| 149 | +.k-player .k-menu-screens { |
| 150 | + float: left; |
| 151 | + font-size: 11px; |
| 152 | + padding: 13px 10px 15px 15px; |
| 153 | + width: 320px; |
117 | 154 | } |
118 | 155 | |
119 | | -.k-player ul.k-menu-bar { |
120 | | - background:url("images/ksprite.png") no-repeat scroll -99px -104px transparent; |
121 | | - bottom:5px; |
122 | | - height:128px; |
123 | | - list-style:none outside none; |
124 | | - padding:0 0 5px; |
125 | | - position:absolute; |
126 | | - right:0; |
| 156 | +.k-player ul.k-menu-bar { |
| 157 | + background: url("images/ksprite.png") no-repeat scroll -99px -104px |
| 158 | + transparent; |
| 159 | + bottom: 5px; |
| 160 | + height: 128px; |
| 161 | + list-style: none outside none; |
| 162 | + padding: 0 0 5px; |
| 163 | + position: absolute; |
| 164 | + right: 0; |
127 | 165 | } |
128 | | -.k-player .k-menu { |
129 | | - background:none repeat scroll 0 0 #181818; |
130 | | - border:medium none; |
131 | | - display:none; |
132 | | - height:300px; |
133 | | - left:0; |
134 | | - opacity:0.9; |
135 | | - position:absolute; |
136 | | - top:0; |
137 | | - width:400px; |
138 | | - z-index:999; |
| 166 | + |
| 167 | +.k-player .k-menu { |
| 168 | + background: none repeat scroll 0 0 #181818; |
| 169 | + border: medium none; |
| 170 | + display: none; |
| 171 | + height: 300px; |
| 172 | + left: 0; |
| 173 | + opacity: 0.9; |
| 174 | + position: absolute; |
| 175 | + top: 0; |
| 176 | + width: 400px; |
| 177 | + z-index: 999; |
139 | 178 | } |
| 179 | + |
140 | 180 | .k-player .k-menu-bar li a { |
141 | | - background:url("images/ksprite.png") no-repeat scroll -51px -110px transparent; |
142 | | - display:block; |
143 | | - height:32px; |
144 | | - margin-left:1px; |
145 | | - overflow:hidden; |
146 | | - text-indent:99999px; |
147 | | - width:49px; |
| 181 | + background: url("images/ksprite.png") no-repeat scroll -51px -110px |
| 182 | + transparent; |
| 183 | + display: block; |
| 184 | + height: 32px; |
| 185 | + margin-left: 1px; |
| 186 | + overflow: hidden; |
| 187 | + text-indent: 99999px; |
| 188 | + width: 49px; |
148 | 189 | } |
149 | | -.k-menu-bar li a:hover { background-position: -1px -110px;} |
150 | | -.k-menu-bar li.k-download-btn a { background-position: -51px -203px;} |
151 | | -.k-menu-bar li.k-download-btn a:hover { background-position: -1px -203px;} |
152 | 190 | |
153 | | -.k-menu-bar li.k-share-btn a { background-position: -51px -172px;} |
154 | | -.k-menu-bar li.k-share-btn a:hover { background-position: -1px -172px;} |
| 191 | +.k-menu-bar li a:hover { |
| 192 | + background-position: -1px -110px; |
| 193 | +} |
155 | 194 | |
156 | | -.k-menu-bar li.k-credits-btn a { background-position: -51px -141px;} |
157 | | -.k-menu-bar li.k-credits-btn a:hover { background-position: -1px -141px;} |
158 | | - |
159 | | -.k-menu-screens { width:320px; padding: 13px 10px 15px 15px; float:left;} /* w & h inline via jq */ |
160 | | -.k-menu-screens h2 { padding: 0 0 5px 1px; clear:both; font-size:12px; color:#666;} |
161 | | -.k-menu-screens p { margin: 6px 0;} |
162 | | -.k-menu-screens a { ;} |
163 | | -.k-menu-screens a img { border:none;} |
164 | | -.k-menu-screens ul { padding:0; margin: 6px 0 0; list-style: none outside none;} |
| 195 | +.k-menu-bar li.k-download-btn a { |
| 196 | + background-position: -51px -203px; |
| 197 | +} |
165 | 198 | |
166 | | -.k-edit-screen { width:370px; height:223px; padding-top:77px; text-align:center; background:#181818; color:#fff;} |
167 | | -.k-edit-screen div { } |
168 | | -.k-edit-screen a { color:#7BB8FC;} |
169 | | -.k-edit-screen a img { border:none;} |
| 199 | +.k-menu-bar li.k-download-btn a:hover { |
| 200 | + background-position: -1px -203px; |
| 201 | +} |
170 | 202 | |
171 | | -.k-menu-screens { width:320px; padding: 13px 10px 15px 15px; float:left;} /* w & h inline via jq */ |
172 | | -.k-menu-screens h2 { padding: 0 0 5px 1px; clear:both; font-size:12px; color:#666;} |
173 | | -.k-menu-screens p { margin: 6px 0;} |
174 | | -.k-menu-screens a { ;} |
175 | | -.k-menu-screens a img { border:none;} |
176 | | -.k-menu-screens ul { padding:0; margin: 6px 0 0; list-style: none outside none;} |
| 203 | +.k-menu-bar li.k-share-btn a { |
| 204 | + background-position: -51px -172px; |
| 205 | +} |
177 | 206 | |
178 | | -.k-menu-screens li { height:14px; margin-bottom:6px;} |
179 | | -.k-menu-screens li a { padding-left:22px; background:url(images/ksprite.png) no-repeat -85px -274px; text-decoration:none;} |
180 | | -.k-menu-screens li a.active, .k-menu-screens li a:hover.active { background-position: -85px -247px;} |
181 | | -.k-menu-screens li a:hover { background-position: -85px -260px;} |
182 | | -.k-menu-screens a { color:#BBBBBB; } |
| 207 | +.k-menu-bar li.k-share-btn a:hover { |
| 208 | + background-position: -1px -172px; |
| 209 | +} |
183 | 210 | |
| 211 | +.k-menu-bar li.k-credits-btn a { |
| 212 | + background-position: -51px -141px; |
| 213 | +} |
184 | 214 | |
| 215 | +.k-menu-bar li.k-credits-btn a:hover { |
| 216 | + background-position: -1px -141px; |
| 217 | +} |
| 218 | + |
| 219 | +.k-menu-screens { |
| 220 | + width: 320px; |
| 221 | + padding: 13px 10px 15px 15px; |
| 222 | + float: left; |
| 223 | +} /* w & h inline via jq */ |
| 224 | +.k-menu-screens h2 { |
| 225 | + padding: 0 0 5px 1px; |
| 226 | + clear: both; |
| 227 | + font-size: 12px; |
| 228 | + color: #666; |
| 229 | +} |
| 230 | + |
| 231 | +.k-menu-screens p { |
| 232 | + margin: 6px 0; |
| 233 | +} |
| 234 | + |
| 235 | +.k-menu-screens a {; |
| 236 | + |
| 237 | +} |
| 238 | + |
| 239 | +.k-menu-screens a img { |
| 240 | + border: none; |
| 241 | +} |
| 242 | + |
| 243 | +.k-menu-screens ul { |
| 244 | + padding: 0; |
| 245 | + margin: 6px 0 0; |
| 246 | + list-style: none outside none; |
| 247 | +} |
| 248 | + |
| 249 | +.k-edit-screen { |
| 250 | + width: 370px; |
| 251 | + height: 223px; |
| 252 | + padding-top: 77px; |
| 253 | + text-align: center; |
| 254 | + background: #181818; |
| 255 | + color: #fff; |
| 256 | +} |
| 257 | + |
| 258 | +.k-edit-screen div { |
| 259 | + |
| 260 | +} |
| 261 | + |
| 262 | +.k-edit-screen a { |
| 263 | + color: #7BB8FC; |
| 264 | +} |
| 265 | + |
| 266 | +.k-edit-screen a img { |
| 267 | + border: none; |
| 268 | +} |
| 269 | + |
| 270 | +.k-menu-screens { |
| 271 | + width: 320px; |
| 272 | + padding: 13px 10px 15px 15px; |
| 273 | + float: left; |
| 274 | +} /* w & h inline via jq */ |
| 275 | +.k-menu-screens h2 { |
| 276 | + padding: 0 0 5px 1px; |
| 277 | + clear: both; |
| 278 | + font-size: 12px; |
| 279 | + color: #666; |
| 280 | +} |
| 281 | + |
| 282 | +.k-menu-screens p { |
| 283 | + margin: 6px 0; |
| 284 | +} |
| 285 | + |
| 286 | +.k-menu-screens a {; |
| 287 | + |
| 288 | +} |
| 289 | + |
| 290 | +.k-menu-screens a img { |
| 291 | + border: none; |
| 292 | +} |
| 293 | + |
| 294 | +.k-menu-screens ul { |
| 295 | + padding: 0; |
| 296 | + margin: 6px 0 0; |
| 297 | + list-style: none outside none; |
| 298 | +} |
| 299 | + |
| 300 | +.k-menu-screens li { |
| 301 | + height: 14px; |
| 302 | + margin-bottom: 6px; |
| 303 | +} |
| 304 | + |
| 305 | +.k-menu-screens li a { |
| 306 | + padding-left: 22px; |
| 307 | + background: url(images/ksprite.png) no-repeat -85px -274px; |
| 308 | + text-decoration: none; |
| 309 | +} |
| 310 | + |
| 311 | +.k-menu-screens li a.active,.k-menu-screens li a:hover .active { |
| 312 | + background-position: -85px -247px; |
| 313 | +} |
| 314 | + |
| 315 | +.k-menu-screens li a:hover { |
| 316 | + background-position: -85px -260px; |
| 317 | +} |
| 318 | + |
| 319 | +.k-menu-screens a { |
| 320 | + color: #BBBBBB; |
| 321 | +} |
| 322 | + |
185 | 323 | .k-menu textarea { |
186 | | - background:none repeat scroll 0 0 transparent; |
187 | | - border-color:#000000 -moz-use-text-color -moz-use-text-color #000000; |
188 | | - border-style:solid none none solid; |
189 | | - border-width:2px medium medium 2px; |
190 | | - color:#CCCCCC; |
191 | | - font:11px arial,sans-serif; |
192 | | - height:15px; |
193 | | - overflow:hidden; |
194 | | - padding-left:2px; |
195 | | - width:100%; |
| 324 | + background: none repeat scroll 0 0 transparent; |
| 325 | + border-color: #000000 -moz-use-text-color -moz-use-text-color #000000; |
| 326 | + border-style: solid none none solid; |
| 327 | + border-width: 2px medium medium 2px; |
| 328 | + color: #CCCCCC; |
| 329 | + font: 11px arial, sans-serif; |
| 330 | + height: 15px; |
| 331 | + overflow: hidden; |
| 332 | + padding-left: 2px; |
| 333 | + width: 100%; |
196 | 334 | } |
| 335 | + |
197 | 336 | .menu-screen.menu-share button { |
198 | | - background:url("images/ksprite.png") no-repeat scroll 0 -81px #D4D4D4; |
199 | | - border:1px solid #000000; |
200 | | - color:#000000; |
201 | | - float:right; |
202 | | - height:24px; |
203 | | - padding:0 5px 3px; |
204 | | - width:84px; |
205 | | - font-size:1em; |
| 337 | + background: url("images/ksprite.png") no-repeat scroll 0 -81px #D4D4D4; |
| 338 | + border: 1px solid #000000; |
| 339 | + color: #000000; |
| 340 | + float: right; |
| 341 | + height: 24px; |
| 342 | + padding: 0 5px 3px; |
| 343 | + width: 84px; |
| 344 | + font-size: 1em; |
206 | 345 | } |
| 346 | + |
207 | 347 | .k-player .menu-screen.menu-share div.ui-state-highlight { |
208 | | - background:none repeat scroll 0 0 transparent; |
209 | | - border-color:#554926; |
210 | | - color:#FFE96E; |
211 | | - float:left; |
212 | | - padding:2px 5px; |
| 348 | + background: none repeat scroll 0 0 transparent; |
| 349 | + border-color: #554926; |
| 350 | + color: #FFE96E; |
| 351 | + float: left; |
| 352 | + padding: 2px 5px; |
213 | 353 | } |
| 354 | + |
214 | 355 | .k-player .menu-screen.menu-share div.ui-state-highlight a { |
215 | | - color:#FFE96E; |
216 | | - font-weight:bold; |
| 356 | + color: #FFE96E; |
| 357 | + font-weight: bold; |
217 | 358 | } |
218 | 359 | |
219 | | -.k-player .volume-slide { |
220 | | - width:38px !important; |
| 360 | +.k-player .volume_control { |
| 361 | + margin-right: 0px; |
| 362 | + width: 16px; |
221 | 363 | } |
| 364 | + |
| 365 | +.k-player .volume_control span { |
| 366 | + margin-right: 0px; |
| 367 | +} |
| 368 | + |
| 369 | +.k-player .volume-slider { |
| 370 | + width: 30px; |
| 371 | +} |
| 372 | + |
222 | 373 | .k-player .volume-slider .ui-slider-range { |
223 | | - -moz-border-radius:0 0 0 0; |
224 | | - background:url("images/ksprite.png") repeat-x scroll -66px -306px transparent; |
225 | | - height:17px; |
226 | | - position:absolute; |
| 374 | + -moz-border-radius: 0 0 0 0; |
| 375 | + background: url("images/ksprite.png") repeat-x scroll -66px -306px |
| 376 | + transparent; |
| 377 | + height: 17px; |
| 378 | + position: absolute; |
227 | 379 | } |
| 380 | + |
228 | 381 | .k-player .volume-slider a.ui-slider-handle { |
229 | | - background:none repeat scroll 0 0 transparent; |
230 | | - border:medium none; |
231 | | - display:block; |
232 | | - height:18px; |
233 | | - margin:-3px 5px 0 -1px; |
234 | | - position:absolute; |
235 | | - width:8px; |
| 382 | + background: none repeat scroll 0 0 transparent; |
| 383 | + border: medium none; |
| 384 | + display: block; |
| 385 | + height: 18px; |
| 386 | + margin: -3px 5px 0 -1px; |
| 387 | + position: absolute; |
| 388 | + width: 8px; |
236 | 389 | } |
\ No newline at end of file |
Index: trunk/phase3/js2/mwEmbed/skins/kskin/kskin.js |
— | — | @@ -110,33 +110,7 @@ |
111 | 111 | }); |
112 | 112 | $tp.find('.play-btn-large').fadeOut('fast'); |
113 | 113 | } |
114 | | - }); |
115 | | - |
116 | | - //slider: |
117 | | - $tp.find('.volume-slider').slider({ |
118 | | - range: "min", |
119 | | - value: 80, |
120 | | - min: 0, |
121 | | - max: 100, |
122 | | - slide: function(event, ui) { |
123 | | - embedObj.updateVolumen(ui.value/100); |
124 | | - }, |
125 | | - change: function(event, ui){ |
126 | | - var level = ui.value/100; |
127 | | - if (level==0) { |
128 | | - $tp.find('.k-volume span').addClass('ui-icon-volume-off'); |
129 | | - }else{ |
130 | | - $tp.find('.k-volume span').removeClass('ui-icon-volume-off'); |
131 | | - } |
132 | | - //only run the onChange event if done by a user slide: |
133 | | - if(embedObj.userSlide){ |
134 | | - embedObj.userSlide=false; |
135 | | - embedObj.seeking=true; |
136 | | -// var perc = ui.value/100; |
137 | | - embedObj.updateVolumen(level); |
138 | | - } |
139 | | - } |
140 | | - }); |
| 114 | + }); |
141 | 115 | |
142 | 116 | } |
143 | 117 | } |
\ No newline at end of file |
Index: trunk/phase3/js2/mwEmbed/skins/ctrlBuilder.js |
— | — | @@ -252,34 +252,39 @@ |
253 | 253 | doVolumeBinding:function(){ |
254 | 254 | var embedObj = this.embedObj; |
255 | 255 | var _this = this; |
256 | | - var $tp=$j('#' + embedObj.id); |
257 | | - //default volume binding: |
258 | | - var hoverOverDelay=false; |
| 256 | + var $tp=$j('#' + embedObj.id); |
259 | 257 | $tp.find('.volume_control').unbind().btnBind().click(function(){ |
| 258 | + js_log('clicked volume control'); |
260 | 259 | $j('#' +embedObj.id).get(0).toggleMute(); |
261 | | - }).hover( |
262 | | - function(){ |
263 | | - $j('#vol_container_' + embedObj.id).addClass('vol_container_top'); |
264 | | - //set to "below" if playing and embedType != native |
265 | | - if(embedObj && embedObj.isPlaying && embedObj.isPlaying() && !embedObj.supports['overlays']){ |
266 | | - $j('#vol_container_' + embedObj.id).removeClass('vol_container_top').addClass('vol_container_below'); |
| 260 | + }); |
| 261 | + //add vertical volume display hover |
| 262 | + if( this.volume_layout == 'vertical'){ |
| 263 | + //default volume binding: |
| 264 | + var hoverOverDelay = false; |
| 265 | + var $tpvol = $tp.find('.vol_container'); |
| 266 | + $tp.find('.volume_control').hover( |
| 267 | + function(){ |
| 268 | + $tpvol.addClass('vol_container_top'); |
| 269 | + //set to "below" if playing and embedType != native |
| 270 | + if(embedObj && embedObj.isPlaying && embedObj.isPlaying() && !embedObj.supports['overlays']){ |
| 271 | + $tpvol.removeClass('vol_container_top').addClass('vol_container_below'); |
| 272 | + } |
| 273 | + $tpvol.fadeIn('fast'); |
| 274 | + hoverOverDelay = true; |
| 275 | + }, |
| 276 | + function(){ |
| 277 | + hoverOverDelay= false; |
| 278 | + setTimeout(function doHideVolume(){ |
| 279 | + if(!hoverOverDelay){ |
| 280 | + $tpvol.fadeOut('fast'); |
| 281 | + } |
| 282 | + }, 500); |
267 | 283 | } |
268 | | - |
269 | | - $j('#vol_container_' + embedObj.id).fadeIn('fast'); |
270 | | - hoverOverDelay = true; |
271 | | - }, |
272 | | - function(){ |
273 | | - hoverOverDelay= false; |
274 | | - setTimeout(function doHideVolume(){ |
275 | | - if(!hoverOverDelay){ |
276 | | - $j('#vol_container_' + embedObj.id).fadeOut('fast'); |
277 | | - } |
278 | | - }, 500); |
279 | | - } |
280 | | - ); |
281 | | - //Volumen Slider |
282 | | - $j('#volume_bar_'+embedObj.id).slider({ |
283 | | - orientation: "vertical", |
| 284 | + ); |
| 285 | + } |
| 286 | + |
| 287 | + //setup slider: |
| 288 | + var sliderConf = { |
284 | 289 | range: "min", |
285 | 290 | value: 80, |
286 | 291 | min: 0, |
— | — | @@ -291,20 +296,20 @@ |
292 | 297 | }, |
293 | 298 | change:function(event, ui){ |
294 | 299 | var perc = ui.value/100; |
295 | | - if (perc==0) { |
296 | | - $j('#' + embedObj.id + ' .volume_control span').removeClass('ui-icon-volume-on').addClass('ui-icon-volume-off'); |
| 300 | + if ( perc==0 ) { |
| 301 | + $tp.find('.volume_control span').removeClass('ui-icon-volume-on').addClass('ui-icon-volume-off'); |
297 | 302 | }else{ |
298 | | - $j('#' + embedObj.id + ' .volume_control span').removeClass('ui-icon-volume-off').addClass('ui-icon-volume-on'); |
| 303 | + $tp.find('.volume_control span').removeClass('ui-icon-volume-off').addClass('ui-icon-volume-on'); |
299 | 304 | } |
300 | | - //only run the onChange event if done by a user slide: |
301 | | - if(embedObj.userSlide){ |
302 | | - embedObj.userSlide=false; |
303 | | - embedObj.seeking=true; |
304 | | - var perc = ui.value/100; |
305 | | - embedObj.updateVolumen(perc); |
306 | | - } |
| 305 | + var perc = ui.value/100; |
| 306 | + embedObj.updateVolumen(perc); |
307 | 307 | } |
308 | | - }); |
| 308 | + } |
| 309 | + |
| 310 | + if( this.volume_layout == 'vertical') |
| 311 | + sliderConf['orientation'] = "vertical"; |
| 312 | + |
| 313 | + $tp.find( '.volume-slider' ).slider( sliderConf ); |
309 | 314 | }, |
310 | 315 | getMvBufferHtml:function(){ |
311 | 316 | return '<div class="ui-slider-range ui-slider-range-min ui-widget-header ' + |
— | — | @@ -413,8 +418,8 @@ |
414 | 419 | '<span class="ui-icon ui-icon-volume-on"></span>'; |
415 | 420 | |
416 | 421 | if( ctrlObj.volume_layout == 'vertical'){ |
417 | | - o+='<div style="position:absolute;display:none;" id="vol_container_'+ctrlObj.id+'" class="vol_container ui-corner-all">' + |
418 | | - '<div class="volume_bar" id="volume_bar_' + ctrlObj.id + '"></div>' + |
| 422 | + o+='<div style="position:absolute;display:none;" class="vol_container ui-corner-all">' + |
| 423 | + '<div class="volume-slider" ></div>' + |
419 | 424 | '</div>'; |
420 | 425 | } |
421 | 426 | o+= '</div>'; |
Index: trunk/phase3/js2/mwEmbed/skins/mvpcf/playerSkin.css |
— | — | @@ -80,10 +80,10 @@ |
81 | 81 | padding: 0 0 0 0; |
82 | 82 | |
83 | 83 | } |
84 | | -.volume_on { |
| 84 | +.mv-player .volume_on { |
85 | 85 | background: url(images/player_volume_tag.png) 0 8px no-repeat; |
86 | 86 | } |
87 | | -.volume_off{ |
| 87 | +.mv-player .volume_off{ |
88 | 88 | background: url(images/player_volume_tag_off.png) 0 8px no-repeat; |
89 | 89 | } |
90 | 90 | |
— | — | @@ -96,8 +96,34 @@ |
97 | 97 | margin: -1px 0 0 3px; |
98 | 98 | cursor: pointer; |
99 | 99 | } |
| 100 | +.mv-player .vol_container{ |
| 101 | + z-index:99; |
| 102 | + width:23px; |
| 103 | + height:75px; |
| 104 | + width:23px; |
| 105 | + background: #CCC; |
| 106 | +} |
| 107 | +.mv-player .vol_container_below{ |
| 108 | + top:30px; |
| 109 | +} |
| 110 | +.mv-player .vol_container_top{ |
| 111 | + top:-77px; |
| 112 | +} |
| 113 | +.mv-player .vol_container .volume-slider{ |
| 114 | + margin-top:5px; |
| 115 | + height:65px; |
| 116 | + width:10px; |
| 117 | + margin-left: auto ; |
| 118 | + margin-right: auto ; |
| 119 | +} |
| 120 | +.mv-player .vol_container .ui-slider-handle{ |
| 121 | + cursor : pointer; |
| 122 | + width:10px; |
| 123 | + height:10px; |
| 124 | + position:absolute; |
| 125 | + left:-1px; |
| 126 | +} |
100 | 127 | |
101 | | - |
102 | 128 | .mv-player .time-disp { |
103 | 129 | line-height: 32px; |
104 | 130 | height: 29px; |
— | — | @@ -117,20 +143,20 @@ |
118 | 144 | margin-top:10px; |
119 | 145 | } |
120 | 146 | |
121 | | -.play_head .ui-slider-handle{ |
| 147 | +.mv-player .play_head .ui-slider-handle{ |
122 | 148 | width:10px; |
123 | 149 | height:15px; |
124 | 150 | margin-left:-5px; |
125 | 151 | margin-top:1px; |
126 | 152 | } |
127 | 153 | |
128 | | -.inOutSlider .ui-slider-handle{ |
| 154 | +.mv-player .inOutSlider .ui-slider-handle{ |
129 | 155 | width:8px; |
130 | 156 | cusror: move; |
131 | 157 | } |
132 | 158 | |
133 | 159 | |
134 | | -.videoOptionsComplete textarea { |
| 160 | +.mv-player .videoOptionsComplete textarea { |
135 | 161 | background:none repeat scroll 0 0 transparent; |
136 | 162 | border-color:#333 -moz-use-text-color -moz-use-text-color #333; |
137 | 163 | border-style:solid none none solid; |
— | — | @@ -142,7 +168,7 @@ |
143 | 169 | padding-left:2px; |
144 | 170 | width:100%; |
145 | 171 | } |
146 | | -.videoOptionsComplete .copycode { |
| 172 | +.mv-player .videoOptionsComplete .copycode { |
147 | 173 | background:url("images/ksprite.png") no-repeat scroll 0 -81px #D4D4D4; |
148 | 174 | border:1px solid #000000; |
149 | 175 | color:#000000; |
— | — | @@ -152,14 +178,14 @@ |
153 | 179 | width:84px; |
154 | 180 | font-size:1em; |
155 | 181 | } |
156 | | -.videoOptionsComplete div.ui-state-highlight { |
| 182 | +.mv-player .videoOptionsComplete div.ui-state-highlight { |
157 | 183 | background:none repeat scroll 0 0 transparent; |
158 | 184 | border-color:#554926; |
159 | 185 | color:#FFE96E; |
160 | 186 | float:left; |
161 | 187 | padding:2px 5px; |
162 | 188 | } |
163 | | -.videoOptionsComplete div.ui-state-highlight a { |
| 189 | +.mv-player .videoOptionsComplete div.ui-state-highlight a { |
164 | 190 | color:#FFE96E; |
165 | 191 | font-weight:bold; |
166 | 192 | } |
Index: trunk/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js |
— | — | @@ -1410,6 +1410,8 @@ |
1411 | 1411 | $j( '#mv_embedded_player_' + this.id ).html( this.getThumbnailHTML() ); |
1412 | 1412 | this.paused = true; |
1413 | 1413 | this.thumbnail_disp = true; |
| 1414 | + //make sure the ctrlBuilder remain active: |
| 1415 | + this.ctrlBuilder.addControlHooks(this); |
1414 | 1416 | }, |
1415 | 1417 | refreshControlsHTML:function(){ |
1416 | 1418 | js_log('refreshControlsHTML::'); |
— | — | @@ -2004,17 +2006,15 @@ |
2005 | 2007 | this.update_interval = null; |
2006 | 2008 | } |
2007 | 2009 | }, |
2008 | | - toggleMute:function(){ |
| 2010 | + toggleMute:function(){ |
2009 | 2011 | var eid = (this.pc!=null)?this.pc.pp.id:this.id; |
2010 | | - if(this.muted){ |
2011 | | - this.muted=false; |
2012 | | - $j('#volume_control_'+eid + ' span').removeClass('ui-icon-volume-off').addClass('ui-icon-volume-on'); |
2013 | | - $j('#volume_bar_'+eid).slider('value', 100); |
| 2012 | + if( this.muted ){ |
| 2013 | + this.muted=false; |
| 2014 | + $j('#' + eid + ' .volume-slider').slider('value', 100); |
2014 | 2015 | this.updateVolumen(1); |
2015 | 2016 | }else{ |
2016 | | - this.muted=true; |
2017 | | - $j('#volume_control_'+eid + ' span').removeClass('ui-icon-volume-on').addClass('ui-icon-volume-off'); |
2018 | | - $j('#volume_bar_'+eid).slider('value', 0); |
| 2017 | + this.muted=true; |
| 2018 | + $j('#' + eid + ' .volume-slider').slider('value', 0); |
2019 | 2019 | this.updateVolumen(0); |
2020 | 2020 | } |
2021 | 2021 | js_log('f:toggleMute::' + this.muted); |
— | — | @@ -2054,7 +2054,7 @@ |
2055 | 2055 | //do common monitor code like update the playhead and play status |
2056 | 2056 | //plugin objects are responsible for updating currentTime |
2057 | 2057 | monitor:function(){ |
2058 | | - js_log(' ct: ' + this.currentTime + ' dur: ' + ( parseInt( this.duration ) + 1 ) + ' is seek: ' + this.seeking ); |
| 2058 | + //js_log(' ct: ' + this.currentTime + ' dur: ' + ( parseInt( this.duration ) + 1 ) + ' is seek: ' + this.seeking ); |
2059 | 2059 | if( this.currentTime && this.currentTime > 0 && this.duration){ |
2060 | 2060 | if( !this.userSlide && !this.seeking ){ |
2061 | 2061 | if( this.start_offset ){ |