|
109 | 109 |
|
110 | 110 | /*-- Superbox Method --*/ |
111 | 111 | $.fn.superbox = function(type, curSettings) { |
112 | | - curSettings = $.extend({}, settings, curSettings); |
113 | | - $.superbox[type](this, curSettings); |
| 112 | + |
| 113 | + $.superbox[type](this, $.extend({}, settings, curSettings)); |
114 | 114 |
|
115 | 115 | this.click(function(e) { |
116 | 116 | e.preventDefault(); |
|
227 | 227 | var boxHeight = $curImg.height(); |
228 | 228 | } |
229 | 229 |
|
230 | | - curSettings = $.extend({}, curSettings, { |
231 | | - boxClasses: (galleryMode? "gallery " : "image ") + curSettings.boxClasses, |
| 230 | + var localSettings = $.extend({}, curSettings, { |
| 231 | + boxClasses: (galleryMode? "gallery " : "image ") + curSettings.boxClasses, |
232 | 232 | boxWidth: boxWidth, |
233 | 233 | boxHeight: boxHeight, |
234 | 234 | beforeOpen: function() { |
|
240 | 240 | }); |
241 | 241 |
|
242 | 242 | // Open SuperBox! |
243 | | - $.superbox.open($curImg, curSettings); |
| 243 | + $.superbox.open($curImg, localSettings); |
244 | 244 | }); |
245 | 245 |
|
246 | 246 | // Append image to SuperBox! (to trigger loading) |
|
287 | 287 | dims = extraSettings[0].split("x"); |
288 | 288 | } |
289 | 289 |
|
290 | | - curSettings = $.extend({}, curSettings, { |
| 290 | + var localSettings = $.extend({}, curSettings, { |
| 291 | + boxClasses: "iframe " + curSettings.boxClasses, |
291 | 292 | boxWidth: dims[0] || curSettings.boxWidth, |
292 | | - boxHeight: dims[1] || curSettings.boxHeight, |
293 | | - boxClasses: "iframe " + curSettings.boxClasses |
| 293 | + boxHeight: dims[1] || curSettings.boxHeight |
294 | 294 | }); |
295 | 295 |
|
296 | 296 | // iframe element |
|
300 | 300 | $iframe.one("load", function() { |
301 | 301 |
|
302 | 302 | // Open SuperBox! |
303 | | - $.superbox.open($iframe, curSettings); |
| 303 | + $.superbox.open($iframe, localSettings); |
304 | 304 | }); |
305 | 305 |
|
306 | 306 | // Append iframe to SuperBox! (to trigger loading) |
|
328 | 328 | } |
329 | 329 |
|
330 | 330 | // Specific settings |
331 | | - curSettings = $.extend({}, curSettings, { |
| 331 | + var localSettings = $.extend({}, curSettings, { |
| 332 | + boxClasses: "content " + curSettings.boxClasses, |
332 | 333 | boxWidth: dims[0] || curSettings.boxWidth, |
333 | | - boxHeight: dims[1] || curSettings.boxHeight, |
334 | | - boxClasses: "content " + curSettings.boxClasses |
| 334 | + boxHeight: dims[1] || curSettings.boxHeight |
335 | 335 | }); |
336 | 336 |
|
337 | 337 | // Open SuperBox! |
338 | | - $.superbox.open($($elt.attr('href')).clone(), curSettings); |
| 338 | + $.superbox.open($($elt.attr('href')).clone().show(), localSettings); |
339 | 339 | }); |
340 | 340 |
|
341 | 341 | }); |
|
359 | 359 | } |
360 | 360 |
|
361 | 361 | // Extend default dimension settings |
362 | | - curSettings = $.extend({}, curSettings, { |
| 362 | + var localSettings = $.extend({}, curSettings, { |
| 363 | + boxClasses: "ajax " + curSettings.boxClasses, |
363 | 364 | boxWidth: dims[0] || curSettings.boxWidth, |
364 | | - boxHeight: dims[1] || curSettings.boxHeight, |
365 | | - boxClasses: "ajax " + curSettings.boxClasses |
| 365 | + boxHeight: dims[1] || curSettings.boxHeight |
366 | 366 | }); |
367 | 367 |
|
368 | 368 | // Get Ajax URL + ID |
|
378 | 378 | } |
379 | 379 |
|
380 | 380 | // Open SuperBox! |
381 | | - $.superbox.open(data, curSettings); |
| 381 | + $.superbox.open(data, localSettings); |
382 | 382 | }); |
383 | 383 | }); |
384 | 384 | }); |
|
0 commit comments