Keep migration to jQuery ...
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
<script type="text/javascript">
|
||||
|
||||
var mapId = 'welcome';
|
||||
$(document).addEvent('loadcomplete', function(resource) {
|
||||
$(document).bind('loadcomplete', function (resource) {
|
||||
|
||||
// Set readonly option ...
|
||||
var options = loadDesignerOptions();
|
||||
@@ -34,7 +34,7 @@
|
||||
var mindmap;
|
||||
try {
|
||||
mindmap = persistence.load(mapId);
|
||||
} catch(e) {
|
||||
} catch (e) {
|
||||
// If the map could not be loaded, create a new empty map...
|
||||
mindmap = mindplot.model.Mindmap.buildEmpty(mapId);
|
||||
}
|
||||
|
@@ -20,7 +20,7 @@ var designer = null;
|
||||
|
||||
function buildDesigner(options) {
|
||||
|
||||
var container = document.id(options.container);
|
||||
var container = $("#"+options.container);
|
||||
$assert(container, 'container could not be null');
|
||||
|
||||
// Register load events ...
|
||||
@@ -219,4 +219,4 @@ editor = {};
|
||||
//waitDialog.show();
|
||||
|
||||
// Loading libraries ...
|
||||
Asset.javascript("js/mindplot-min.js");
|
||||
jQuery.getScript("js/mindplot-min.js");
|
||||
|
44
wise-editor/src/main/webapp/js/mindplot-min.js
vendored
44
wise-editor/src/main/webapp/js/mindplot-min.js
vendored
@@ -4,25 +4,21 @@
|
||||
function JSPomLoader(pomUrl, callback) {
|
||||
console.log("POM Load URL:" + pomUrl);
|
||||
var jsUrls;
|
||||
var request = new Request({
|
||||
new jQuery.ajax({
|
||||
url: pomUrl,
|
||||
method: 'get',
|
||||
onRequest: function() {
|
||||
console.log("loading ...");
|
||||
},
|
||||
onSuccess: function(responseText, responseXML) {
|
||||
|
||||
method: 'get'
|
||||
}).done(function (data) {
|
||||
// Collect JS Urls ...
|
||||
var concatRoot = responseXML.getElementsByTagName('includes');
|
||||
var fileSetArray = Array.filter(concatRoot[0].childNodes, function(elem) {
|
||||
var concatRoot = data.getElementsByTagName('includes');
|
||||
var fileSetArray = Array.filter(concatRoot[0].childNodes, function (elem) {
|
||||
return elem.nodeType == Node.ELEMENT_NODE
|
||||
});
|
||||
|
||||
jsUrls = new Array();
|
||||
Array.each(fileSetArray, function(elem) {
|
||||
Array.each(fileSetArray, function (elem) {
|
||||
var jsUrl = elem.firstChild.nodeValue;
|
||||
if (jsUrl.indexOf("${basedir}") != -1) {
|
||||
jsUrls.push(pomUrl.substring(0, pomUrl.lastIndexOf('/')) + jsUrl.replace("${basedir}",""));
|
||||
jsUrls.push(pomUrl.substring(0, pomUrl.lastIndexOf('/')) + jsUrl.replace("${basedir}", ""));
|
||||
} else {
|
||||
|
||||
jsUrls.push(pomUrl.substring(0, pomUrl.lastIndexOf('/')) + "/src/main/javascript/" + jsUrl);
|
||||
@@ -39,30 +35,30 @@ function JSPomLoader(pomUrl, callback) {
|
||||
callback();
|
||||
} else {
|
||||
var url = urls.pop();
|
||||
Asset.javascript(url, {
|
||||
onLoad: function() {
|
||||
jsRecLoad(urls)
|
||||
$.ajax({
|
||||
url: url,
|
||||
dataType: "script",
|
||||
success: function () {
|
||||
jsRecLoad(urls);
|
||||
},
|
||||
error: function(){
|
||||
console.error("Unexpected error loading:"+url);
|
||||
console.error(arguments);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
jsRecLoad(jsUrls);
|
||||
},
|
||||
onFailure: function() {
|
||||
console.log('Sorry, your request failed :(');
|
||||
}
|
||||
});
|
||||
request.send();
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Asset.javascript("../../../../../web2d/target/classes/web2d.svg-min.js", {
|
||||
onLoad: function() {
|
||||
JSPomLoader('../../../../../mindplot/pom.xml', function() {
|
||||
});
|
||||
}
|
||||
jQuery.getScript("../../../../../web2d/target/classes/web2d.svg-min.js", function () {
|
||||
JSPomLoader('../../../../../mindplot/pom.xml', function () {
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user