Skip to content

Commit

Permalink
Fixed rendering issue where changes were skipped. Upgraded to work wi…
Browse files Browse the repository at this point in the history
…th jquery 1.9.0.
  • Loading branch information
wickedest committed Feb 3, 2013
1 parent 2d0faa2 commit eaf4185
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 330 deletions.
2 changes: 1 addition & 1 deletion doc/index.html
Expand Up @@ -48,7 +48,7 @@ <h2>Basic Usage</h2>
</p> </p>
<pre class="code"> <pre class="code">
&lt;script type="text/javascript" &lt;script type="text/javascript"
src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"&gt;&lt;/script&gt; src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"&gt;&lt;/script&gt;


&lt;script type="text/javascript" src="../lib/codemirror.min.js"&gt;&lt;/script&gt; &lt;script type="text/javascript" src="../lib/codemirror.min.js"&gt;&lt;/script&gt;
&lt;link type="text/css" rel="stylesheet" href="../lib/codemirror.css" /&gt; &lt;link type="text/css" rel="stylesheet" href="../lib/codemirror.css" /&gt;
Expand Down
4 changes: 2 additions & 2 deletions editor/editor.js
Expand Up @@ -19,14 +19,14 @@ $(document).ready(function () {
$('.button-share').button({icons:{primary:'ui-icon-triangle-1-s'}, text:true}); $('.button-share').button({icons:{primary:'ui-icon-triangle-1-s'}, text:true});
$('.button-download-diff').button({icons:{primary:'ui-icon-script'}, text:false}); $('.button-download-diff').button({icons:{primary:'ui-icon-script'}, text:false});


$('#share').live({ $('#share').on({
mouseenter: function () { $('#share-menu').fadeIn(500); }, mouseenter: function () { $('#share-menu').fadeIn(500); },
mouseleave: function () { mouseleave: function () {
if (hover_timeout) clearTimeout(hover_timeout); if (hover_timeout) clearTimeout(hover_timeout);
hover_timeout = setTimeout(function(){$('#share-menu').hide();}, 100); hover_timeout = setTimeout(function(){$('#share-menu').hide();}, 100);
} }
}); });
$('#share-menu').live({ $('#share-menu').on({
mouseenter: function () { if (hover_timeout) clearTimeout(hover_timeout); }, mouseenter: function () { if (hover_timeout) clearTimeout(hover_timeout); },
mouseleave: function () { mouseleave: function () {
if (hover_timeout) clearTimeout(hover_timeout); if (hover_timeout) clearTimeout(hover_timeout);
Expand Down
2 changes: 1 addition & 1 deletion editor/jquery.upload.js
Expand Up @@ -20,7 +20,7 @@
if (options) $.extend(settings, options); if (options) $.extend(settings, options);
var container = $('<div style="display: inline-block;overflow:hidden;"></div>'); 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)" />'); 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'}); input.css({'left':'-190px','height':'16px'});
} }
var button = tthis.clone(); var button = tthis.clone();
Expand Down
6 changes: 2 additions & 4 deletions examples/example1.html
Expand Up @@ -12,11 +12,9 @@
<meta name="author" content="Jamie Peabody" /> <meta name="author" content="Jamie Peabody" />


<!-- Requires jQuery --> <!-- Requires jQuery -->
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js" type="text/javascript"></script>
<!-- Optional jquery.corner for rounded buttons -->
<script src="jquery.corner.js" type="text/javascript"></script>


<!-- Requires CodeMirror 2.16 --> <!-- Requires CodeMirror -->
<script type="text/javascript" src="../lib/codemirror.js"></script> <script type="text/javascript" src="../lib/codemirror.js"></script>
<link type="text/css" rel="stylesheet" href="../lib/codemirror.css" /> <link type="text/css" rel="stylesheet" href="../lib/codemirror.css" />


Expand Down
6 changes: 2 additions & 4 deletions examples/example2.html
Expand Up @@ -12,11 +12,9 @@
<meta name="author" content="Jamie Peabody" /> <meta name="author" content="Jamie Peabody" />


<!-- Requires jQuery --> <!-- Requires jQuery -->
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js" type="text/javascript"></script>
<!-- Optional jquery.corner for rounded buttons -->
<script src="jquery.corner.js" type="text/javascript"></script>


<!-- Requires CodeMirror 2.16 --> <!-- Requires CodeMirror -->
<script type="text/javascript" src="../lib/codemirror.js"></script> <script type="text/javascript" src="../lib/codemirror.js"></script>
<link type="text/css" rel="stylesheet" href="../lib/codemirror.css" /> <link type="text/css" rel="stylesheet" href="../lib/codemirror.css" />


Expand Down
6 changes: 2 additions & 4 deletions examples/example3.html
Expand Up @@ -12,11 +12,9 @@
<meta name="author" content="Jamie Peabody" /> <meta name="author" content="Jamie Peabody" />


<!-- Requires jQuery --> <!-- Requires jQuery -->
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js" type="text/javascript"></script>
<!-- Optional jquery.corner for rounded buttons -->
<script src="jquery.corner.js" type="text/javascript"></script>


<!-- Requires CodeMirror 2.16 --> <!-- Requires CodeMirror -->
<script type="text/javascript" src="../lib/codemirror.js"></script> <script type="text/javascript" src="../lib/codemirror.js"></script>
<link type="text/css" rel="stylesheet" href="../lib/codemirror.css" /> <link type="text/css" rel="stylesheet" href="../lib/codemirror.css" />


Expand Down
249 changes: 0 additions & 249 deletions examples/jquery.corner.js

This file was deleted.

0 comments on commit eaf4185

Please sign in to comment.