Index: /branches/version-2_13-dev/html/user_data/packages/admin/js/admin.js
===================================================================
--- /branches/version-2_13-dev/html/user_data/packages/admin/js/admin.js (revision 22856)
+++ /branches/version-2_13-dev/html/user_data/packages/admin/js/admin.js (revision 23061)
@@ -24,5 +24,5 @@
function fnUpdateParent(url) {
// 親ウィンドウの存在確認
- if(fnIsopener()) {
+ if(eccube.common.isOpener()) {
window.opener.location.href = url;
} else {
@@ -34,5 +34,5 @@
function fnSubmitParent() {
// 親ウィンドウの存在確認
- if(fnIsopener()) {
+ if(eccube.common.isOpener()) {
window.opener.document.form1.submit();
} else {
Index: /branches/version-2_13-dev/html/js/eccube.js
===================================================================
--- /branches/version-2_13-dev/html/js/eccube.js (revision 23058)
+++ /branches/version-2_13-dev/html/js/eccube.js (revision 23061)
@@ -33,42 +33,4 @@
}
-function win01(URL,Winname,Wwidth,Wheight){
- var WIN;
- WIN = window.open(URL,Winname,"width="+Wwidth+",height="+Wheight+",scrollbars=no,resizable=no,toolbar=no,location=no,directories=no,status=no");
- WIN.focus();
-}
-
-function win02(URL,Winname,Wwidth,Wheight){
- var WIN;
- WIN = window.open(URL,Winname,"width="+Wwidth+",height="+Wheight+",scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no");
- WIN.focus();
-}
-
-function win03(URL,Winname,Wwidth,Wheight){
- var WIN;
- WIN = window.open(URL,Winname,"width="+Wwidth+",height="+Wheight+",scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no,menubar=no");
- WIN.focus();
-}
-
-function winSubmit(URL,formName,Winname,Wwidth,Wheight){
- var WIN = window.open(URL,Winname,"width="+Wwidth+",height="+Wheight+",scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no,menubar=no");
- document.forms[formName].target = Winname;
- WIN.focus();
-}
-
-// 親ウィンドウの存在確認.
-function fnIsopener() {
- var ua = navigator.userAgent;
- if( !!window.opener ) {
- if( ua.indexOf('MSIE 4')!=-1 && ua.indexOf('Win')!=-1 ) {
- return !window.opener.closed;
- } else {
- return typeof window.opener.document == 'object';
- }
- } else {
- return false;
- }
-}
-
// 郵便番号入力呼び出し.
function fnCallAddress(php_url, tagname1, tagname2, input1, input2) {
@@ -103,12 +65,4 @@
}
-function fnOpenNoMenu(URL) {
- window.open(URL,"nomenu","scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no");
-}
-
-function fnOpenWindow(URL,name,width,height) {
- window.open(URL,name,"width="+width+",height="+height+",scrollbars=yes,resizable=no,toolbar=no,location=no,directories=no,status=no");
-}
-
function fnSetFocus(name) {
if(document.form1[name]) {
@@ -140,16 +94,4 @@
}
}
-}
-
-// Enterキー入力をキャンセルする。(IEに対応)
-function fnCancelEnter()
-{
- if (gCssUA.indexOf("WIN") != -1 && gCssUA.indexOf("MSIE") != -1) {
- if (window.event.keyCode == 13)
- {
- return false;
- }
- }
- return true;
}
@@ -308,5 +250,5 @@
// 最初に設定されていた色を保存しておく。
-var g_savecolor = new Array();
+var g_savecolor = [];
function fnChangeDisabled(list, color) {
@@ -331,5 +273,5 @@
// ログイン時の入力チェック
function fnCheckLogin(formname) {
- var lstitem = new Array();
+ var lstitem = [];
lstitem[0] = 'login_email';
@@ -357,10 +299,4 @@
}
-// 時間の計測.
-function fnPassTime(){
- end_time = new Date();
- time = end_time.getTime() - start_time.getTime();
- alert((time/1000));
-}
start_time = new Date();
@@ -368,17 +304,9 @@
function fnUpdateParent(url) {
// 親ウィンドウの存在確認
- if(fnIsopener()) {
+ if(eccube.common.isOpener()) {
window.opener.location.href = url;
} else {
window.close();
}
-}
-
-//特定のキーをSUBMITする.
-function fnKeySubmit(keyname, keyid) {
- if(keyname != "" && keyid != "") {
- document.form1[keyname].value = keyid;
- }
- document.form1.submit();
}
@@ -564,2 +492,56 @@
}
+(function( window, undefined ){
+
+ var common = {};
+
+ common.win01 = function(URL,Winname,Wwidth,Wheight){
+ var WIN;
+ WIN = window.open(URL,Winname,"width="+Wwidth+",height="+Wheight+",scrollbars=no,resizable=no,toolbar=no,location=no,directories=no,status=no");
+ WIN.focus();
+ };
+
+ common.win02 = function(URL,Winname,Wwidth,Wheight){
+ var WIN;
+ WIN = window.open(URL,Winname,"width="+Wwidth+",height="+Wheight+",scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no");
+ WIN.focus();
+ };
+
+ common.win03 = function(URL,Winname,Wwidth,Wheight){
+ var WIN;
+ WIN = window.open(URL,Winname,"width="+Wwidth+",height="+Wheight+",scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no,menubar=no");
+ WIN.focus();
+ };
+
+ common.winSubmit = function(URL,formName,Winname,Wwidth,Wheight){
+ var WIN = window.open(URL,Winname,"width="+Wwidth+",height="+Wheight+",scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no,menubar=no");
+ document.forms[formName].target = Winname;
+ WIN.focus();
+ };
+
+ common.openWindow = function(URL,name,width,height) {
+ window.open(URL,name,"width="+width+",height="+height+",scrollbars=yes,resizable=no,toolbar=no,location=no,directories=no,status=no");
+ };
+
+ // 親ウィンドウの存在確認.
+ common.isOpener = function() {
+ var ua = navigator.userAgent;
+ if( !!window.opener ) {
+ if( ua.indexOf('MSIE 4')!=-1 && ua.indexOf('Win')!=-1 ) {
+ return !window.opener.closed;
+ } else {
+ return typeof window.opener.document == 'object';
+ }
+ } else {
+ return false;
+ }
+ };
+
+ // 名前空間の重複を防ぐ
+ if (window.eccube === undefined) {
+ window.eccube = {};
+ }
+ // グローバルに使用できるようにする
+ window.eccube.common = common;
+})(window);
+
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/products/product.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/products/product.tpl (revision 23041)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/products/product.tpl (revision 23061)
@@ -437,5 +437,5 @@
- 変更
+ 変更
削除
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl (revision 22954)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl (revision 23061)
@@ -24,5 +24,5 @@
-