summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2008-12-31 07:16:38 +0000
committerBharat Mediratta <bharat@menalto.com>2008-12-31 07:16:38 +0000
commit23105f135990dd576c3d2099fabf0962d9b9fc58 (patch)
tree753207105268e17a5559e4cb5cefec3172936439
parentc1140b5c0aac2c2c1822a65ddd55151e093e2af4 (diff)
PhotoID -> PhotoId for consistency
-rw-r--r--core/tests/selenium/Add_Comment.html2
-rw-r--r--themes/default/js/ui.init.js18
-rw-r--r--themes/default/views/album.html.php2
-rw-r--r--themes/default/views/photo.html.php2
-rw-r--r--themes/default/views/tag.html.php2
5 files changed, 13 insertions, 13 deletions
diff --git a/core/tests/selenium/Add_Comment.html b/core/tests/selenium/Add_Comment.html
index ca25b244..b4b96ed2 100644
--- a/core/tests/selenium/Add_Comment.html
+++ b/core/tests/selenium/Add_Comment.html
@@ -18,7 +18,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>gPhotoID-2</td>
+ <td>gPhotoId-2</td>
<td></td>
</tr>
<tr>
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 3a2914ee..d64db1ee 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -1,6 +1,6 @@
/**
* Initialize jQuery UI and Plugin elements
- *
+ *
* @todo Standardize how elements requiring listeners are identified (class or id)
*/
@@ -17,7 +17,7 @@ $("document").ready(function() {
$(".gItem").wrapInner("<div></div>")
$('.gItem div').vAlign();
}
-
+
// Photo/Item item view only
if ($("#gItem").length) {
sizedImage();
@@ -47,7 +47,7 @@ $("document").ready(function() {
// Short forms
handleShortFormEvent(shortForms);
-
+
});
// Vertically align a block element's content
@@ -66,7 +66,7 @@ $.fn.vAlign = function() {
function sizedImage() {
var containerWidth = $("#gItem").width();
var oPhoto = $("#gItem img").filter(function() {
- return this.id.match(/gPhotoID-/);
+ return this.id.match(/gPhotoId-/);
});
if (containerWidth < oPhoto.width()) {
var proportion = containerWidth / oPhoto.width();
@@ -168,11 +168,11 @@ function openDialog(element) {
* @param array shortForms Array of short form IDs
*/
function handleShortFormEvent(shortForms) {
- for (var i in shortForms) {
+ for (var i in shortForms) {
shortFormInit(shortForms[i]);
}
}
-
+
/**
* Initialize a short form. Short forms may contain only one text input.
*
@@ -182,15 +182,15 @@ function shortFormInit(formID) {
// Get the input ID and it's label text
var labelValue = $(formID + " label:first").html();
var inputID = "#" + $(formID + " input[type='text']:first").attr("id");
-
+
// Set the input value equal to label text
$(inputID).val(labelValue);
-
+
// Attach event listeners to the input
$(inputID).bind("focus blur", function(e){
var eLabelVal = $(this).siblings("label").html();
var eInputVal = $(this).val();
-
+
// Empty input value if it equals it's label
if (eLabelVal == eInputVal) {
$(this).val("");
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index d36ff7c2..7f4e2119 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -14,7 +14,7 @@
<li id="g<?= $child->id ?>" class="gItem <?= $album_class ?>">
<?= $theme->thumb_top($child) ?>
<a href="<?= $child->url() ?>">
- <img id="gPhotoID-<?= $child->id ?>" class="gThumbnail"
+ <img id="gPhotoId-<?= $child->id ?>" class="gThumbnail"
alt="photo" src="<?= $child->thumb_url() ?>"
width="<?= $child->thumb_width ?>"
height="<?= $child->thumb_height ?>" />
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index cf7c83b8..d23dec2d 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -5,7 +5,7 @@
</div>
<div id="gItem">
- <img id="gPhotoID-<?= $item->id ?>" alt="<?= $item->title ?>" src="<?= $item->resize_url() ?>"
+ <img id="gPhotoId-<?= $item->id ?>" alt="<?= $item->title ?>" src="<?= $item->resize_url() ?>"
width="<?= $item->resize_width ?>"
height="<?= $item->resize_height ?>" />
<div><?= $item->description ?></div>
diff --git a/themes/default/views/tag.html.php b/themes/default/views/tag.html.php
index 93cce7e7..8c950e74 100644
--- a/themes/default/views/tag.html.php
+++ b/themes/default/views/tag.html.php
@@ -15,7 +15,7 @@
<li class="gItem <?= $album_class ?>">
<?= $theme->thumb_top($child) ?>
<a href="<?= $child->url() ?>">
- <img id="gPhotoID-<?= $child->id ?>" class="gThumbnail"
+ <img id="gPhotoId-<?= $child->id ?>" class="gThumbnail"
alt="photo" src="<?= $child->thumb_url() ?>"
width="<?= $child->thumb_width ?>"
height="<?= $child->thumb_height ?>" />