zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "adding multiple line support editor and in nodes"

Browse Source 
This reverts commit 5aa6775a85.
This commit is contained in:
Pablo Luna
2011-04-20 09:30:45 +01:00
parent fff2db0ab8
commit b678344991
19 changed files with 32 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/pom.xml
View File

@@ -443,7 +443,7 @@
<include>help.js</include>
<include>helpPanel.js</include>
<include>IconPanel.js</include>
<include>nicEdit.js</include>
<!--<include>nicEdit.js</include>-->
</includes>
</aggregation>
</aggregations>

8
wise-webapp/src/main/webapp/css/editor.css
View File

@@ -737,14 +737,6 @@ div#toolbar .relationshiplabel{
width:56px;
}
#mindplot ul{
list-style:disc inside none;
}
#mindplot ol{
list-style:decimal inside none;
}
.nicEdit-main {
outline:none;
}

10
wise-webapp/src/main/webapp/js/nicEdit.js
View File

@@ -399,11 +399,11 @@ var nicEditor = bkClass.extend({
selectCheck : function(e,t) {
var found = false;
do{
if(t.className && t.className.indexOf && (t.className.indexOf('nicEdit') != -1 || t.className.indexOf('nicEdit-mainContainer') != -1)) {
if(t.className && t.className.indexOf && t.className.indexOf('nicEdit') != -1) {
return false;
}
} while(t = t.parentNode);
this.fireEvent('blur',this.selectedInstance,t);
this.fireEvent('blur',this.<selectedInstance,t);
this.lastSelectedInstance = this.selectedInstance;
this.selectedInstance = null;
return false;
@@ -433,7 +433,7 @@ var nicEditorInstance = bkClass.extend({
var ie7s = (bkLib.isMSIE && !((typeof document.body.style.maxHeight != "undefined") && document.compatMode == "CSS1Compat"))
var s = {width: newX+'px', border : 0, overflowY : 'auto', overflowX: 'hidden' };
s[(ie7s) ? 'height' : 'maxHeight'] = (this.ne.options.maxHeight) ? this.ne.options.maxHeight+'px' : null;
this.editorContain = new bkElement('DIV').setStyle(s).addClass('nicEdit-mainContainer').appendBefore(e);
this.editorContain = new bkElement('DIV').setStyle(s).appendBefore(e);
var editorElm = new bkElement('DIV').setStyle({width : (newX-8)+'px', margin: '4px', minHeight : newY+'px'}).addClass('main').appendTo(this.editorContain);
e.setStyle({display : 'none'});
@@ -1149,7 +1149,7 @@ var nicEditorSelect = bkClass.extend({
});
var nicEditorFontSizeSelect = nicEditorSelect.extend({
sel : {1 : '1&nbsp;(6pt)', 2 : '2&nbsp;(8pt)', 3 : '3&nbsp;(10pt)', 4 : '4&nbsp;(15pt)'},
sel : {1 : '1&nbsp;(8pt)', 2 : '2&nbsp;(10pt)', 3 : '3&nbsp;(12pt)', 4 : '4&nbsp;(14pt)', 5 : '5&nbsp;(18pt)', 6 : '6&nbsp;(24pt)'},
init : function() {
this.setDisplay('Font&nbsp;Size...');
for(itm in this.sel) {
@@ -1159,7 +1159,7 @@ var nicEditorFontSizeSelect = nicEditorSelect.extend({
});
var nicEditorFontFamilySelect = nicEditorSelect.extend({
sel : {'arial' : 'Arial', 'times new roman' : 'Times', 'tahoma' : 'tahoma', 'verdana' : 'Verdana'},
sel : {'arial' : 'Arial','comic sans ms' : 'Comic Sans','courier new' : 'Courier New','georgia' : 'Georgia', 'helvetica' : 'Helvetica', 'impact' : 'Impact', 'times new roman' : 'Times', 'trebuchet ms' : 'Trebuchet', 'verdana' : 'Verdana'},
init : function() {
this.setDisplay('Font&nbsp;Family...');

1
wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
View File

@@ -26,6 +26,7 @@
<script type='text/javascript' src='../js/wiseLibrary.js'></script>
<script type='text/javascript' src='../js/wiseEditorLibrary.js'></script>
<script type='text/javascript' src='../js/nicEdit.js'></script>
<script type='text/javascript' src='../js/core.js'></script>
<link rel="icon" href="../images/favicon.ico" type="image/x-icon">