Changeset 4926

Timestamp:

04/09/14 07:54:15 (10 years ago)

Author:

olof.olsson@snd.gu.se

Message:

updated login path

File:

• DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js (modified) (2 diffs)

DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js

@@ -7 +7 @@
          */
         getLoggedInInfo: function(callback) {  
-            var authURL = annotationFramework.getBackend() + "/api/authentication/user";
+            var authURL = annotationFramework.getBackend() + "/api/authentication/login";
             $.ajax({
                 type: 'GET',
                 url: authURL,
                 dataType: "xml",
-                timeout: 1000, // In order to be able to catch server inaccessibility, e.g. due to security restrictions.
+                timeout: 4000, // In order to be able to catch server inaccessibility, e.g. due to security restrictions.
                 success: function(xml ,textStatus, jqXHR) {
                    $xml = $.parseXML(jqXHR.responseText);
@@ -117 +117 @@
                 annotationFramework.putFullAnnotation(aid, xmlString);
             });
-        },        
+        },
+        getCacheURL: function(om_object){
+            
+        },
         getAidFromOid: function(oid) {
             var aSql = 'SELECT dasish_aid FROM om_object WHERE oid="' + oid + '"';