From 86b00f6080d7dea799bb753daee794ca9ed0454c Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Thu, 17 Jan 2013 16:11:18 -0500
Subject: [PATCH] Style fixes; moved uniqueValues() function to a more
appropriate file.
---
themes/blueprint/js/cart.js | 12 ++++++
themes/blueprint/js/common.js | 77 +++++++++++++++++------------------
2 files changed, 49 insertions(+), 40 deletions(-)
diff --git a/themes/blueprint/js/cart.js b/themes/blueprint/js/cart.js
index 5ff773997fc..59f2ea1d424 100644
--- a/themes/blueprint/js/cart.js
+++ b/themes/blueprint/js/cart.js
@@ -84,6 +84,18 @@ function getItemsFromCartCookie() {
return [];
}
+// return unique values from the given array
+function uniqueValues(array) {
+ var o = {}, i, l = array.length, r = [];
+ for(var i=0; i<l;i++) {
+ o[array[i]] = array[i];
+ }
+ for(var i in o) {
+ r.push(o[i]);
+ }
+ return r;
+}
+
function addItemToCartCookie(item) {
var items = getItemsFromCartCookie();
if(items.length < vufindString.bookbagMax) {
diff --git a/themes/blueprint/js/common.js b/themes/blueprint/js/common.js
index 93c0bbafdd9..f795501c060 100644
--- a/themes/blueprint/js/common.js
+++ b/themes/blueprint/js/common.js
@@ -1,3 +1,5 @@
+/*global path*/
+
/**
* Initialize common functions and event handlers.
*/
@@ -48,7 +50,7 @@ function filterAll(element, formId) {
function extractParams(str) {
var params = {};
var classes = str.split(/\s+/);
- for(i = 0; i < classes.length; i++) {
+ for(var i = 0; i < classes.length; i++) {
if (classes[i].indexOf(':') > 0) {
var pair = classes[i].split(':');
params[pair[0]] = pair[1];
@@ -57,18 +59,6 @@ function extractParams(str) {
return params;
}
-// return unique values from the given array
-function uniqueValues(array) {
- var o = {}, i, l = array.length, r = [];
- for(i=0; i<l;i++) {
- o[array[i]] = array[i];
- }
- for(i in o) {
- r.push(o[i]);
- }
- return r;
-}
-
function initAutocomplete() {
$('input.autocomplete').each(function() {
var params = extractParams($(this).attr('class'));
@@ -128,7 +118,6 @@ function printIDs(ids)
}
var contextHelp = {
-
init: function() {
$('body').append('<table cellspacing="0" cellpadding="0" id="contextHelp"><tbody><tr class="top"><td class="left"></td><td class="center"><div class="arrow up"></div></td><td class="right"></td></tr><tr class="middle"><td></td><td class="body"><div id="closeContextHelp"></div><div id="contextHelpContent"></div></td><td></td></tr><tr class="bottom"><td class="left"></td><td class="center"><div class="arrow down"></div></td><td class="right"></td></tr></tbody></table>');
},
@@ -165,14 +154,14 @@ var contextHelp = {
isUp:false,
load:function(){
$(contextHelp.contextHelpSys.closeButton).click(contextHelp.contextHelpSys.hideMessage);
- $(window).resize(contextHelp.contextHelpSys.position)},
+ $(window).resize(contextHelp.contextHelpSys.position);},
setPosition:function(element, offsetX, offsetY, direction, align, maxWidth, showCloseButton){
- if(element==null){element=document}
- if(offsetX==null){offsetX=0}
- if(offsetY==null){offsetY=0}
- if(direction==null){direction="auto"}
- if(align==null){align="auto"}
- if(showCloseButton==null){showCloseButton=true}
+ if(element==null){element=document;}
+ if(offsetX==null){offsetX=0;}
+ if(offsetY==null){offsetY=0;}
+ if(direction==null){direction="auto";}
+ if(align==null){align="auto";}
+ if(showCloseButton==null){showCloseButton=true;}
contextHelp.contextHelpSys.curElement=$(element);
contextHelp.contextHelpSys.curOffsetX=offsetX;
contextHelp.contextHelpSys.curOffsetY=offsetY;
@@ -188,40 +177,47 @@ var contextHelp = {
var direction=contextHelp.contextHelpSys.curDirection;
var align=contextHelp.contextHelpSys.curAlign;
if(contextHelp.contextHelpSys.curMaxWidth){
- $(contextHelp.contextHelpSys.CHTable).css("width",contextHelp.contextHelpSys.curMaxWidth)}
- else{
- $(contextHelp.contextHelpSys.CHTable).css("width","auto")}
- if(direction=="auto"){
- if(parseInt(top)-parseInt($(contextHelp.contextHelpSys.CHTable).height()<$(document).scrollTop())){
- direction="down"}
- else{direction="up"}
+ $(contextHelp.contextHelpSys.CHTable).css("width",contextHelp.contextHelpSys.curMaxWidth);
+ } else {
+ $(contextHelp.contextHelpSys.CHTable).css("width","auto");
+ }
+ if (direction=="auto") {
+ if (parseInt(top)-parseInt($(contextHelp.contextHelpSys.CHTable).height()<$(document).scrollTop())) {
+ direction="down";
+ } else {
+ direction="up";
+ }
}
if(direction=="up"){
top = parseInt(top) - parseInt($(contextHelp.contextHelpSys.CHTable).height());
$(contextHelp.contextHelpSys.arrowUp).css("display","none");
- $(contextHelp.contextHelpSys.arrowDown).css("display","block")}
- else{
+ $(contextHelp.contextHelpSys.arrowDown).css("display","block");
+ } else {
if(direction=="down"){
top = parseInt(top) + parseInt(contextHelp.contextHelpSys.curElement.height());
$(contextHelp.contextHelpSys.arrowUp).css("display","block");
- $(contextHelp.contextHelpSys.arrowDown).css("display","none")}
+ $(contextHelp.contextHelpSys.arrowDown).css("display","none");
}
+ }
if(align=="auto"){
if(left+parseInt($(contextHelp.contextHelpSys.CHTable).width()>$(document).width())){
- align="left"}
- else{align="right"}
+ align="left";
+ } else {
+ align="right";
+ }
}
if(align=="right"){
left-=24;
$(contextHelp.contextHelpSys.arrowUp).css("background-position","0 0");
- $(contextHelp.contextHelpSys.arrowDown).css("background-position","0 -6px")
+ $(contextHelp.contextHelpSys.arrowDown).css("background-position","0 -6px");
}
else{
if(align=="left"){
left-=parseInt($(contextHelp.contextHelpSys.CHTable).width());
left+=24;
$(contextHelp.contextHelpSys.arrowUp).css("background-position","100% 0");
- $(contextHelp.contextHelpSys.arrowDown).css("background-position","100% -6px")}
+ $(contextHelp.contextHelpSys.arrowDown).css("background-position","100% -6px");
+ }
}
if(contextHelp.contextHelpSys.showCloseButton) {
$(contextHelp.contextHelpSys.closeButton).show();
@@ -229,20 +225,21 @@ var contextHelp = {
$(contextHelp.contextHelpSys.closeButton).hide();
}
$(contextHelp.contextHelpSys.CHTable).css("left",left + "px");
- $(contextHelp.contextHelpSys.CHTable).css("top",top + "px");},
-
+ $(contextHelp.contextHelpSys.CHTable).css("top",top + "px");
+ },
updateContents:function(msg){
contextHelp.contextHelpSys.isUp=true;
$(contextHelp.contextHelpSys.CHContent).empty();
$(contextHelp.contextHelpSys.CHContent).append(msg);
contextHelp.contextHelpSys.position();
$(contextHelp.contextHelpSys.CHTable).hide();
- $(contextHelp.contextHelpSys.CHTable).fadeIn()
- },
+ $(contextHelp.contextHelpSys.CHTable).fadeIn();
+ },
hideMessage:function(){
if(contextHelp.contextHelpSys.isUp){
$(contextHelp.contextHelpSys.CHTable).fadeOut();
- contextHelp.contextHelpSys.isUp=false}
+ contextHelp.contextHelpSys.isUp=false;
+ }
}
}
}
--
GitLab