Skip to content
Permalink
Browse files

Merge branch 'master' into selectmenu

  • Loading branch information...
jzaefferer committed Nov 25, 2013
2 parents 1bc5d08 + 8eeb0e7 commit 9a5f20bc7d5218f864fb65d5d20775596065280d
@@ -11,7 +11,6 @@
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.draggable.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.dialog.js"></script>
<link rel="stylesheet" href="../demos.css">
<script>
@@ -51,7 +51,7 @@
<div id="map"></div>

<div class="demo-description">
<p>Google Maps integration, using spinners to change latidude and longitude.</p>
<p>Google Maps integration, using spinners to change latitude and longitude.</p>
</div>
</body>
</html>
@@ -29,7 +29,7 @@
var tabs = $( "#tabs" ).tabs();
// modal dialog init: custom buttons and a "close" callback reseting the form inside
// modal dialog init: custom buttons and a "close" callback resetting the form inside
var dialog = $( "#dialog" ).dialog({
autoOpen: false,
modal: true,
@@ -107,7 +107,7 @@
<button class="menu" data-icon="ui-icon-triangle-1-s">Add to favorites or playlist</button>
</div>
<button title="Share this video">Share</button>
<button data-icon="ui-icon-alert">Flag as inappropiate</button>
<button data-icon="ui-icon-alert">Flag as inappropriate</button>
</div>

<div class="demo-description">
@@ -149,7 +149,7 @@
}
});
// click to set options after initalization
// click to set options after initialization
$( "#black" ).click( function() {
$( ":custom-colorize" ).colorize( "option", {
red: 0,

0 comments on commit 9a5f20b

Please sign in to comment.
You can’t perform that action at this time.