Commit e7536ecb authored by frjo's avatar frjo
Browse files

Rename the js settings with camelcase, just like the colorbox plugin it self,...

Rename the js settings with camelcase, just like the colorbox plugin it self, for a future settings_alter function.
parent 9f07002e
...@@ -167,17 +167,17 @@ function _colorbox_doheader() { ...@@ -167,17 +167,17 @@ function _colorbox_doheader() {
'speed' => variable_get('colorbox_transition_speed', 350), 'speed' => variable_get('colorbox_transition_speed', 350),
'opacity' => variable_get('colorbox_opacity', '0.9'), 'opacity' => variable_get('colorbox_opacity', '0.9'),
'slideshow' => variable_get('colorbox_slideshow', 0) ? TRUE : FALSE, 'slideshow' => variable_get('colorbox_slideshow', 0) ? TRUE : FALSE,
'slideshowauto' => variable_get('colorbox_slideshowauto', 1) ? TRUE : FALSE, 'slideshowAuto' => variable_get('colorbox_slideshowauto', 1) ? TRUE : FALSE,
'slideshowspeed' => variable_get('colorbox_slideshowspeed', 2500), 'slideshowSpeed' => variable_get('colorbox_slideshowspeed', 2500),
'slideshowstart' => variable_get('colorbox_text_start', 'start slideshow'), 'slideshowStart' => variable_get('colorbox_text_start', 'start slideshow'),
'slideshowstop' => variable_get('colorbox_text_stop', 'stop slideshow'), 'slideshowStop' => variable_get('colorbox_text_stop', 'stop slideshow'),
'current' => variable_get('colorbox_text_current', '{current} of {total}'), 'current' => variable_get('colorbox_text_current', '{current} of {total}'),
'previous' => variable_get('colorbox_text_previous', '« Prev'), 'previous' => variable_get('colorbox_text_previous', '« Prev'),
'next' => variable_get('colorbox_text_next', 'Next »'), 'next' => variable_get('colorbox_text_next', 'Next »'),
'close' => variable_get('colorbox_text_close', 'Close'), 'close' => variable_get('colorbox_text_close', 'Close'),
'overlayclose' => variable_get('colorbox_overlayclose', 1) ? TRUE : FALSE, 'overlayClose' => variable_get('colorbox_overlayclose', 1) ? TRUE : FALSE,
'maxwidth' => variable_get('colorbox_maxwidth', '100%'), 'maxWidth' => variable_get('colorbox_maxwidth', '100%'),
'maxheight' => variable_get('colorbox_maxheight', '100%'), 'maxHeight' => variable_get('colorbox_maxheight', '100%'),
); );
} }
else { else {
...@@ -186,17 +186,17 @@ function _colorbox_doheader() { ...@@ -186,17 +186,17 @@ function _colorbox_doheader() {
'speed' => 350, 'speed' => 350,
'opacity' => '0.85', 'opacity' => '0.85',
'slideshow' => FALSE, 'slideshow' => FALSE,
'slideshowauto' => FALSE, 'slideshowAuto' => FALSE,
'slideshowspeed' => 2500, 'slideshowSpeed' => 2500,
'slideshowstart' => '', 'slideshowStart' => '',
'slideshowstop' => '', 'slideshowStop' => '',
'current' => t('{current} of {total}'), 'current' => t('{current} of {total}'),
'previous' => t('« Prev'), 'previous' => t('« Prev'),
'next' => t('Next »'), 'next' => t('Next »'),
'close' => t('Close'), 'close' => t('Close'),
'overlayclose' => TRUE, 'overlayClose' => TRUE,
'maxwidth' => '100%', 'maxWidth' => '100%',
'maxheight' => '100%', 'maxHeight' => '100%',
); );
} }
drupal_add_js(array('colorbox' => $js_settings), array('type' => 'setting', 'scope' => JS_DEFAULT)); drupal_add_js(array('colorbox' => $js_settings), array('type' => 'setting', 'scope' => JS_DEFAULT));
......
...@@ -8,17 +8,17 @@ Drupal.behaviors.initColorbox = { ...@@ -8,17 +8,17 @@ Drupal.behaviors.initColorbox = {
speed:settings.colorbox.speed, speed:settings.colorbox.speed,
opacity:settings.colorbox.opacity, opacity:settings.colorbox.opacity,
slideshow:settings.colorbox.slideshow, slideshow:settings.colorbox.slideshow,
slideshowSpeed:settings.colorbox.slideshowspeed, slideshowSpeed:settings.colorbox.slideshowSpeed,
slideshowAuto:settings.colorbox.slideshowauto, slideshowAuto:settings.colorbox.slideshowAuto,
slideshowStart:settings.colorbox.slideshowstart, slideshowStart:settings.colorbox.slideshowStart,
slideshowStop:settings.colorbox.slideshowstop, slideshowStop:settings.colorbox.slideshowStop,
current:settings.colorbox.current, current:settings.colorbox.current,
previous:settings.colorbox.previous, previous:settings.colorbox.previous,
next:settings.colorbox.next, next:settings.colorbox.next,
close:settings.colorbox.close, close:settings.colorbox.close,
overlayClose:settings.colorbox.overlayclose, overlayClose:settings.colorbox.overlayClose,
maxWidth:settings.colorbox.maxwidth, maxWidth:settings.colorbox.maxWidth,
maxHeight:settings.colorbox.maxheight maxHeight:settings.colorbox.maxHeight
}); });
} }
}; };
......
...@@ -18,9 +18,9 @@ Drupal.behaviors.initColorboxInline = { ...@@ -18,9 +18,9 @@ Drupal.behaviors.initColorboxInline = {
speed:settings.colorbox.speed, speed:settings.colorbox.speed,
opacity:settings.colorbox.opacity, opacity:settings.colorbox.opacity,
close:settings.colorbox.close, close:settings.colorbox.close,
overlayClose:settings.colorbox.overlayclose, overlayClose:settings.colorbox.overlayClose,
maxWidth:settings.colorbox.maxwidth, maxWidth:settings.colorbox.maxWidth,
maxHeight:settings.colorbox.maxheight, maxHeight:settings.colorbox.maxHeight,
innerWidth:function(){ innerWidth:function(){
return $.urlParam('width', $(this).attr('href')); return $.urlParam('width', $(this).attr('href'));
}, },
......
...@@ -13,9 +13,9 @@ Drupal.behaviors.initColorboxLoad = { ...@@ -13,9 +13,9 @@ Drupal.behaviors.initColorboxLoad = {
speed:settings.colorbox.speed, speed:settings.colorbox.speed,
opacity:settings.colorbox.opacity, opacity:settings.colorbox.opacity,
close:settings.colorbox.close, close:settings.colorbox.close,
overlayClose:settings.colorbox.overlayclose, overlayClose:settings.colorbox.overlayClose,
maxWidth:settings.colorbox.maxwidth, maxWidth:settings.colorbox.maxWidth,
maxHeight:settings.colorbox.maxheight, maxHeight:settings.colorbox.maxHeight,
innerWidth:function(){ innerWidth:function(){
return $.urlParam('width', $(this).attr('href')); return $.urlParam('width', $(this).attr('href'));
}, },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment