Changeset 1121
- Timestamp:
- 11/18/08 22:22:37 (4 years ago)
- Location:
- trunk
- Files:
-
- 19 added
- 3 modified
- 39 copied
-
Xinha.css (modified) (14 diffs)
-
XinhaCore.js (modified) (3 diffs)
-
examples/XinhaConfig.js (modified) (1 diff)
-
images/tango/16x16/actions/edit-copy.png (added)
-
images/tango/16x16/places (added)
-
images/tango/16x16/places/user-trash.png (added)
-
images/tango/32x32/mimetypes/x-office-document.png (added)
-
images/tango/32x32/places/network-server.png (added)
-
plugins/PSFixed (added)
-
plugins/PSFixed/PSFixed.js (added)
-
plugins/PSLocal (added)
-
plugins/PSLocal/PSLocal.js (added)
-
plugins/PSLocal/dialog.html (added)
-
plugins/PSLocal/gears_init.js (added)
-
plugins/PSServer (added)
-
plugins/PSServer/PSServer.js (added)
-
plugins/PSServer/backend.php (added)
-
plugins/PSServer/config.inc.php (added)
-
plugins/PSServer/demo_images (copied) (copied from trunk/plugins/ExtendedFileManager/demo_images)
-
plugins/PSServer/docs (added)
-
plugins/PersistentStorage (added)
-
plugins/PersistentStorage/PersistentStorage.js (added)
-
plugins/PersistentStorage/dialog.html (added)
-
plugins/PersistentStorage/img (copied) (copied from trunk/plugins/ExtendedFileManager/img)
-
plugins/PersistentStorage/img/1x1_transparent.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/1x1_transparent.gif)
-
plugins/PersistentStorage/img/2x2.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/2x2.gif)
-
plugins/PersistentStorage/img/2x2_w.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/2x2_w.gif)
-
plugins/PersistentStorage/img/btnFolderNew.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/btnFolderNew.gif)
-
plugins/PersistentStorage/img/btnFolderNew1.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/btnFolderNew1.gif)
-
plugins/PersistentStorage/img/btnFolderUp.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/btnFolderUp.gif)
-
plugins/PersistentStorage/img/btnFolderUp1.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/btnFolderUp1.gif)
-
plugins/PersistentStorage/img/btn_cancel.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/btn_cancel.gif)
-
plugins/PersistentStorage/img/btn_ok.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/btn_ok.gif)
-
plugins/PersistentStorage/img/crop.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/crop.gif)
-
plugins/PersistentStorage/img/default.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/default.gif)
-
plugins/PersistentStorage/img/div.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/div.gif)
-
plugins/PersistentStorage/img/dots.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/dots.gif)
-
plugins/PersistentStorage/img/ed_linkfile.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/ed_linkfile.gif)
-
plugins/PersistentStorage/img/ed_linkfile1.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/ed_linkfile1.gif)
-
plugins/PersistentStorage/img/edit_active.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/edit_active.gif)
-
plugins/PersistentStorage/img/edit_copy.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/edit_copy.gif)
-
plugins/PersistentStorage/img/edit_cut.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/edit_cut.gif)
-
plugins/PersistentStorage/img/edit_paste.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/edit_paste.gif)
-
plugins/PersistentStorage/img/edit_pencil.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/edit_pencil.gif)
-
plugins/PersistentStorage/img/edit_rename.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/edit_rename.gif)
-
plugins/PersistentStorage/img/edit_trash.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/edit_trash.gif)
-
plugins/PersistentStorage/img/folder.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/folder.gif)
-
plugins/PersistentStorage/img/hand.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/hand.gif)
-
plugins/PersistentStorage/img/islocked2.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/islocked2.gif)
-
plugins/PersistentStorage/img/locked.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/locked.gif)
-
plugins/PersistentStorage/img/measure.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/measure.gif)
-
plugins/PersistentStorage/img/noimages.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/noimages.gif)
-
plugins/PersistentStorage/img/rotate.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/rotate.gif)
-
plugins/PersistentStorage/img/save.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/save.gif)
-
plugins/PersistentStorage/img/scale.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/scale.gif)
-
plugins/PersistentStorage/img/spacer.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/spacer.gif)
-
plugins/PersistentStorage/img/t_black.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/t_black.gif)
-
plugins/PersistentStorage/img/t_white.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/t_white.gif)
-
plugins/PersistentStorage/img/unlocked.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/unlocked.gif)
-
plugins/PersistentStorage/img/unlocked2.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/unlocked2.gif)
-
plugins/PersistentStorage/img/unlocked_empty.gif (copied) (copied from trunk/plugins/ExtendedFileManager/img/unlocked_empty.gif)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Xinha.css
r1044 r1121 15 15 .htmlarea .toolbar table { margin: 0; font-family: tahoma,verdana,sans-serif; font-size: 11px; } 16 16 .htmlarea .toolbar img { border: none; vertical-align: top; } 17 .htmlarea .toolbar .label { padding: 0 px3px; }17 .htmlarea .toolbar .label { padding: 0 3px; } 18 18 19 19 .htmlarea .toolbar .button { … … 22 22 border: 1px solid ButtonFace; 23 23 padding: 1px; 24 margin: 0 px;24 margin: 0; 25 25 width: 18px; 26 26 height: 18px; … … 36 36 .htmlarea .toolbar .buttonPressed 37 37 { 38 padding: 2px 0 px 0px2px;38 padding: 2px 0 0 2px; 39 39 border: 1px solid; 40 40 border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow; … … 44 44 } 45 45 .htmlarea .toolbar .indicator { 46 padding: 0 px3px;46 padding: 0 3px; 47 47 overflow: hidden; 48 48 width: 20px; … … 63 63 border-left: 1px solid ButtonShadow; 64 64 border-right: 1px solid ButtonHighlight; 65 width: 0 px;65 width: 0; 66 66 height: 18px; 67 padding: 0 px;67 padding: 0; 68 68 } 69 69 … … 158 158 color: CaptionText; 159 159 border-bottom: 1px solid #000; 160 padding: 1px 0 px2px 5px;160 padding: 1px 0 2px 5px; 161 161 font-size: 12px; 162 162 font-weight: bold; … … 168 168 float: right; 169 169 border: 1px solid #66a; 170 padding: 0 px 1px 0px2px;170 padding: 0 1px 0 2px; 171 171 margin-right: 1px; 172 172 color: #fff; … … 178 178 .dialog button { 179 179 width: 5.5em; 180 padding: 0 px;180 padding: 0; 181 181 } 182 182 .dialog .closeButton { 183 padding: 0 px;183 padding: 0; 184 184 cursor: default; 185 185 border: 1px solid; … … 210 210 height: 0.6em; 211 211 border: 1px solid; 212 padding: 0 px1em;212 padding: 0 1em; 213 213 border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow; 214 214 } … … 221 221 } 222 222 223 .dialog .buttonColor .nocolor { padding: 0 px; }223 .dialog .buttonColor .nocolor { padding: 0; } 224 224 .dialog .buttonColor .nocolor-hilite { background-color: #fff; color: #f00; } 225 225 … … 228 228 229 229 .dialog legend { font-weight: bold; } 230 .dialog fieldset table { margin: 2px 0 px; }230 .dialog fieldset table { margin: 2px 0; } 231 231 232 232 .dialog .buttons { … … 244 244 } 245 245 .popupwin { 246 padding: 0 px;247 margin: 0 px;246 padding: 0; 247 margin: 0; 248 248 } 249 249 … … 259 259 } 260 260 261 form { margin: 0 px; border: none; }261 form { margin: 0; border: none; } 262 262 263 263 … … 328 328 text-align:center; 329 329 } 330 /* Classes for filemanager styles in a dialog. */ 331 .dialog a img 332 { 333 border: 0 none transparent; 334 } 335 336 .dialog fieldset.collapsed { 337 border: 0 none transparent; 338 } 339 340 .dialog fieldset.collapsed form { 341 display: none; 342 } 343 344 .hidden 345 { 346 display: none; 347 } 348 349 .placesmanager 350 { 351 width: 95%; 352 overflow: auto; 353 } 354 355 .filemanager 356 { 357 width: 95%; 358 height: 200px; 359 overflow: auto; 360 background-color: #fff; 361 } 362 .filemanager div.file 363 { 364 min-width: 80px; 365 height: 100px; 366 position: relative; 367 float: left; 368 border: 1px outset #666; 369 margin: 4px; 370 } 371 .placesmanager div.file 372 { 373 min-width: 60px; 374 height: 70px; 375 position: relative; 376 float: left; 377 border: 1px outset #666; 378 margin: 4px; 379 } 380 .filemanager div.file:hover, 381 .placesmanager div.file:hover 382 { 383 border: 1px solid #333; 384 background: #fffff3; 385 } 386 387 .filemanager div.selected, 388 .filemanager div.selected:hover, 389 .placesmanager div.selected, 390 .placesmanager div.selected:hover 391 { 392 background: #ffffda; 393 border: 1px solid #000; 394 } 395 .filemanager .filename { 396 margin: 0.5em; 397 color: #222; 398 } 399 .filemanager div.selected .filename { 400 color: #000; 401 } 402 .filemanager img.thumb 403 { 404 width: 50px; 405 height: 50px; 406 position: absolute; 407 top: 50%; 408 left: 50%; 409 margin: -25px 0 0 -25px; 410 border: 1px solid black; 411 } 412 .filemanager img.icon 413 { 414 width: 32px; 415 height: 32px; 416 position: absolute; 417 top: 50%; 418 left: 50%; 419 margin: -16px 0 0 -16px; 420 } 421 .filemanager img.action 422 { 423 width: 15px; 424 height: 15px; 425 position: absolute; 426 } 427 .filemanager img.delete 428 { 429 bottom: 3px; 430 left: 20px; 431 } 432 .filemanager img.copy 433 { 434 bottom: 3px; 435 left: 3px; 436 } -
trunk/XinhaCore.js
r1120 r1121 1497 1497 * @private 1498 1498 */ 1499 Xinha.prototype._ addToolbar = function()1499 Xinha.prototype._rebuildToolbar = function() 1500 1500 { 1501 1501 this._createToolbar1(this, this._toolbar, this._toolbarObjects); 1502 1503 // We only want ONE editor at a time to be active 1504 if ( Xinha._currentlyActiveEditor ) 1505 { 1506 if ( Xinha._currentlyActiveEditor == this ) 1507 { 1508 this.activateEditor(); 1509 } 1510 } 1511 else 1512 { 1513 this.disableToolbar(); 1514 } 1502 1515 }; 1503 1516 … … 1526 1539 Xinha.prototype._createToolbar1 = function (editor, toolbar, tb_objects) 1527 1540 { 1541 // We will clean out any existing toolbar elements. 1542 while (toolbar.lastChild) 1543 { 1544 toolbar.removeChild(toolbar.lastChild); 1545 } 1546 1528 1547 var tb_row; 1529 1548 // This shouldn't be necessary, but IE seems to float outside of the container … … 3612 3631 multiStageLoader('start',pluginName); 3613 3632 } 3633 } 3634 else 3635 { 3636 Xinha._loadback(url, callback, this, pluginName); 3614 3637 } 3615 3638 -
trunk/examples/XinhaConfig.js
r1031 r1121 41 41 'SmartReplace', 42 42 'Stylist', 43 'PersistentStorage', 44 'PSLocal', 43 45 'Linker', 44 46 'SuperClean',
