Permalink
Browse files

further updates

  • Loading branch information...
addyosmani committed Aug 20, 2011
1 parent 90ece45 commit 9609689713ab26ff4a29db7b19c7ed24b474b603
Showing with 1,034 additions and 990 deletions.
  1. +10 −10 demo.html
  2. +3 −3 index.html
  3. +18 −0 jquery-1.6.2.min.js
  4. +1,002 −976 jquery.contextMenu.js
  5. +1 −1 screen.css
View
@@ -6,7 +6,7 @@
<title>jQuery contextMenu Plugin Demo</title>
<meta name="description" content="simple contextMenu generator for interactive web applications based on jQuery" />
- <script src="jquery-1.6.1.min.js" type="text/javascript"></script>
+ <script src="jquery-1.6.2.min.js" type="text/javascript"></script>
<script src="jquery.ui.position.js" type="text/javascript"></script>
<script src="jquery.contextMenu.js" type="text/javascript"></script>
<link href="jquery.contextMenu.css" rel="stylesheet" type="text/css" />
@@ -16,7 +16,7 @@
<body>
<a id="github-forkme" href="http://github.com/medialize/jQuery-contextMenu"><img src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
<div id="container">
- <h1><a href="http://github.com/medialize/jQuery-contextMenu">jQuery contextMenu</a></h1>
+ <h1><a href="http://github.com/addyosmani/jQuery-contextMenu">jQuery contextMenu</a></h1>
<ul class="menu">
<li><a href="index.html">About</a></li>
@@ -462,17 +462,17 @@ <h2 id="html5">Demo: HTML5 &lt;menu&gt;</h2>
</menu>
</menu>
- <menu id="html5polyfill" type="context" style="display:none">
- <command label="rotate" onclick="alert('rotate')">
- <command label="resize" onclick="alert('resize')">
+
+ <menu type="context" id="html5polyfill">
+ <menuitem label="rotate" onclick="rotate()" icon="http://cdn1.iconfinder.com/data/icons/silk2/arrow_rotate_clockwise.png"></menuitem>
+ <menuitem label="resize" onclick="resize()" icon="http://cdn3.iconfinder.com/data/icons/fugue/icon/image-resize.png"></menuitem>
<menu label="share">
- <command label="twitter" onclick="alert('twitter')">
- <hr>
- <command label="facebook" onclick="alert('facebook')">
- <hr>
- <label>foo bar<input type="text" name="foo"></label>
+ <menuitem label="twitter" onclick="alert('foo')"></menuitem>
+ <menuitem label="facebook" onclick="alert('bar')"></menuitem>
</menu>
</menu>
+
+
</div>
</div>
</body>
View
@@ -6,7 +6,7 @@
<title>jQuery contextMenu Plugin</title>
<meta name="description" content="simple contextMenu generator for interactive web applications based on jQuery" />
- <script src="jquery-1.6.1.min.js" type="text/javascript"></script>
+ <script src="jquery-1.6.2.min.js" type="text/javascript"></script>
<script src="jquery.contextMenu.js" type="text/javascript"></script>
<link href="jquery.contextMenu.css" rel="stylesheet" type="text/css" />
<link href="screen.css" rel="stylesheet" type="text/css" />
@@ -15,7 +15,7 @@
<body>
<a id="github-forkme" href="http://github.com/medialize/jQuery-contextMenu"><img src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
<div id="container">
- <h1><a href="http://github.com/medialize/jQuery-contextMenu">jQuery contextMenu</a></h1>
+ <h1><a href="http://github.com/addyosmani/jQuery-contextMenu">jQuery contextMenu</a></h1>
<ul class="menu">
<li class="active"><a href="index.html">About</a></li>
@@ -55,7 +55,7 @@ <h2 id="features">Features</h2>
<li>enable / disable commands</li>
<li>nested sub-menus</menu>
<li>full keyboard interaction</menu>
- <li>HTML5 &lt;menu&gt; support</menu>
+ <li>HTML5 &lt;menu&gt; support (with patched support for the Firefox nightlies by @addyosmani)</menu>
<li>CSS is for styling, javascript is not…</li>
</ul>
</div>
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 9609689

Please sign in to comment.