Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:ArnaudBrousseau/isearch

  • Loading branch information...
commit 6e7aa16848d92d6b86886a508aaebe8eff3958b8 2 parents a7a5793 + 98a94fd
Arnaud Brousseau authored
View
2  cofetch/GUI/index.html
@@ -283,7 +283,7 @@
<button id="change-video">Change</button>
- <iframe id="video-previewYT" class="youtube-player" type="text/html" width="320" height="193" src="http://www.youtube.com/embed/AtxXAV18XAY?wmode=opaque" frameborder="0">
+ <iframe id="video-previewYT" class="youtube-player" type="text/html" width="320" height="193" src="http://www.youtube.com/embed/AtxXAV18XAY" frameborder="0">
</iframe>
<label for="video-name">Name: </label>
View
16 cofetch/GUI/js/libs/cofetchHandler.js
@@ -15,8 +15,8 @@ var cofetchHandler = (function() {
var fetch = function(id) {
- //var serverURL = "http://isearch.ai.erfurt.de:8082/get/";
- var serverURL = "http://localhost:8082/get/";
+ var serverURL = "http://isearch.ai.fh-erfurt.de:8081/get/";
+ //var serverURL = "http://localhost:8082/get/";
contentObjectID = id;
@@ -267,8 +267,11 @@ var cofetchHandler = (function() {
"Name": $('#main-name').val(),
"Screenshot": getScreenshot(),
"CategoryPath": $('#main-categoryPath').val(),
- "Freetext": $('#text-content').val(),
"Files": [{
+ "Type": "Text",
+ "FreeText": $('#text-content').val()
+ },
+ {
"Type": "Object3D",
"Name": $('#threed-name').val(),
"Tags": $('#threed-tags').val().split(","),
@@ -376,9 +379,8 @@ var cofetchHandler = (function() {
}
if (screenshotValue === "sound") {
return $('#sound-preview').val();
- }
-
- }
+ }
+ };
var set = function(changes) {
//"changes" is an array of {id: id, value: value}
@@ -389,7 +391,7 @@ var cofetchHandler = (function() {
var i;
for (i=0; i<changes.length; i++){
if(typeof changes[i].value !== undefined) {
- setField(changes[i].id, changes[i].value)
+ setField(changes[i].id, changes[i].value);
}
}
}
View
2  cofetch/index_jonas.js
@@ -81,7 +81,7 @@ http.createServer(function (request, response) {
console.log("Content Object Data fetched!");
- data = '_cofetchcb({"response":'+data+'})';
+ data = '_cofetchcb({"response":' + JSON.stringify(data) + '})';
response.writeHead(status.code,status.message,{
'Content-Length': Buffer.byteLength(data,'utf8'),
Please sign in to comment.
Something went wrong with that request. Please try again.