fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dodanie flash messages.
[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
460317b
..
8af3c4d
100644
(file)
--- a/
project/static/js/views/xml.js
+++ b/
project/static/js/views/xml.js
@@
-32,7
+32,6
@@
var XMLView = View.extend({
resized: function(event) {
var height = this.element.height() - $('.xmlview-toolbar', this.element).outerHeight();
resized: function(event) {
var height = this.element.height() - $('.xmlview-toolbar', this.element).outerHeight();
- console.log('.xmlview height =', height);
$('.xmlview', this.element).height(height);
},
$('.xmlview', this.element).height(height);
},
@@
-40,16
+39,14
@@
var XMLView = View.extend({
$(editor.frame).css({width: '100%', height: '100%'});
this.model
.addObserver(this, 'data', this.modelDataChanged.bind(this))
$(editor.frame).css({width: '100%', height: '100%'});
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.editor.setCode(this.model.get('data'));
this.parent.unfreeze();
this.editor.setCode(this.model.get('data'));
- if (!this.model.get('synced')) {
- this.parent.freeze('Niezsynchronizowany...');
- this.model.load();
- }
-
+ this.modelStateChanged('state', this.model.get('state'));
+
// editor.grabKeys(
// $.fbind(self, self.hotkeyPressed),
// $.fbind(self, self.isHotkey)
// editor.grabKeys(
// $.fbind(self, self.hotkeyPressed),
// $.fbind(self, self.isHotkey)
@@
-66,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...');
}
},
}
},