Skip to content

O
officejs
Commit 518161fb authored by François Billioud's avatar François Billioud
Browse files
Options

add JIOStorage management

parent 594bdd07
Show whitespace changes
Inline Side-by-side
Showing with 206 additions and 146 deletions
UNGProject/js/theme.js
View file @ 518161fb
......@@ -5,6 +5,7 @@
/*
* global variables
*/
applicationID = window.location.href.split("://")[1].split("/")[0];
languages = ["fr","en"];
var availableLanguages = $("#available_languages");
......@@ -73,7 +74,7 @@ Page.prototype = {
doc=new JSONIllustrationDocument();
break;
default://renvoie à la page d'accueil
window.location = "ung.html";
window.location.href = "ung.html";
return;
break;
}
......@@ -138,8 +139,8 @@ Page.prototype = {
displayPageTitle: function() {$("title#page_title").html(this.getTitle());},
displayPageContent: function() {$("div#page_content").html(this.getContent());}
}
getCurrentPage = function() {return currentPage;}
setCurrentPage = function(page) {currentPage = page;}
function getCurrentPage() {return currentPage;}
function setCurrentPage(page) {currentPage = page;}
/*
* User Class
......@@ -157,9 +158,9 @@ var User = function(arg) {
this.name = "UNG";//default name
this.settings = {
language: "en",
displayPreferences: 15//number of displayed document in the list
displayPreferences: 15,//number of displayed document in the list
checkAllMethod: "page"//check only the displayed page
}
this.documentList = new DocumentList();
this.documents = {};
}
}
......@@ -168,12 +169,12 @@ User.prototype.load({//add methods thanks to the UngObject.load method
getName: function() {return this.name;},
setName: function(newName) {this.name = newName;},
getSetting: function(key) {return this.settings[key];},
setSetting: function(key,value) { this.settings[key] = value; },
setSetting: function(key,value) {this.settings[key] = value;},
getSettings: function() {return this.settings;},
getDocumentList: function() {return this.documentList;},
setDocumentList: function(list) {this.documentList = list;},
getIDProvider: function() {return this.IDProvider;},
getStorageLocation: function() {return this.storageLocation;},
setAsCurrentUser: function() {
getCurrentPage().displayUserName(this);
......@@ -183,7 +184,7 @@ User.prototype.load({//add methods thanks to the UngObject.load method
}
});
getCurrentUser = function() {
function getCurrentUser() {
return getCurrentStorage().getUser();
}
......@@ -195,26 +196,20 @@ getCurrentUser = function() {
* Class Storage
* this class provides usual API to save/load/delete elements
* @param type : "local" to save in localStorage, or "JIO" for remote storage
* @param userName : the name of the user concerned by this storage
*/
var Storage = function(type, userName) {
var Storage = function(type) {
this.type = type;
if(userName) {
var loaded = this.loadUser(userName)//load an existing user
if(!loaded) {//create a new user if there was no such one
var user = new User();
user.setName(userName);
this.setUser(user);
}
}
}
Storage.prototype = new UngObject();
Storage.prototype.load({
getType: function() {return this.type;},
getUser: function() {return this.user;},
loadUser: function(userName) {},
setUser: function(user) {this.user = user}
setUser: function(user) {this.user = user;this.save();},
updateUser: function() {localStorage[this.user.name] = JSON.stringify(this.user);},
save: function() {
this.updateUser();
localStorage.setItem("currentStorage", JSON.stringify(this));
}
});
/**
......@@ -222,7 +217,15 @@ Storage.prototype.load({
* this class provides usual API to save/load/delete documents on the localStorage
*/
var LocalStorage = function(userName) {
Storage.call(this,"local", userName);
Storage.call(this,"local");
if(userName) {
var loaded = this.loadUser(userName)//load an existing user
if(!loaded) {//create a new user if there was no such one
var user = new User();
user.setName(userName);
this.setUser(user);
}
}
}
LocalStorage.prototype = new Storage();
LocalStorage.prototype.load({
......@@ -241,104 +244,130 @@ LocalStorage.prototype.load({
return false
}
},
getUser: function() {return this.user;},
setUser: function(user) {
this.user = user;
localStorage[this.user.name] = JSON.stringify(user);
},
updateUser: function() {localStorage[this.user.name] = JSON.stringify(this.user);},
getDocument: function(address, instruction) {
var doc = new JSONDocument(this.user.documents[address]);
getDocument: function(file, instruction) {
var doc = new JSONDocument(this.user.documents[file]);
if(instruction) instruction(doc);
return doc;
},
saveDocument: function(doc, address, instruction) {
this.user.documents[address] = doc;
this.updateUser();
saveDocument: function(doc, file, instruction) {
this.user.documents[file] = doc;
this.save();
if(instruction) instruction();
},
deleteDocument: function(address, instruction) {
delete this.user.documents[address];
this.updateUser();
deleteDocument: function(file, instruction) {
delete this.user.documents[file];
this.save();
if(instruction) instruction();
},
save: function() {
this.updateUser();
localStorage.setItem("currentStorage", JSON.stringify(this));
}
});
/**
* Class JIOStorage
* Class JIO
* this class provides usual API to save/load/delete documents on a remote storage
*/
var JIOStorage = function(userName, IDProvider) {
Storage.call(this,"JIO", userName);
if(this.user) this.user.IDProvider = IDProvider;
}
JIOStorage.prototype = new Storage();
JIOStorage.prototype.load({
loadUser: function(userName) {
//JIO : IDProvider
var JIOStorage = function(arg) {
Storage.call(this,"JIO");
if(arg.jio && arg.jio.jioFileContent) {
this.jio = JIO.initialize(arg.jio.jioFileContent, {"ID":"www.ungproject.com"});
this.user = new User(arg.user);
} else {
this.jio = initializeFromDav(arg.userName, arg.storageLocation, {"ID":"www.ungproject.com", "password":arg.applicationPassword});
//try to load user parameters
var storage = this;
JIO.loadDocument(arg.userName+".profile","text",
function(data) {//success
storage.setUser(new User(JSON.parse(data)));
storage.user.storageLocation = arg.storageLocation;
storage.save()
},
getDocument: function(address, instruction) {
function(errorEvent) {//fail
if(errorEvent.status==404){//create a new user if there was no such one
var user = new User();
user.setName(arg.userName);
storage.setUser(user);
storage.user.storageLocation = arg.storageLocation;
storage.save();
}
}
,false);
}
/**
* load JIO file from a DAV and create and return the JIO object
* @param userName : name of the user
* @param location : server location
* @param applicant : (optional) information about the person/application needing this JIO object (allow limited access)
* @return JIO object
*/
function initializeFromDav(userName, location, applicant) {
//get the user personal JIO file
$.ajax({
url: address,
url: location+"/dav/"+userName+"/"+applicant.ID+"/"+"jio.json",//we could use userAdress instead...
type: "GET",
dataType: type,
headers: {Authorization: "Basic "+btoa("smik:asdf")},
async: false,
dataType: "text",
headers: {Authorization: "Basic "+Base64.encode(userName+":"+applicant.password)},
fields: {withCredentials: "true"},
success: instruction,
error: function(type) {alert("Error "+type.status+" : fail while trying to load "+address);}
});
success: function(jioContent){
JIO.initialize(jioContent,applicant);
},
saveDocument: function(content, address, instruction) {
this.user.documents[address] = doc;
$.ajax({
url: address,
type: "PUT",
dataType: "json",
data: JSON.stringify(content),
headers: {Authorization: "Basic "+btoa("smik:asdf")},
fields: {withCredentials: "true"},
success: instruction,
error: function(type) {
if(type.status==201 || type.status==204) {instruction();}//ajax thinks that 201 is an error...
}
error: function(type) {alert("Error "+type.status+" : fail while trying to load jio.json");}
});
},
deleteDocument: function(address, instruction) {
delete this.user.documents[address];
$.ajax({
url: address,
type: "DELETE",
headers: {Authorization: "Basic "+btoa("smik:asdf")},
fields: {withCredentials: "true"},
success: instruction,
error: function(type) {
alert(type.status);//ajax thinks that 201 is an error...
return JIO;
}
}
JIOStorage.prototype = new Storage();
JIOStorage.prototype.load({
getJIO: function() {return this.jio;},
loadUser: function(userName) {//warning no return value
JIO.loadDocument(userName+".profile","text",
function(data) {setUser(new User(JSON.parse(data)));},
function(errorEvent) {if(errorEvent.status==404){}}
);
},
getDocument: function(file, instruction) {
JIO.loadDocument(file, "text", function(content) {
var doc = new JSONDocument(JSON.parse(content));
if(instruction) instruction(doc);
});
},
saveDocument: function(doc, file, instruction) {
JIO.saveDocument(JSON.stringify(doc), file, "text", true, instruction)
},
deleteDocument: function(file, instruction) {
JIO.deleteDocument(file, instruction)
},
getDocumentList: function(instruction) {
var list = JIO.getDocumentList(instruction, undefined, false);//synchrone operation. Could be asynchronised
delete list[this.userName+".profile"];
return list;
},
save: function() {
this.updateUser();
this.saveDocument(this.user,this.user.getName()+".profile",function() {});
localStorage.setItem("currentStorage",JSON.stringify(this));
}
});
getCurrentStorage = function() {
if(!currentStorage) {//if storage has not been loaded yet
function getCurrentStorage() {
if(currentStorage) {return currentStorage;}
var dataStorage = JSON.parse(localStorage.getItem("currentStorage"));
if(!dataStorage) {window.location = "login.html";return null;}//if it's the first connexion
switch(dataStorage.type) {//load the last storage used
case "local": currentStorage = new LocalStorage(); break;
case "JIO": currentStorage = new JIOStorage(); break;
}
currentStorage.loadUser(dataStorage.user.name);
currentStorage.type = dataStorage.type;
if(!dataStorage) {window.location.href = "login.html";return null;}//if it's the first connexion
if(dataStorage.type == "local") {
currentStorage = new LocalStorage(dataStorage.userName);
} else {
if(!JIO.jioFileContent) {JIO.initialize(dataStorage.jio.jioFileContent, {"ID":"www.ungproject.com"})}
currentStorage = new JIOStorage(dataStorage);
}
return currentStorage;
}
setCurrentStorage = function(storage) {
function setCurrentStorage(storage) {
currentStorage = storage;
localStorage.setItem("currentStorage", JSON.stringify(storage));
}
......@@ -413,15 +442,22 @@ JSONDocument.prototype.load({//add methods thanks to the UngObject.load method
getState:function() {return this.state;},
setState:function(state) {this.state=state;},
setAsCurrentDocument: function() {
//labels
getLabel:function() {return this.label},
isLabelised:function(label) {return this.label[label]},
addLabel:function(label) {this.label[label]=true;},
removeLabel:function(label) {delete this.label[label]},
setAsCurrentDocument: function() {//display informations about this document in the webPage
setCurrentDocument(this);
},
save: function(instruction) {
save: function(instruction) {//save the document
var doc = this;
getCurrentStorage().saveDocument(doc, getDocumentAddress(this), instruction);
},
remove: function(instruction) {getCurrentStorage().deleteDocument(getDocumentAddress(this), instruction);}
remove: function(instruction) {//remove the document
getCurrentStorage().deleteDocument(getDocumentAddress(this), instruction);
}
});
JSONDocument.prototype.states = {
draft:{"fr":"Brouillon","en":"Draft"},
......@@ -591,16 +627,15 @@ saveCurrentDocument = function() {
* @param doc : the document to edit
*/
var startDocumentEdition = function(doc) {
getCurrentStorage().getDocument(getDocumentAddress(doc), function(data) {
doc.load(data);
setCurrentDocument(doc);
if(supportedDocuments[doc.getType()].editorPage) {window.location = "theme.html";}
getCurrentStorage().getDocument(doc.fileName, function(data) {
setCurrentDocument(data);
if(supportedDocuments[data.getType()].editorPage) {window.location.href = "theme.html";}
else alert("no editor available for this document");
});
}
var stopDocumentEdition = function() {
saveCurrentDocument();
window.location = "ung.html";
window.location.href = "ung.html";
return false;
}
......@@ -609,16 +644,18 @@ var stopDocumentEdition = function() {
* @param language : the new language
*/
var changeLanguage = function(language) {
getCurrentUser().setSetting("language");
getCurrentUser().setSetting("language",language);
getCurrentStorage().save();
getCurrentPage().displayLanguages(user);
getCurrentPage().displayLanguages(getCurrentUser());
window.location.reload();
}
var signOut = function() {
delete localStorage.currentStorage;
delete localStorage.currentDocumentID;
window.location = "login.html";
delete localStorage.wallet;
delete sessionStorage.documentList;
window.location.href = "login.html";
return false
}
......
UNGProject/js/ung.js
View file @ 518161fb
......@@ -10,35 +10,41 @@ setCurrentDocumentID = function(ID) {return localStorage.setItem("currentDocumen
/**
* class DocumentList
* This class provides methods to manipulate the list of documents of the current user
* @param arg : a documentList json object to load
* the list object is the documentList returned by the storage.
* the detailedList object is the synchronized list containing more detailed information about documents
* @param documentList : documents information loaded from the storage
*/
var DocumentList = function(arg) {
//List.call(this);
if(arg) {
this.load(arg);
this.load(new List(arg,JSONDocument));
this.selectionList = new List(arg.selectionList);//load methods of selectionList
var DocumentList = function(documentList) {
if(sessionStorage.documentList) {//load from sessionStorage
this.load(JSON.parse(sessionStorage.documentList));
}
else {
List.call(this);
if(documentList) {
for(var doc in documentList) {
this.documentList[doc] = new JSONDocument(documentList[doc]);
}
} else {this.documentList = {}}
this.list = getCurrentStorage().getDocumentList();
this.displayInformation = {};
this.displayInformation.page = 1;
this.selectionList = new List();
this.selectionList = [];
}
}
DocumentList.prototype = new List();
DocumentList.prototype = new UngObject();
DocumentList.prototype.load({
removeDocument: function(doc) {
var i = this.find(doc);
this.get(i).remove()//delete the file
this.remove(i);//remove from the list
getCurrentStorage().save();//save changes
removeDocument: function(fileName) {
getCurrentStorage().remove(fileName)//delete the file
delete this.list[fileName];//remove from the list
delete this.detailedList[fileName];//
this.save();//save changes
},
getList: function() {return this.list},
getDetailedList: function() {return this.detailedList},
getSelectionList: function() {return this.selectionList;},
resetSelectionList: function() {
this.selectionList = new List();
this.selectionList = [];
//display consequences
for(var i=this.getDisplayInformation().first-1; i<this.getDisplayInformation().last; i++) {
......@@ -47,9 +53,17 @@ DocumentList.prototype.load({
$("span#selected_row_number a").html(0);//display the selected row number
},
checkAll: function() {
this.selectionList = new List();
for(var i=0; i<this.size(); i++) {
this.getSelectionList().add(this.get(i));
this.selectionList = [];
var list = toArray(this.getList());
var begin = 0;
var end = list.length;
if(getCurrentUser().getSetting("checkAllMethod")=="page") {
begin = this.getDisplayInformation().first-1;
end = this.getDisplayInformation().last;
}
for(var i=begin; i<end; i++) {
this.addToSelection(list[i].fileName);
}
//display consequences
......@@ -58,12 +72,19 @@ DocumentList.prototype.load({
}
$("span#selected_row_number a").html(this.size());//display the selected row number
},
addToSelection: function(fileName) {
this.getSelectionList().push(fileName);
},
removeFromSelection: function(fileName) {
var selection = getDocumentList().getSelectionList();
selection.splice(selection.indexOf(fileName),1);
},
deleteSelectedDocuments: function() {
var selection = this.getSelectionList();
while(!selection.isEmpty()) {
var doc = selection.pop();
this.removeDocument(doc);
while(selection.length>0) {
var fileName = selection.pop();
this.removeDocument(fileName);
}
this.display();
},
......@@ -87,17 +108,20 @@ DocumentList.prototype.load({
},
/* display the list of documents in the web page */
displayContent: function() {
displayContent: function() {//display the list of document itself
$("table.listbox tbody").html("");//empty the previous displayed list
var list = toArray(this.getList());
var detailedList = this.getDetailedList();
for(var i=this.getDisplayInformation().first-1;i<this.getDisplayInformation().last;i++) {
var doc = this.get(i);
var ligne = new Line(doc,i);
ligne.updateHTML();
ligne.display();
if(this.getSelectionList().contains(doc)) {ligne.setSelected(true);}//check the box if selected
var fileName = list[i].fileName;
if(!detailedList[fileName] || new Date(detailedList[fileName].lastModification+1000)<new Date(list[i].lastModify)) {updateDocumentInformation(fileName)}
var line = new Line(doc,i);
line.updateHTML();
line.display();
if(this.getSelectionList().indexOf(doc.fileName)) {line.setSelected(true);}//check the box if selected
}
},
displayListInformation: function() {
displayListInformation: function() {//display number of records, first displayed document, last displayed document...
if(this.size()>0) {
$("div.listbox-number-of-records").css("display","inline");
......@@ -108,7 +132,7 @@ DocumentList.prototype.load({
}
else {$("div.listbox-number-of-records").css("display","none");}
},
displayNavigationElements: function() {
displayNavigationElements: function() {//display buttons first-page, previous, next, last-page
var lastPage = this.getDisplayInformation().lastPage;
var disp = function(element,bool) {
bool ? $(element).css("display","inline") : $(element).css("display","none");
......@@ -132,13 +156,12 @@ DocumentList.prototype.load({
},
/* update the ith document information */
updateDocumentInformation: function(i) {
var list = this;
var doc = list.get(i);
getCurrentStorage().getDocument(getDocumentAddress(doc), function(data) {
doc.load(data);//todo : replace by data.header
doc.setContent("");//
list.set(i,doc);
updateDocumentInformation: function(fileName) {
var list = this.getDetailedList();
getCurrentStorage().getDocument(fileName, function(doc) {
list[fileName]=doc;
list[fileName].fileName = fileName;
doc.setContent("");
});
},
/* update the document to be displayed */
......@@ -172,7 +195,7 @@ var Line = function(doc, i) {
Line.prototype = {
getDocument: function() {return this.document;},
getID: function() {return this.ID;},
getType: function() {return this.document.getType() ? this.document.getType() : "other";},
getType: function() {return this.document.getType() || "other";},
getHTML: function() {return this.html;},
setHTML: function(newHTML) {this.html = newHTML;},
setSelected: function(bool) {$("tr td.listbox-table-select-cell input#"+this.getID()).attr("checked",bool)},
......@@ -182,16 +205,16 @@ Line.prototype = {
/* add the document of this line to the list of selected documents */
addToSelection: function() {
getDocumentList().getSelectionList().add(this.getDocument());
getDocumentList().addToSelection(this.getDocument().fileName);
},
/* remove the document of this line from the list of selected documents */
removeFromSelection: function() {
getDocumentList().getSelectionList().removeElement(this.getDocument());
getDocumentList().removeFromSelection(this.getDocument().fileName);
},
/* check or uncheck the line */
changeState: function() {
this.isSelected() ? this.addToSelection() : this.removeFromSelection();
$("span#selected_row_number a").html(getDocumentList().getSelectionList().size());//display the selected row number
$("span#selected_row_number a").html(getDocumentList().getSelectionList().length);//display the selected row number
},
/* load the document information in the html of a default line */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7