Update to jQuery and jQuery-UI latest

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2052 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Jeff Schiller
2012-02-23 02:48:21 +00:00
parent 9c2148a983
commit dfc67588dc
5 changed files with 64 additions and 171 deletions

File diff suppressed because one or more lines are too long

170
editor/jquery.js vendored

File diff suppressed because one or more lines are too long

View File

@@ -11,7 +11,7 @@
<link rel="stylesheet" href="spinbtn/JQuerySpinBtn.css" type="text/css"/>
<!--{if jquery_release}>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.js"></script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.js"></script>
<!{else}-->
<script type="text/javascript" src="jquery.js"></script>
<!--{endif}-->
@@ -45,7 +45,7 @@
<!-- <script type="text/javascript" src="extensions/ext-helloworld.js"></script> -->
<!-- always minified scripts -->
<script type="text/javascript" src="jquery-ui/jquery-ui-1.8.custom.min.js"></script>
<script type="text/javascript" src="jquery-ui/jquery-ui-1.8.17.custom.min.js"></script>
<script type="text/javascript" src="jgraduate/jpicker.min.js"></script>
<!-- feeds -->

View File

@@ -56,6 +56,7 @@
wireframe: false,
colorPickerCSS: null,
gridSnapping: false,
gridColor: "#000",
baseUnit: 'px',
snappingStep: 10,
showRulers: true
@@ -4133,7 +4134,7 @@
});
// Put shortcut in title
if(opts.sel && !opts.hidekey) {
if(opts.sel && !opts.hidekey && btn.attr('title')) {
var new_title = btn.attr('title').split('[')[0] + ' (' + keyval + ')';
key_assocs[keyval] = opts.sel;
// Disregard for menu items

View File

@@ -171,8 +171,8 @@ $(function() {
useFallback();
});
} else {
if(err.responseXML) {
svgdoc = parser.parseFromString(err.responseXML, "text/xml");
if(err.responseText) {
svgdoc = parser.parseFromString(err.responseText, "text/xml");
if(!svgdoc.childNodes.length) {
$(useFallback);