lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-03-20 09:38:39 +08:00
Code Issues Projects Releases Wiki Activity

Fixed rendering issue where changes were skipped. Upgraded to work with jquery 1.9.0.

Browse Source
This commit is contained in:
Jamie Peabody
2013-02-03 21:00:30 +00:00
parent 2d0faa2b74
commit eaf41856fa
9 changed files with 84 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor.js
View File

@@ -19,14 +19,14 @@ $(document).ready(function () {
$('.button-share').button({icons:{primary:'ui-icon-triangle-1-s'}, text:true});
$('.button-download-diff').button({icons:{primary:'ui-icon-script'}, text:false});
$('#share').live({
$('#share').on({
mouseenter: function () { $('#share-menu').fadeIn(500); },
mouseleave: function () {
if (hover_timeout) clearTimeout(hover_timeout);
hover_timeout = setTimeout(function(){$('#share-menu').hide();}, 100);
}
});
$('#share-menu').live({
$('#share-menu').on({
mouseenter: function () { if (hover_timeout) clearTimeout(hover_timeout); },
mouseleave: function () {
if (hover_timeout) clearTimeout(hover_timeout);

2
editor/jquery.upload.js
View File

@@ -20,7 +20,7 @@
if (options) $.extend(settings, options);
var container = $('<div style="display: inline-block;overflow:hidden;"></div>');
var input = $('<input type="file" name="files[]" multiple="" style="float:left;position:relative;left:-19px;height:16px;width:18px;cursor:pointer;opacity:0;-moz-opacity:0; filter:alpha(opacity=20)" />');
if ($.browser.mozilla) {
if (navigator && navigator.appCodeName == 'Mozilla') {
input.css({'left':'-190px','height':'16px'});
}
var button = tthis.clone();