From d3b50910dabf490c22287e348ccb8c50bdb4a6bf Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 12 Nov 2012 13:17:04 +0100 Subject: [PATCH] Bug 7368: Removing occurrences of dependant= feature in javascript open calls The window feature dependant= should have been written as dependent= Note that this feature is ignored in most/current browsers. Since the feature was misspelled, removing it will not change any behavior or hurt anybody. Signed-off-by: Owen Leonard Passed-QA-by: Paul Poulain Signed-off-by: Jared Camins-Esakov --- .../prog/en/includes/virtualshelves-toolbar.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/js/basket.js | 6 +++--- koha-tmpl/opac-tmpl/ccsr/en/js/basket.js | 6 +++--- koha-tmpl/opac-tmpl/prog/en/js/basket.js | 4 ++-- koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc index 7318fb686a..b2bd544ab7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc @@ -15,11 +15,11 @@ }); [% IF ( viewshelf ) %] function sendList(){ - open(CGIBIN+'virtualshelves/sendshelf.pl?shelfid=[% shelfnumber %]','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); + open(CGIBIN+'virtualshelves/sendshelf.pl?shelfid=[% shelfnumber %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); } function downloadList(){ - open(CGIBIN+'virtualshelves/downloadshelf.pl?shelfid=[% shelfnumber %]','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); + open(CGIBIN+'virtualshelves/downloadshelf.pl?shelfid=[% shelfnumber %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); }[% END %] // YUI Toolbar Functions diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js index 2043cd63ad..cddddf7fbd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js @@ -79,7 +79,7 @@ function openBasket() { if ( strCookie ) { var iW = 820; var iH = 450; - var optWin = "dependant=yes,status=yes,scrollbars=yes,resizable=yes,toolbar=no,location=yes,height="+iH+",width="+iW; + var optWin = "status=yes,scrollbars=yes,resizable=yes,toolbar=no,location=yes,height="+iH+",width="+iW; var loc = CGIBIN + "basket/basket.pl?" + strCookie; var basket = open(loc, "basket", optWin); if (window.focus) {basket.focus()} @@ -335,7 +335,7 @@ function sendBasket() { var loc = CGIBIN + "basket/sendbasket.pl?" + strCookie; - var optWin="dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100"; + var optWin="scrollbars=no,resizable=no,height=300,width=450,top=50,left=100"; var win_form = open(loc,"win_form",optWin); } @@ -345,7 +345,7 @@ function downloadBasket() { var loc = CGIBIN + "basket/downloadcart.pl?" + strCookie; - open(loc,"win_form",'dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); + open(loc,"win_form",'scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); } function printBasket() { diff --git a/koha-tmpl/opac-tmpl/ccsr/en/js/basket.js b/koha-tmpl/opac-tmpl/ccsr/en/js/basket.js index 0ee0622acc..115880f2f4 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/js/basket.js +++ b/koha-tmpl/opac-tmpl/ccsr/en/js/basket.js @@ -80,7 +80,7 @@ function openBasket() { if ( strCookie ) { var iW = 820; var iH = 450; - var optWin = "dependant=yes,status=yes,scrollbars=yes,resizable=yes,toolbar=no,location=yes,height="+iH+",width="+iW; + var optWin = "status=yes,scrollbars=yes,resizable=yes,toolbar=no,location=yes,height="+iH+",width="+iW; var loc = CGIBIN + "opac-basket.pl?" + strCookie; var basket = open(loc, "basket", optWin); if (window.focus) {basket.focus()} @@ -354,7 +354,7 @@ function sendBasket() { var loc = CGIBIN + "opac-sendbasket.pl?" + strCookie; - var optWin="dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100"; + var optWin="scrollbars=no,resizable=no,height=300,width=450,top=50,left=100"; var win_form = open(loc,"win_form",optWin); } @@ -365,7 +365,7 @@ function downloadBasket() { var loc = CGIBIN + "opac-downloadcart.pl?" + strCookie; - open(loc,"win_form",'dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); + open(loc,"win_form",'scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); } function printBasket() { diff --git a/koha-tmpl/opac-tmpl/prog/en/js/basket.js b/koha-tmpl/opac-tmpl/prog/en/js/basket.js index 13a2c360a4..8a0af37c23 100644 --- a/koha-tmpl/opac-tmpl/prog/en/js/basket.js +++ b/koha-tmpl/opac-tmpl/prog/en/js/basket.js @@ -80,7 +80,7 @@ function openBasket() { if ( strCookie ) { var iW = 820; var iH = 450; - var optWin = "dependant=yes,status=yes,scrollbars=yes,resizable=yes,toolbar=no,location=yes,height="+iH+",width="+iW; + var optWin = "status=yes,scrollbars=yes,resizable=yes,toolbar=no,location=yes,height="+iH+",width="+iW; var loc = CGIBIN + "opac-basket.pl?" + strCookie; var basket = open(loc, "basket", optWin); if (window.focus) {basket.focus()} @@ -365,7 +365,7 @@ function downloadBasket() { var loc = CGIBIN + "opac-downloadcart.pl?" + strCookie; - open(loc,"win_form",'dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); + open(loc,"win_form",'scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); } function printBasket() { diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt index 76a78b908c..b94f1b5f62 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt @@ -261,9 +261,9 @@ $(function() { [% IF ( itemsloop ) %]
- Download list + Download list -[% IF ( opacuserlogin ) %]Send list[% END %] +[% IF ( opacuserlogin ) %]Send list[% END %] Print list -- 2.39.5