Author: ornicar2
Date: 2010-02-04 02:11:54 +0100 (Thu, 04 Feb 2010)
New Revision: 27529
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminForm.js
Log:
[Diem]
- fixed admin markdown editor fullscreen mode for google chrome
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
2010-02-04 00:27:47 UTC (rev 27528)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
2010-02-04 01:11:54 UTC (rev 27529)
@@ -119,6 +119,7 @@
{
$(this).change(function()
{
+ self.$.block();
location.href = self.getHref('+/dmAdminGenerator/changeMaxPerPage')
+ "?dm_module=" + self.options.module + "&max_per_page=" + $(this).val()
});
});
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminForm.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminForm.js
2010-02-04 00:27:47 UTC (rev 27528)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminForm.js
2010-02-04 01:11:54 UTC (rev 27529)
@@ -9,7 +9,6 @@
this.focusFirstInput();
this.markdown();
- this.selectObject();
this.checkBoxList();
this.droppableInput();
this.hotKeys();
@@ -71,16 +70,6 @@
}
});
- var resize = function()
- {
- $preview.height($container.innerHeight() - 13);
-
- $editor.resizable({
- alsoResize: $preview,
- handles: 's'
- }).width($container.width()-6);
- };
-
$container.find('div.markItUpHeader ul').append(
$('<li class="markitup_full_screen"><a title="Full Screen">Full
Screen</a></li>')
.click(function() {
@@ -90,14 +79,20 @@
{
$editor
.data('old_height', $editor.height())
- .resizable('destroy').height($(window).height()-90);
- resize();
+ .height($(window).height()-90)
+ .parent().height($(window).height()-84);
+
+ $preview.height($container.innerHeight() - 20);
+
window.scrollTo(0, Math.round($container.offset().top) - 40);
}
else
{
- $editor.resizable('destroy').height($editor.data('old_height'));
- resize();
+ $editor
+ .height($editor.data('old_height'))
+ .parent().height($editor.data('old_height')+6);
+
+ $preview.height($container.innerHeight() - 20);
}
})
);
@@ -122,19 +117,16 @@
}
}, 500);
- resize();
+
+ $preview.height($container.innerHeight() - 13);
+
+ $editor.resizable({
+ alsoResize: $preview,
+ handles: 's'
+ }).width($container.width()-6);
});
},
- selectObject: function()
- {
- // Switch to another object
- $("#dm_select_object").bind('change', function()
- {
- location.href = $(this).metadata().href.replace('_ID_', $(this).val());
- });
- },
-
checkBoxList: function()
{
var $list = $('ul.checkbox_list', this.element);
@@ -167,4 +159,4 @@
});
-})(jQuery);
+})(jQuery);
\ No newline at end of file
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
