Revision: 51754 Author: tparscal Date: 2009-06-11 19:41:41 +0000 (Thu, 11 Jun 2009)
Log Message:
-----------
Fixed a few CSS bugs and tweked some javascript field names.
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.css
trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
Modified: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.css
===================================================================
--- trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.css
2009-06-11 19:38:39 UTC (rev 51753)
+++ trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.css
2009-06-11 19:41:41 UTC (rev 51754)
@@ -9,13 +9,13 @@
textarea#wpTextbox1 {
border: solid silver 1px;
padding: 0;
- margin-top: -2px;
+ margin: 0;
}
/* ... */
div#edittoolbar {
border: solid silver 1px;
border-bottom-width: 0;
- background-color: #EEEEEE;
+ background-color: #F3F3F3;
}
div#edittoolbar div.tabs,
div#edittoolbar div.group {
@@ -91,6 +91,7 @@
}
body.rtl div#edittoolbar div.group > select {
float: right;
+ font-size: 0.9em;
}
div#edittoolbar div.index {
float: left;
Modified: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
===================================================================
--- trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-06-11 19:38:39 UTC (rev 51753)
+++ trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-06-11 19:41:41 UTC (rev 51754)
@@ -266,14 +266,6 @@
.appendTo( pageDiv );
for ( character
in section.pages[page].characters ) {
switch(
section.pages[page].characters[character].type ) {
-
case 'break':
-
/*
-
pageDiv.append(
-
$( '<div />' )
-
.css( 'clear', 'both' )
-
);
-
*/
-
break;
case 'link':
var context = {
'tool' : section.pages[page].characters[character],
@@ -282,7 +274,7 @@
charsDiv.append(
$( '<a />' )
.attr( 'href', '#' )
-
.text( section.pages[page].characters[character].text )
+
.text( section.pages[page].characters[character].label )
.data( 'context', context)
.click( action )
.click( function() { return false; } )
@@ -363,7 +355,7 @@
for( character in
charinsert[page][line] ) {
var tool = {
type: 'link',
- text: '',
+ label: '',
action: {
type:
'encapsulate',
options: {
@@ -378,10 +370,9 @@
} else {
tool.action.options.pre
= charinsert[page][line][character];
}
- tool.text =
tool.action.options.pre + tool.action.options.post;
+ tool.label =
tool.action.options.pre + tool.action.options.post;
characters[i++] = tool;
}
- characters[i++] = { type: 'break' };
}
retval[pageKey] = {
label: page,
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
