fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Galeria skanów z przewijaniem, bez zoom'a.
[redakcja.git]
/
project
/
static
/
js
/
views
/
xml.js
diff --git
a/project/static/js/views/xml.js
b/project/static/js/views/xml.js
index
9de8d2a
..
8af3c4d
100644
(file)
--- a/
project/static/js/views/xml.js
+++ b/
project/static/js/views/xml.js
@@
-1,4
+1,4
@@
-/*global View CodeMirror render_template panels */
+/*global View CodeMirror
ButtonToolbarView
render_template panels */
var XMLView = View.extend({
_className: 'XMLView',
element: null,
var XMLView = View.extend({
_className: 'XMLView',
element: null,
@@
-10,6
+10,11
@@
var XMLView = View.extend({
init: function(element, model, parent, template) {
this._super(element, model, template);
this.parent = parent;
init: function(element, model, parent, template) {
this._super(element, model, template);
this.parent = parent;
+ this.buttonToolbar = new ButtonToolbarView(
+ $('.xmlview-toolbar', this.element),
+ this.model.toolbarButtonsModel, parent);
+
+ $('.xmlview-toolbar', this.element).bind('resize.xmlview', this.resized.bind(this));
this.parent.freeze('Ładowanie edytora...');
this.editor = new CodeMirror($('.xmlview', this.element).get(0), {
this.parent.freeze('Ładowanie edytora...');
this.editor = new CodeMirror($('.xmlview', this.element).get(0), {
@@
-25,22
+30,23
@@
var XMLView = View.extend({
});
},
});
},
+ resized: function(event) {
+ var height = this.element.height() - $('.xmlview-toolbar', this.element).outerHeight();
+ $('.xmlview', this.element).height(height);
+ },
+
editorDidLoad: function(editor) {
$(editor.frame).css({width: '100%', height: '100%'});
editorDidLoad: function(editor) {
$(editor.frame).css({width: '100%', height: '100%'});
-
this.model
.addObserver(this, 'data', this.modelDataChanged.bind(this))
this.model
.addObserver(this, 'data', this.modelDataChanged.bind(this))
- .addObserver(this, 'synced', this.modelSyncChanged.bind(this));
+ .addObserver(this, 'state', this.modelStateChanged.bind(this))
+ .load();
this.parent.unfreeze();
this.parent.unfreeze();
+
+ this.editor.setCode(this.model.get('data'));
+ this.modelStateChanged('state', this.model.get('state'));
- if (!this.model.get('synced')) {
- this.parent.freeze('Niezsynchronizowany...');
- this.model.load();
- } else {
- this.editor.setCode(this.model.get('data'));
- }
-
// editor.grabKeys(
// $.fbind(self, self.hotkeyPressed),
// $.fbind(self, self.isHotkey)
// editor.grabKeys(
// $.fbind(self, self.hotkeyPressed),
// $.fbind(self, self.isHotkey)
@@
-57,11
+63,15
@@
var XMLView = View.extend({
}
},
}
},
- modelS
ync
Changed: function(property, value) {
- if (value) {
+ modelS
tate
Changed: function(property, value) {
+ if (value
== 'synced' || value == 'dirty'
) {
this.parent.unfreeze();
this.parent.unfreeze();
- } else {
+ } else
if (value == 'unsynced')
{
this.parent.freeze('Niezsynchronizowany...');
this.parent.freeze('Niezsynchronizowany...');
+ } else if (value == 'loading') {
+ this.parent.freeze('Ładowanie...');
+ } else if (value == 'saving') {
+ this.parent.freeze('Zapisywanie...');
}
},
}
},