switch to new squebi version
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/85d75a14 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/85d75a14 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/85d75a14 Branch: refs/heads/ldp Commit: 85d75a14c83dccc0f3ae5eab5e48815971b876e3 Parents: db974e8 Author: tkurz <[email protected]> Authored: Thu Mar 20 10:50:43 2014 +0100 Committer: tkurz <[email protected]> Committed: Thu Mar 20 10:50:43 2014 +0100 ---------------------------------------------------------------------- .../src/main/resources/web/admin/bower.json | 2 +- .../src/main/resources/web/admin/squebi.html | 9 ++- .../src/main/resources/web/admin/squebi.js | 65 -------------------- 3 files changed, 9 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/85d75a14/platform/marmotta-sparql/src/main/resources/web/admin/bower.json ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/bower.json b/platform/marmotta-sparql/src/main/resources/web/admin/bower.json index 56448af..b86d221 100644 --- a/platform/marmotta-sparql/src/main/resources/web/admin/bower.json +++ b/platform/marmotta-sparql/src/main/resources/web/admin/bower.json @@ -2,6 +2,6 @@ "name": "SquebiMarmotta", "version": "0.0.1", "dependencies": { - "squebi":"0.0.1" + "squebi":"0.0.2" } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/marmotta/blob/85d75a14/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html b/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html index 1c9e373..d3f0827 100644 --- a/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html +++ b/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html @@ -21,7 +21,14 @@ <head> <!--###BEGIN_HEAD###--> <title>Squebi - The SPARQL Interface</title> - <script data-main="squebi" src="bower_components/requirejs/require.js"></script> + <script type="text/javascript"> + SQUEBI = { + selectService : "../select", + updateService : "../update", + app : "bower_components/squebi" + }; + </script> + <script data-main="bower_components/squebi/main" src="bower_components/requirejs/require.js"></script> <!--###END_HEAD###--> </head> <body> http://git-wip-us.apache.org/repos/asf/marmotta/blob/85d75a14/platform/marmotta-sparql/src/main/resources/web/admin/squebi.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/squebi.js b/platform/marmotta-sparql/src/main/resources/web/admin/squebi.js deleted file mode 100644 index efb26e9..0000000 --- a/platform/marmotta-sparql/src/main/resources/web/admin/squebi.js +++ /dev/null @@ -1,65 +0,0 @@ -requirejs.config({ - paths: { - async : "bower_components/requirejs-plugins/src/async", - propertyParser : "bower_components/requirejs-plugins/src/propertyParser", - goog : "bower_components/requirejs-plugins/src/goog", - jquery : "bower_components/jquery/dist/jquery", - angular : "bower_components/angular/angular", - bootstrap : "bower_components/bootstrap/dist/js/bootstrap", - bootstrapUI : "bower_components/angular-bootstrap/ui-bootstrap", - codemirror : "bower_components/codemirror/lib/codemirror", - codemirrorSparql : "bower_components/codemirror/mode/sparql/sparql", - codemirrorUI : "bower_components/angular-ui-codemirror/ui-codemirror", - codemirrorHint : "bower_components/codemirror/addon/hint/show-hint", - _squebi : "bower_components/squebi/squebi/js/squebi", - squebiBrowse : "bower_components/squebi/squebi/js/writer/squebi.browse", - squebiJson : "bower_components/squebi/squebi/js/writer/squebi.json", - squebiXml : "bower_components/squebi/squebi/js/writer/squebi.xml", - squebiPie: "bower_components/squebi/squebi-writer/piechart/squebi.pie" - }, - shim: { - 'goog': ['async','propertyParser'], - 'angular' : ['jquery'], - 'bootstrap' : ['jquery'], - 'bootstrapUI' : ['angular','bootstrap'], - 'codemirrorSparql' : ['codemirror'], - 'codemirrorUI' : ['codemirror','bootstrapUI'], - 'codemirrorHint' : ['codemirror'], - '_squebi' : ['codemirrorHint','codemirrorUI','codemirrorSparql','bootstrapUI'], - 'squebiBrowse' : ['_squebi'], - 'squebiJson' : ['_squebi'], - 'squebiXml' : ['_squebi'], - 'squebiPie' : ['_squebi'] - },map: { - '*': { - 'css': 'bower_components/require-css/css' - } - } -}); - -require([ - "css", - "squebiBrowse", - "squebiJson", - "squebiXml", - 'goog!visualization,1,packages:[corechart]', - "squebiPie", - "css!bower_components/squebi/squebi/css/flags", - "css!bower_components/bootstrap/dist/css/bootstrap", - "css!bower_components/codemirror/lib/codemirror", - "css!bower_components/codemirror/theme/neat", - "css!bower_components/codemirror/addon/hint/show-hint", - "css!bower_components/fontawesome/css/font-awesome", - "css!bower_components/squebi/squebi/css/style" -], function() { - angular.element(document).ready(function($http,$rootScope) { - $http.get("bower_components/squebi/squebi/config.json",function(data) { - data = jQuery.parseJSON(data); - data.serviceURL.select = "../select"; - data.serviceURL.update = "../update" ; - jQuery('#squebi_container').show(); - squeby.constant('SQUEBY',data); - angular.bootstrap('#squebi_container', ['Squeby']); - }); - }); -}); \ No newline at end of file
