You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by lr...@apache.org on 2010/02/28 02:43:41 UTC
svn commit: r917101 - in
/incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin:
upload.html upload.js
Author: lresende
Date: Sun Feb 28 02:43:41 2010
New Revision: 917101
URL: http://svn.apache.org/viewvc?rev=917101&view=rev
Log:
PHOTARK-21 - Rationalize the usage of populateSelect on the upload page. We now populate retrieve the list of albums once, and update the list when creating new albuns without having to retrieve the full list again. I have also removed some dead code on the upload.html page
Modified:
incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html
incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.js
Modified: incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html?rev=917101&r1=917100&r2=917101&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html (original)
+++ incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html Sun Feb 28 02:43:41 2010
@@ -56,29 +56,8 @@
dojo.require("dojo.rpc.JsonService");
var gallery = new dojo.rpc.JsonService("/photark/Gallery?smd");
- var loadSelected = false;
-
- function createAlbum(){
- var albumLabel = newAlbumForm.attr('value');
- console.log("albumLabel:"+albumLabel);
- var albumName;
- for(var key in albumLabel){
- albumName = albumLabel[key];
- console.log("albumName:"+albumName);
- }
- console.log("albumName:"+albumName);
- gallery.addAlbum(albumName);
- dojo.byId('albumCreated').innerHTML = "Album Successfully Created:" + albumName;
- dojo.byId('albumName').value = "";
- loadSelected = true;
- }
-
-
+
function populateSelect(){
- if (loadSelected) {
- return;
- }
-
gallery.getAlbums().addCallback( function(albums, exception) {
if(exception) {
alert(exception.msg);
@@ -93,17 +72,17 @@
selectAlbum.options[selectAlbum.options.length] = new Option(albums[pos].name, albums[pos].name, false, false);
}
- loadSelected = true;
});
}
-
+
+ dojo.addOnLoad( function() { populateSelect(); });
</script>
</head>
<body>
<label>Select Album:</label>
- <select id="selectAlbum" name="selectAlbum" autoComplete="true" onfocus="populateSelect()"/>
+ <select id="selectAlbum" name="selectAlbum" autoComplete="true"/>
</br>
Modified: incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.js
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.js?rev=917101&r1=917100&r2=917101&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.js (original)
+++ incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.js Sun Feb 28 02:43:41 2010
@@ -63,35 +63,24 @@
doUpload = function(){
console.log("doUpload");
- var selected = dojo.byId("selectAlbum").value;
+ var selectAlbum = dojo.byId("selectAlbum");
+ var selected = selectAlbum.value;
console.log("selected:"+selected);
if(selected == null || (selected != null && selected == "" && selected.length == 0)) {
alert("Photo Upload can not be started.Select Album before upload");
} else if(selected == "New Album") {
- uploader.upload({albumname:dojo.byId("newAlbumName").value});
+ var albumName = dojo.byId("newAlbumName").value;
+ //add new album to list of albums
+ selectAlbum.options[selectAlbum.options.length] = new Option(albumName, albumName, false, false);
+ //upload the files
+ uploader.upload({albumName:albumName});
} else {
- uploader.upload({albumname:selected});
+ //upload files to existent album
+ uploader.upload({albumName:selected});
}
dojo.byId("newAlbumName").value ="";
+
}
-
- /*
- uploader.attr("disabled", dojo.byId("fGroup").value=="");
- dojo.connect(dojo.byId("fGroup"), "keyup", function(){
- uploader.attr("disabled", dojo.byId("fGroup").value=="");
- });
- dojo.connect(dijit.byId("fSubmit"), "onClick", function(){
- uploader.submit(dojo.byId("formF"));
- });
- dojo.connect(f, "onChange", function(dataArray){
- console.log("onChange.data:", dataArray);
- });
- dojo.connect(f, "onComplete", function(dataArray){
- dojo.forEach(dataArray, function(d){
- addThumb(d, "fThumbs");
- });
- });
- */
}
});
\ No newline at end of file