Skip to content

Commit be7b384

Browse files
rodneyrehmrodneyrehm
committed
Merge branch 'master' into gh-pages
2 parents 3ee4a5f + f618887 commit be7b384

30 files changed

+5616
-5602
lines changed

‎README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,13 @@ $.contextMenu is published under the [MIT license](http://www.opensource.org/lic
103103

104104
## Changelog ##
105105

106+
### 1.6.1 (January 19th 2013) ###
107+
108+
* fixing potential html parsing problem
109+
* upgrading to jQuery UI position v1.10.0
110+
* replaced `CRLF` by `LF` (no idea how this happened in the first place...)
111+
* adding `options.reposition` to dis/allow simply relocating a menu instead of rebuilding it ([Issue #104](https://github.com/medialize/jQuery-contextMenu/issues/104))
112+
106113
### 1.6.0 (December 29th 2012) ###
107114

108115
* adding [DOM Element bound context menus](http://medialize.github.com/jQuery-contextMenu/demo/on-dom-element.html) - ([Issue 88](https://github.com/medialize/jQuery-contextMenu/issues/88))

‎demo.html

Lines changed: 117 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,118 @@
1-
<!DOCTYPE html>
2-
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
3-
<head>
4-
<meta charset="utf-8" />
5-
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
6-
<title>jQuery contextMenu Plugin Demo</title>
7-
<meta name="description" content="simple contextMenu generator for interactive web applications based on jQuery" />
8-
9-
<script src="jquery-1.8.2.min.js" type="text/javascript"></script>
10-
<script src="src/jquery.ui.position.js" type="text/javascript"></script>
11-
<script src="src/jquery.contextMenu.js" type="text/javascript"></script>
12-
<script src="screen.js" type="text/javascript"></script>
13-
<script src="prettify/prettify.js" type="text/javascript"></script>
14-
15-
<link href="src/jquery.contextMenu.css" rel="stylesheet" type="text/css" />
16-
<link href="screen.css" rel="stylesheet" type="text/css" />
17-
<link href="prettify/prettify.sunburst.css" rel="stylesheet" type="text/css" />
18-
19-
<script type="text/javascript">
20-
21-
var _gaq = _gaq || [];
22-
_gaq.push(['_setAccount', 'UA-8922143-3']);
23-
_gaq.push(['_trackPageview']);
24-
25-
(function() {
26-
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
27-
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
28-
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
29-
})();
30-
31-
</script>
32-
</head>
33-
<body>
34-
<a id="github-forkme" href="https://github.com/medialize/jQuery-contextMenu"><img src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
35-
<div id="container">
36-
<h1><a href="https://github.com/medialize/jQuery-contextMenu">jQuery contextMenu</a></h1>
37-
38-
<ul class="menu">
39-
<li><a href="index.html">About</a></li>
40-
<li class="active"><a href="demo.html">Demo</a></li>
41-
<li><a href="docs.html">Documentation</a></li>
42-
<li><a href="http://rodneyrehm.de/en/">Author</a></li>
43-
</ul>
44-
45-
<h2 id="demo">Demo: Simple Context Menu</h2>
46-
<div class="inline-spaces">
47-
<div class="context-menu-one box menu-1">
48-
<strong>right click me</strong>
49-
</div>
50-
</div>
51-
52-
<h3 id="code">Example code: Simple Context Menu</h3>
53-
<script type="text/javascript" class="showcase">
54-
$(function(){
55-
$.contextMenu({
56-
selector: '.context-menu-one',
57-
callback: function(key, options) {
58-
var m = "clicked: " + key;
59-
window.console && console.log(m) || alert(m);
60-
},
61-
items: {
62-
"edit": {name: "Edit", icon: "edit"},
63-
"cut": {name: "Cut", icon: "cut"},
64-
"copy": {name: "Copy", icon: "copy"},
65-
"paste": {name: "Paste", icon: "paste"},
66-
"delete": {name: "Delete", icon: "delete"},
67-
"sep1": "---------",
68-
"quit": {name: "Quit", icon: "quit"}
69-
}
70-
});
71-
72-
$('.context-menu-one').on('click', function(e){
73-
console.log('clicked', this);
74-
})
75-
});
76-
</script>
77-
78-
<h3 id="html">Example HTML: Simple Context Menu</h3>
79-
<div style="display:none" class="showcase" data-showcase-import=".menu-1"></div>
80-
81-
82-
<h2>jQuery Context Menu Demo Gallery</h2>
83-
<ul id="demo-list">
84-
<li class="current"><a href="demo.html">Simple Context Menu</a></li>
85-
<li><a href="demo/on-dom-element.html">Context Menu on DOM Element</a></li>
86-
<li><a href="demo/dynamic.html">Adding new Context Menu Triggers</a></li>
87-
<li><a href="demo/dynamic-create.html">Create Context Menu on demand</a></li>
88-
<li><a href="demo/async-create.html">Create Context Menu (asynchronous)</a></li>
89-
90-
<li><a href="demo/keeping-contextmenu-open.html">Keeping the context menu open</a></li>
91-
<li><a href="demo/callback.html">Command's action (callbacks)</a></li>
92-
93-
<li><a href="demo/trigger-left-click.html">Left-Click Trigger</a></li>
94-
<li><a href="demo/trigger-swipe.html">Swipe Trigger</a></li>
95-
<li><a href="demo/trigger-hover.html">Hover Activated Context Menu</a></li>
96-
<li><a href="demo/trigger-hover-autohide.html">Hover Activated Context Menu With Autohide</a></li>
97-
<li><a href="demo/trigger-custom.html">Custom Activated Context Menu</a></li>
98-
99-
<li><a href="demo/disabled-menu.html">Disabled Menu</a></li>
100-
<li><a href="demo/disabled.html">Disabled Command</a></li>
101-
<li><a href="demo/disabled-callback.html">Disabled Callback Command</a></li>
102-
<li><a href="demo/disabled-changing.html">Changing Command's disabled status</a></li>
103-
104-
<li><a href="demo/accesskeys.html">Accesskeys</a></li>
105-
<li><a href="demo/sub-menus.html">Submenus</a></li>
106-
107-
<li><a href="demo/input.html">Input Commands</a></li>
108-
<li><a href="demo/custom-command.html">Custom Command Types</a></li>
109-
110-
<li><a href="demo/menu-title.html">Menus with titles</a></li>
111-
112-
<li><a href="demo/html5-import.html">Importing HTML5 &lt;menu type=&quot;context&quot;&gt;</a></li>
113-
<li><a href="demo/html5-polyfill.html">HTML5 Polyfill</a></li>
114-
<li><a href="demo/html5-polyfill-firefox8.html">HTML5 Polyfill (Firefox 8)</a></li>
115-
</ul>
116-
</div>
117-
</body>
1+
<!DOCTYPE html>
2+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
6+
<title>jQuery contextMenu Plugin Demo</title>
7+
<meta name="description" content="simple contextMenu generator for interactive web applications based on jQuery" />
8+
9+
<script src="jquery-1.8.2.min.js" type="text/javascript"></script>
10+
<script src="src/jquery.ui.position.js" type="text/javascript"></script>
11+
<script src="src/jquery.contextMenu.js" type="text/javascript"></script>
12+
<script src="screen.js" type="text/javascript"></script>
13+
<script src="prettify/prettify.js" type="text/javascript"></script>
14+
15+
<link href="src/jquery.contextMenu.css" rel="stylesheet" type="text/css" />
16+
<link href="screen.css" rel="stylesheet" type="text/css" />
17+
<link href="prettify/prettify.sunburst.css" rel="stylesheet" type="text/css" />
18+
19+
<script type="text/javascript">
20+
21+
var _gaq = _gaq || [];
22+
_gaq.push(['_setAccount', 'UA-8922143-3']);
23+
_gaq.push(['_trackPageview']);
24+
25+
(function() {
26+
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
27+
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
28+
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
29+
})();
30+
31+
</script>
32+
</head>
33+
<body>
34+
<a id="github-forkme" href="https://github.com/medialize/jQuery-contextMenu"><img src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
35+
<div id="container">
36+
<h1><a href="https://github.com/medialize/jQuery-contextMenu">jQuery contextMenu</a></h1>
37+
38+
<ul class="menu">
39+
<li><a href="index.html">About</a></li>
40+
<li class="active"><a href="demo.html">Demo</a></li>
41+
<li><a href="docs.html">Documentation</a></li>
42+
<li><a href="http://rodneyrehm.de/en/">Author</a></li>
43+
</ul>
44+
45+
<h2 id="demo">Demo: Simple Context Menu</h2>
46+
<div class="inline-spaces">
47+
<div class="context-menu-one box menu-1">
48+
<strong>right click me</strong>
49+
</div>
50+
</div>
51+
52+
<h3 id="code">Example code: Simple Context Menu</h3>
53+
<script type="text/javascript" class="showcase">
54+
$(function(){
55+
$.contextMenu({
56+
selector: '.context-menu-one',
57+
callback: function(key, options) {
58+
var m = "clicked: " + key;
59+
window.console && console.log(m) || alert(m);
60+
},
61+
items: {
62+
"edit": {name: "Edit", icon: "edit"},
63+
"cut": {name: "Cut", icon: "cut"},
64+
"copy": {name: "Copy", icon: "copy"},
65+
"paste": {name: "Paste", icon: "paste"},
66+
"delete": {name: "Delete", icon: "delete"},
67+
"sep1": "---------",
68+
"quit": {name: "Quit", icon: "quit"}
69+
}
70+
});
71+
72+
$('.context-menu-one').on('click', function(e){
73+
console.log('clicked', this);
74+
})
75+
});
76+
</script>
77+
78+
<h3 id="html">Example HTML: Simple Context Menu</h3>
79+
<div style="display:none" class="showcase" data-showcase-import=".menu-1"></div>
80+
81+
82+
<h2>jQuery Context Menu Demo Gallery</h2>
83+
<ul id="demo-list">
84+
<li class="current"><a href="demo.html">Simple Context Menu</a></li>
85+
<li><a href="demo/on-dom-element.html">Context Menu on DOM Element</a></li>
86+
<li><a href="demo/dynamic.html">Adding new Context Menu Triggers</a></li>
87+
<li><a href="demo/dynamic-create.html">Create Context Menu on demand</a></li>
88+
<li><a href="demo/async-create.html">Create Context Menu (asynchronous)</a></li>
89+
90+
<li><a href="demo/keeping-contextmenu-open.html">Keeping the context menu open</a></li>
91+
<li><a href="demo/callback.html">Command's action (callbacks)</a></li>
92+
93+
<li><a href="demo/trigger-left-click.html">Left-Click Trigger</a></li>
94+
<li><a href="demo/trigger-swipe.html">Swipe Trigger</a></li>
95+
<li><a href="demo/trigger-hover.html">Hover Activated Context Menu</a></li>
96+
<li><a href="demo/trigger-hover-autohide.html">Hover Activated Context Menu With Autohide</a></li>
97+
<li><a href="demo/trigger-custom.html">Custom Activated Context Menu</a></li>
98+
99+
<li><a href="demo/disabled-menu.html">Disabled Menu</a></li>
100+
<li><a href="demo/disabled.html">Disabled Command</a></li>
101+
<li><a href="demo/disabled-callback.html">Disabled Callback Command</a></li>
102+
<li><a href="demo/disabled-changing.html">Changing Command's disabled status</a></li>
103+
104+
<li><a href="demo/accesskeys.html">Accesskeys</a></li>
105+
<li><a href="demo/sub-menus.html">Submenus</a></li>
106+
107+
<li><a href="demo/input.html">Input Commands</a></li>
108+
<li><a href="demo/custom-command.html">Custom Command Types</a></li>
109+
110+
<li><a href="demo/menu-title.html">Menus with titles</a></li>
111+
112+
<li><a href="demo/html5-import.html">Importing HTML5 &lt;menu type=&quot;context&quot;&gt;</a></li>
113+
<li><a href="demo/html5-polyfill.html">HTML5 Polyfill</a></li>
114+
<li><a href="demo/html5-polyfill-firefox8.html">HTML5 Polyfill (Firefox 8)</a></li>
115+
</ul>
116+
</div>
117+
</body>
118118
</html>

0 commit comments

Comments
 (0)