fnp
/
redakcja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
155bc1a
)
Fixed logging in FF. Scrolling should now magicly work.
author
Łukasz Rekucki
<lrekucki@gmail.com>
Wed, 26 Aug 2009 09:05:35 +0000
(11:05 +0200)
committer
Łukasz Rekucki
<lrekucki@gmail.com>
Wed, 26 Aug 2009 09:05:35 +0000
(11:05 +0200)
project/static/css/master.css
patch
|
blob
|
history
project/static/js/editor.js
patch
|
blob
|
history
project/static/js/jquery.logging.js
patch
|
blob
|
history
project/templates/explorer/panels/htmleditor.html
patch
|
blob
|
history
diff --git
a/project/static/css/master.css
b/project/static/css/master.css
index
74376ea
..
f2ca8c1
100644
(file)
--- a/
project/static/css/master.css
+++ b/
project/static/css/master.css
@@
-120,6
+120,7
@@
label {
/* contents */
.panel-content {
position: absolute;
/* contents */
.panel-content {
position: absolute;
+ overflow: auto;
top: 22px; left: 0px; bottom:0px; right: 0px;
}
top: 22px; left: 0px; bottom:0px; right: 0px;
}
diff --git
a/project/static/js/editor.js
b/project/static/js/editor.js
index
4a1c9d1
..
234a436
100644
(file)
--- a/
project/static/js/editor.js
+++ b/
project/static/js/editor.js
@@
-4,7
+4,6
@@
function Panel(panelWrap) {
self.contentDiv = $('.panel-content', panelWrap);
self.instanceId = Math.ceil(Math.random() * 1000000000);
$.log('new panel - wrap: ', self.wrap);
self.contentDiv = $('.panel-content', panelWrap);
self.instanceId = Math.ceil(Math.random() * 1000000000);
$.log('new panel - wrap: ', self.wrap);
-
$(document).bind('panel:unload.' + self.instanceId,
function(event, data) { self.unload(event, data); });
$(document).bind('panel:unload.' + self.instanceId,
function(event, data) { self.unload(event, data); });
@@
-18,7
+17,6
@@
function Panel(panelWrap) {
return false;
});
return false;
});
-
}
Panel.prototype.callHook = function(hookName) {
}
Panel.prototype.callHook = function(hookName) {
@@
-56,7
+54,6
@@
Panel.prototype.unload = function(event, data) {
if( data == this ) {
$.log('unloading', this);
if( data == this ) {
$.log('unloading', this);
- $(document).unbind('panel:unload.' + this.instanceId);
$(this.contentDiv).html('');
this.callHook('unload');
this.hooks = null; // flush the hooks
$(this.contentDiv).html('');
this.callHook('unload');
this.hooks = null; // flush the hooks
diff --git
a/project/static/js/jquery.logging.js
b/project/static/js/jquery.logging.js
index
3b9175b
..
0f0df51
100644
(file)
--- a/
project/static/js/jquery.logging.js
+++ b/
project/static/js/jquery.logging.js
@@
-27,7
+27,7
@@
if ($.browser.mozilla)
$.log.browserLog = mozillaLog;
if ($.browser.mozilla)
$.log.browserLog = mozillaLog;
- if ($.browser.safari)
+
else
if ($.browser.safari)
$.log.browserLog = safariLog;
else if($.browser.opera)
$.log.browserLog = operaLog;
$.log.browserLog = safariLog;
else if($.browser.opera)
$.log.browserLog = operaLog;
diff --git
a/project/templates/explorer/panels/htmleditor.html
b/project/templates/explorer/panels/htmleditor.html
index
d5e0acb
..
3323cf1
100644
(file)
--- a/
project/templates/explorer/panels/htmleditor.html
+++ b/
project/templates/explorer/panels/htmleditor.html
@@
-2,11
+2,11
@@
<script type="text/javascript" charset="utf-8">
panel_hooks = {
load: function()
<script type="text/javascript" charset="utf-8">
panel_hooks = {
load: function()
+
{
{
- this.contentDiv.addClass('panel-htmleditor');
},
unload: function() {
},
unload: function() {
- this.contentDiv.removeClass('panel-htmleditor');
+
}
};
</script>
}
};
</script>