From df00d66ed9ef7119c6d8aec84597443540dd05da Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 22 Mar 2007 08:35:51 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@608
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/editor/components/table_maker/tpl/popup.html | 4 ++--
 modules/editor/components/table_maker/tpl/popup.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/editor/components/table_maker/tpl/popup.html b/modules/editor/components/table_maker/tpl/popup.html
index 497873bd7..9658407bb 100644
--- a/modules/editor/components/table_maker/tpl/popup.html
+++ b/modules/editor/components/table_maker/tpl/popup.html
@@ -8,8 +8,8 @@
     <div class="editor_title">{$lang->table_title}</div>
 
     <div class="editor_option" id="table_option" style="display:none">
-      <input name="attr" type="radio" value="table" id="table_attribute_select" onchange="doSelectOption('table');return false;"/> <label for="table_attribute_select">{$lang->table_attribute}</label>
-      <input name="attr" type="radio" value="cell" id="cell_attribute_select" onchange="doSelectOption('cell');return false;"/> <label for="cell_attribute_select">{$lang->cell_attribute}</label>
+      <input name="attr" type="radio" value="table" id="table_attribute_select" onclick="doSelectOption('table');"/> <label for="table_attribute_select">{$lang->table_attribute}</label>
+      <input name="attr" type="radio" value="cell" id="cell_attribute_select" onclick="doSelectOption('cell');"/> <label for="cell_attribute_select">{$lang->cell_attribute}</label>
     </div>
 
     <div id="table_attribute" style="display:none">
diff --git a/modules/editor/components/table_maker/tpl/popup.js b/modules/editor/components/table_maker/tpl/popup.js
index 3bf098922..13f6f1a3a 100644
--- a/modules/editor/components/table_maker/tpl/popup.js
+++ b/modules/editor/components/table_maker/tpl/popup.js
@@ -76,7 +76,7 @@ function doSelectOption(type) {
         var cellpadding = table_obj.getAttribute("cellpadding");
         if(!cellpadding) cellpadding = 1;
 
-        var border_color = table_obj.style.backgroundColor.replace(/^#/,'');
+        var border_color = table_obj.style.borderColor.replace(/^#/,'');
         if(border_color.indexOf('rgb')>-1) {
           var tmp_color = border_color.replace(/([a-z\(\) ]*)/ig,'').split(',');
           border_color = xHex(tmp_color[0], 2, '')+xHex(tmp_color[1], 2, '')+xHex(tmp_color[2], 2, '');