Author: ornicar2
Date: 2010-01-30 02:29:50 +0100 (Sat, 30 Jan 2010)
New Revision: 27316
Added:
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/dmMarkitup/sets/markdown/images/full_screen.png
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminForm.js
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/dmMarkitup/sets/markdown/set.js
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/dmMarkitup/sets/markdown/style.css
Log:
[Diem]
- implemented admin markdown full-screen
- delayed admin hotkeys for performance reason
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminForm.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminForm.js
2010-01-30 00:26:36 UTC (rev 27315)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminForm.js
2010-01-30 01:29:50 UTC (rev 27316)
@@ -27,11 +27,16 @@
{
if ($save = $('li.sf_admin_action_save:first input', this.$).orNot())
{
- this.$.bindKey('Ctrl+s', function()
+ var self = this;
+
+ setTimeout(function()
{
- $save.trigger('click');
- return false;
- });
+ self.$.bindKey('Ctrl+s', function()
+ {
+ $save.trigger('click');
+ return false;
+ });
+ }, 1000);
}
},
@@ -46,6 +51,39 @@
var value = $editor.val();
$editor.dmMarkdown();
+
+ var $container = $editor.closest('div.markItUpContainer');
+
+ 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() {
+ $container.toggleClass('dm_markdown_full_screen');
+
+ if($container.hasClass('dm_markdown_full_screen'))
+ {
+ $editor
+ .data('old_height', $editor.height())
+ .resizable('destroy').height($(window).height()-90);
+ resize();
+ window.scrollTo(0, Math.round($container.offset().top) - 40);
+ }
+ else
+ {
+ $editor.resizable('destroy').height($editor.data('old_height'));
+ resize();
+ }
+ })
+ );
setInterval(function()
{
@@ -66,13 +104,8 @@
});
}
}, 500);
-
- $preview.height($editor.closest('div.markItUpContainer').innerHeight()
- 13);
-
- $editor.resizable({
- alsoResize: $preview,
- handles: 's'
- });
+
+ resize();
});
},
Added:
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/dmMarkitup/sets/markdown/images/full_screen.png
===================================================================
(Binary files differ)
Property changes on:
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/dmMarkitup/sets/markdown/images/full_screen.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/dmMarkitup/sets/markdown/set.js
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/dmMarkitup/sets/markdown/set.js
2010-01-30 00:26:36 UTC (rev 27315)
+++
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/dmMarkitup/sets/markdown/set.js
2010-01-30 01:29:50 UTC (rev 27316)
@@ -24,11 +24,11 @@
// mIu nameSpace to avoid conflict.
miu = {
- markdownTitle: function(markItUp, char) {
+ markdownTitle: function(markItUp, character) {
heading = '';
n = $.trim(markItUp.selection||markItUp.placeHolder).length;
for(i = 0; i < n; i++) {
- heading += char;
+ heading += character;
}
return '\n'+heading;
}
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/dmMarkitup/sets/markdown/style.css
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/dmMarkitup/sets/markdown/style.css
2010-01-30 00:26:36 UTC (rev 27315)
+++
plugins/diemPlugin/trunk/dmCorePlugin/web/lib/dmMarkitup/sets/markdown/style.css
2010-01-30 01:29:50 UTC (rev 27316)
@@ -1,38 +1,42 @@
-/* -------------------------------------------------------------------
-// markItUp!
-// By Jay Salvat - http://markitup.jaysalvat.com/
-// ------------------------------------------------------------------*/
-.markItUp .markitup_heading_1 a {
+div.markItUp li.markitup_heading_1 a {
background-image:url(images/h1.png);
}
-.markItUp .markitup_heading_2 a {
+div.markItUp li.markitup_heading_2 a {
background-image:url(images/h2.png);
}
-.markItUp .markitup_heading_3 a {
+div.markItUp li.markitup_heading_3 a {
background-image:url(images/h3.png);
}
-.markItUp .markitup_heading_4 a {
+div.markItUp li.markitup_heading_4 a {
background-image:url(images/h4.png);
}
-.markItUp .markitup_bold a {
+div.markItUp li.markitup_bold a {
background-image:url(images/bold.png);
}
-.markItUp .markitup_italic a {
+div.markItUp li.markitup_italic a {
background-image:url(images/italic.png);
}
-.markItUp .markitup_ul a {
+div.markItUp li.markitup_ul a {
background-image:url(images/list-bullet.png);
}
-.markItUp .markitup_ol a {
+div.markItUp li.markitup_ol a {
background-image:url(images/list-numeric.png);
}
-.markItUp .markitup_link a {
+div.markItUp li.markitup_link a {
background-image:url(images/link.png);
}
-.markItUp .markitup_quote a {
+div.markItUp li.markitup_quote a {
background-image:url(images/quotes.png);
+}
+
+div.markItUp li.markitup_full_screen {
+ float: right;
+}
+
+div.markItUp li.markitup_full_screen a {
+ background-image:url(images/full_screen.png);
}
\ 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.
