fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplifying toolbar list button
[fnpeditor.git]
/
modules
/
documentCanvas
/
canvas
/
wlxmlManagers.js
diff --git
a/modules/documentCanvas/canvas/wlxmlManagers.js
b/modules/documentCanvas/canvas/wlxmlManagers.js
index
75d8c67
..
b28b022
100644
(file)
--- a/
modules/documentCanvas/canvas/wlxmlManagers.js
+++ b/
modules/documentCanvas/canvas/wlxmlManagers.js
@@
-8,6
+8,8
@@
define([
var DocumentElementWrapper = function(documentElement) {
var DocumentElementWrapper = function(documentElement) {
+ this.documentElement = documentElement;
+
this.addWidget = function(widget) {
documentElement.dom().find('.canvas-widgets').append(widget);
};
this.addWidget = function(widget) {
documentElement.dom().find('.canvas-widgets').append(widget);
};
@@
-17,8
+19,8
@@
var DocumentElementWrapper = function(documentElement) {
}
this.setDisplayStyle = function(displayStyle) {
}
this.setDisplayStyle = function(displayStyle) {
- documentElement.dom().css('display', displayStyle);
- documentElement._container().css('display', displayStyle);
+ documentElement.dom().css('display', displayStyle
|| ''
);
+ documentElement._container().css('display', displayStyle
|| ''
);
};
this.tag = function() {
};
this.tag = function() {
@@
-32,6
+34,13
@@
var DocumentElementWrapper = function(documentElement) {
this.toggle = function(toggle) {
documentElement._container().toggle(toggle);
}
this.toggle = function(toggle) {
documentElement._container().toggle(toggle);
}
+
+ var eventBus = documentElement.bound() ? documentElement.canvas.eventBus :
+ {trigger: function() {}};
+ this.trigger = function() {
+ eventBus.trigger.apply(eventBus, arguments);
+ }
+
}
var getDisplayStyle = function(tag, klass) {
}
var getDisplayStyle = function(tag, klass) {
@@
-39,6
+48,8
@@
var getDisplayStyle = function(tag, klass) {
return 'none';
if(tag === 'span')
return 'inline';
return 'none';
if(tag === 'span')
return 'inline';
+ if(klass === 'item')
+ return null;
return 'block';
}
return 'block';
}
@@
-53,7
+64,11
@@
$.extend(GenericManager.prototype, {
this.el.clearWidgets();
this.el.addWidget(widgets.labelWidget(this.el.tag(), this.el.klass()));
this.el.clearWidgets();
this.el.addWidget(widgets.labelWidget(this.el.tag(), this.el.klass()));
+ },
+ toggle: function(toggle) {
+ this.el.toggle(toggle);
}
}
+
})
var managers = {
})
var managers = {
@@
-78,26
+93,29
@@
$.extend(FootnoteManager.prototype, {
this.el.clearWidgets();
var clickHandler = function() {
this.el.clearWidgets();
var clickHandler = function() {
- this.
_toggleFootnot
e(true);
+ this.
toggl
e(true);
}.bind(this);
this.footnoteHandler = widgets.footnoteHandler(clickHandler);
this.el.addWidget(this.footnoteHandler);
var closeHandler = function() {
}.bind(this);
this.footnoteHandler = widgets.footnoteHandler(clickHandler);
this.el.addWidget(this.footnoteHandler);
var closeHandler = function() {
- this.
_toggleFootnot
e(false);
+ this.
toggl
e(false);
}.bind(this);
this.hideButton = widgets.hideButton(closeHandler);
this.el.addWidget(this.hideButton);
}.bind(this);
this.hideButton = widgets.hideButton(closeHandler);
this.el.addWidget(this.hideButton);
- this.
_toggleFootnote(false
);
+ this.
toggle(false, {silent: true}
);
},
},
- _toggleFootnote: function(toggle) {
+ toggle: function(toggle, options) {
+ options = options || {};
this.hideButton.toggle(toggle);
this.footnoteHandler.toggle(!toggle);
this.el.setDisplayStyle(toggle ? 'block' : 'inline');
this.el.toggle(toggle);
this.hideButton.toggle(toggle);
this.footnoteHandler.toggle(!toggle);
this.el.setDisplayStyle(toggle ? 'block' : 'inline');
this.el.toggle(toggle);
+ if(!options.silent)
+ this.el.trigger('elementToggled', toggle, this.el.documentElement);
}
})
managers.set('aside', 'footnote', FootnoteManager);
}
})
managers.set('aside', 'footnote', FootnoteManager);