Code Review
/
src
/
app-framework-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Clean up and documentation
[src/app-framework-demo.git]
/
afb-client
/
app
/
Frontend
/
widgets
/
FormInput
/
UploadFiles.js
diff --git
a/afb-client/app/Frontend/widgets/FormInput/UploadFiles.js
b/afb-client/app/Frontend/widgets/FormInput/UploadFiles.js
index
8bc8eca
..
90110c9
100644
(file)
--- a/
afb-client/app/Frontend/widgets/FormInput/UploadFiles.js
+++ b/
afb-client/app/Frontend/widgets/FormInput/UploadFiles.js
@@
-43,8
+43,12
@@
var tmpl = '<input type="file" name="{{name}}-input" onchange="angular.element(
function LoadFileSvc (scope, elem, posturl, files, thumbnailCB) {
var xmlReq = new XMLHttpRequest();
var xform = new FormData();
function LoadFileSvc (scope, elem, posturl, files, thumbnailCB) {
var xmlReq = new XMLHttpRequest();
var xform = new FormData();
-
- // Update slider during Upload
+
+ var OnLoadCB = function (target) {
+ var status = thumbnailCB (target);
+ //if (status) xform.append(scope.name, file, file.name);
+ };
+ // Update slider during Upload
xmlReq.upload.onprogress = function (event) {
var progress = Math.round(event.lengthComputable ? event.loaded * 100 / event.total : 0);
if (scope.slider) scope.slider.setValue (progress);
xmlReq.upload.onprogress = function (event) {
var progress = Math.round(event.lengthComputable ? event.loaded * 100 / event.total : 0);
if (scope.slider) scope.slider.setValue (progress);
@@
-110,10
+114,7
@@
function LoadFileSvc (scope, elem, posturl, files, thumbnailCB) {
if (thumbnailCB) {
var reader = new FileReader();
reader.readAsArrayBuffer(file);
if (thumbnailCB) {
var reader = new FileReader();
reader.readAsArrayBuffer(file);
- reader.onload = function (target) {
- var status = thumbnailCB (target);
- //if (status) xform.append(scope.name, file, file.name);
- };
+ reader.onload = OnLoadCB;
}
// if everything is OK let's add file to xform
xform.append(scope.name, file, file.name);
}
// if everything is OK let's add file to xform
xform.append(scope.name, file, file.name);
@@
-125,9
+126,9
@@
function LoadFileSvc (scope, elem, posturl, files, thumbnailCB) {
xmlReq.send(xform);
}
xmlReq.send(xform);
}
-angular.module('UploadFiles',['
ConfigApp
', 'ModalNotification', 'RangeSlider'])
+angular.module('UploadFiles',['
AppConfig
', 'ModalNotification', 'RangeSlider'])
-.directive('uploadImage', function(
ConfigApp
, JQemu, Notification) {
+.directive('uploadImage', function(
AppConfig
, JQemu, Notification) {
function mymethods(scope, elem, attrs) {
// get widget image handle from template
function mymethods(scope, elem, attrs) {
// get widget image handle from template
@@
-151,25
+152,25
@@
angular.module('UploadFiles',['ConfigApp', 'ModalNotification', 'RangeSlider'])
scope.imgElem[0].src = window.URL.createObjectURL(new Blob([upload.target.result], {type: "image"}));
return true; // true activates post
};
scope.imgElem[0].src = window.URL.createObjectURL(new Blob([upload.target.result], {type: "image"}));
return true; // true activates post
};
- var posturl = attrs.posturl + "?token=" +
ConfigApp
.session.token;
+ var posturl = attrs.posturl + "?token=" +
AppConfig
.session.token;
new LoadFileSvc (scope, elem, posturl, files, readerCB);
};
// Initiallize default values from attributes values
new LoadFileSvc (scope, elem, posturl, files, readerCB);
};
// Initiallize default values from attributes values
- scope.name= attrs.name || '
avatar
';
+ scope.name= attrs.name || '
file
';
scope.category= attrs.category || 'image';
scope.mimetype= (attrs.accept || 'image') + '/*';
scope.maxsize= attrs.maxsize || 100; // default max size 100KB
scope.regexp = new RegExp (attrs.accept+ '.*','i');
scope.category= attrs.category || 'image';
scope.mimetype= (attrs.accept || 'image') + '/*';
scope.maxsize= attrs.maxsize || 100; // default max size 100KB
scope.regexp = new RegExp (attrs.accept+ '.*','i');
- if (attrs.thumbnail) scope.thumbnail=
ConfigApp
.paths[scope.category] + attrs.thumbnail;
- else scope.thumbnail=
ConfigApp
.paths[scope.category] + 'tux-bzh.png';
+ if (attrs.thumbnail) scope.thumbnail=
AppConfig
.paths[scope.category] + attrs.thumbnail;
+ else scope.thumbnail=
AppConfig
.paths[scope.category] + 'tux-bzh.png';
- if (attrs.thumbnail) scope.isnotvalid=
ConfigApp
.paths[scope.category] + attrs.isnotvalid;
- else scope.isnotvalid=
ConfigApp
.paths[scope.category] + 'isnotvalid.png';
+ if (attrs.thumbnail) scope.isnotvalid=
AppConfig
.paths[scope.category] + attrs.isnotvalid;
+ else scope.isnotvalid=
AppConfig
.paths[scope.category] + 'isnotvalid.png';
- if (attrs.istoobig) scope.istoobig=
ConfigApp
.paths[scope.category] + attrs.istoobig;
- else scope.istoobig=
ConfigApp
.paths[scope.category] + 'istoobig.png';
+ if (attrs.istoobig) scope.istoobig=
AppConfig
.paths[scope.category] + attrs.istoobig;
+ else scope.istoobig=
AppConfig
.paths[scope.category] + 'istoobig.png';
scope.noslider = attrs.noslider || false;
if (!attrs.posturl) throw new TypeError('file-upload %s posturl=/api/xxxx/xxxx required', scope.attrs);
scope.noslider = attrs.noslider || false;
if (!attrs.posturl) throw new TypeError('file-upload %s posturl=/api/xxxx/xxxx required', scope.attrs);
@@
-184,7
+185,7
@@
angular.module('UploadFiles',['ConfigApp', 'ModalNotification', 'RangeSlider'])
};
})
};
})
-.directive('uploadAudio', function(
ConfigApp
, JQemu, Notification) {
+.directive('uploadAudio', function(
AppConfig
, JQemu, Notification) {
function mymethods(scope, elem, attrs) {
// get widget image handle from template
function mymethods(scope, elem, attrs) {
// get widget image handle from template
@@
-203,7
+204,7
@@
angular.module('UploadFiles',['ConfigApp', 'ModalNotification', 'RangeSlider'])
// Upload is delegated to a shared function
scope.UpLoadFile=function (files) {
// Upload is delegated to a shared function
scope.UpLoadFile=function (files) {
- var posturl = attrs.posturl + "?token=" +
ConfigApp
.session.token;
+ var posturl = attrs.posturl + "?token=" +
AppConfig
.session.token;
new LoadFileSvc (scope, elem, posturl, files, false);
};
new LoadFileSvc (scope, elem, posturl, files, false);
};
@@
-214,14
+215,14
@@
angular.module('UploadFiles',['ConfigApp', 'ModalNotification', 'RangeSlider'])
scope.maxsize= attrs.maxsize || 10000; // default max size 10MB
scope.regexp = new RegExp (attrs.accept+ '.*','i');
scope.maxsize= attrs.maxsize || 10000; // default max size 10MB
scope.regexp = new RegExp (attrs.accept+ '.*','i');
- if (attrs.thumbnail) scope.thumbnail=
ConfigApp
.paths[scope.category] + attrs.thumbnail;
- else scope.thumbnail=
ConfigApp
.paths[scope.category] + 'upload-music.png';
+ if (attrs.thumbnail) scope.thumbnail=
AppConfig
.paths[scope.category] + attrs.thumbnail;
+ else scope.thumbnail=
AppConfig
.paths[scope.category] + 'upload-music.png';
- if (attrs.thumbnail) scope.isnotvalid=
ConfigApp
.paths[scope.category] + attrs.isnotvalid;
- else scope.isnotvalid=
ConfigApp
.paths[scope.category] + 'isnotvalid.png';
+ if (attrs.thumbnail) scope.isnotvalid=
AppConfig
.paths[scope.category] + attrs.isnotvalid;
+ else scope.isnotvalid=
AppConfig
.paths[scope.category] + 'isnotvalid.png';
- if (attrs.istoobig) scope.istoobig=
ConfigApp
.paths[scope.category] + attrs.istoobig;
- else scope.istoobig=
ConfigApp
.paths[scope.category] + 'istoobig.png';
+ if (attrs.istoobig) scope.istoobig=
AppConfig
.paths[scope.category] + attrs.istoobig;
+ else scope.istoobig=
AppConfig
.paths[scope.category] + 'istoobig.png';
scope.noslider = attrs.noslider || false;
if (!attrs.posturl) throw new TypeError('file-upload %s posturl=/api/xxxx/xxxx required', scope.attrs);
scope.noslider = attrs.noslider || false;
if (!attrs.posturl) throw new TypeError('file-upload %s posturl=/api/xxxx/xxxx required', scope.attrs);
@@
-237,7
+238,7
@@
angular.module('UploadFiles',['ConfigApp', 'ModalNotification', 'RangeSlider'])
})
})
-.directive('uploadAppli', function(
ConfigApp
, JQemu, Notification) {
+.directive('uploadAppli', function(
AppConfig
, JQemu, Notification) {
function mymethods(scope, elem, attrs) {
// get widget image handle from template
function mymethods(scope, elem, attrs) {
// get widget image handle from template
@@
-264,14
+265,14
@@
angular.module('UploadFiles',['ConfigApp', 'ModalNotification', 'RangeSlider'])
// Check is we have a thumbnail within loaded Zipfile
if (!thumbnail) {
console.log ("This is not a valid Application Framework APP");
// Check is we have a thumbnail within loaded Zipfile
if (!thumbnail) {
console.log ("This is not a valid Application Framework APP");
- scope.thumbnail=
ConfigApp
.paths[scope.category] + 'isnotvalid.png';
+ scope.thumbnail=
AppConfig
.paths[scope.category] + 'isnotvalid.png';
scope.$apply('thumbnail'); // we short-circuit Angular resync Image
return false; // do not post zip on binder
}
scope.imgElem[0].src = window.URL.createObjectURL(new Blob([thumbnail.asArrayBuffer()], {type: "image"}));
return true; // true activates post
};
scope.$apply('thumbnail'); // we short-circuit Angular resync Image
return false; // do not post zip on binder
}
scope.imgElem[0].src = window.URL.createObjectURL(new Blob([thumbnail.asArrayBuffer()], {type: "image"}));
return true; // true activates post
};
- var posturl = attrs.posturl + "?token=" +
ConfigApp
.session.token;
+ var posturl = attrs.posturl + "?token=" +
AppConfig
.session.token;
new LoadFileSvc (scope, elem, posturl, files, readerCB);
};
new LoadFileSvc (scope, elem, posturl, files, readerCB);
};
@@
-282,14
+283,14
@@
angular.module('UploadFiles',['ConfigApp', 'ModalNotification', 'RangeSlider'])
scope.maxsize= attrs.maxsize || 100000; // default max size 100MB
scope.regexp = new RegExp (attrs.accept+ '.*','i');
scope.maxsize= attrs.maxsize || 100000; // default max size 100MB
scope.regexp = new RegExp (attrs.accept+ '.*','i');
- if (attrs.thumbnail) scope.thumbnail=
ConfigApp
.paths[scope.category] + attrs.thumbnail;
- else scope.thumbnail=
ConfigApp
.paths[scope.category] + 'upload-appli.png';
+ if (attrs.thumbnail) scope.thumbnail=
AppConfig
.paths[scope.category] + attrs.thumbnail;
+ else scope.thumbnail=
AppConfig
.paths[scope.category] + 'upload-appli.png';
- if (attrs.thumbnail) scope.isnotvalid=
ConfigApp
.paths[scope.category] + attrs.isnotvalid;
- else scope.isnotvalid=
ConfigApp
.paths[scope.category] + 'isnotvalid.png';
+ if (attrs.thumbnail) scope.isnotvalid=
AppConfig
.paths[scope.category] + attrs.isnotvalid;
+ else scope.isnotvalid=
AppConfig
.paths[scope.category] + 'isnotvalid.png';
- if (attrs.istoobig) scope.istoobig=
ConfigApp
.paths[scope.category] + attrs.istoobig;
- else scope.istoobig=
ConfigApp
.paths[scope.category] + 'istoobig.png';
+ if (attrs.istoobig) scope.istoobig=
AppConfig
.paths[scope.category] + attrs.istoobig;
+ else scope.istoobig=
AppConfig
.paths[scope.category] + 'istoobig.png';
scope.noslider = attrs.noslider || false;
if (!attrs.posturl) throw new TypeError('file-upload %s posturl=/api/xxxx/xxxx required', scope.attrs);
scope.noslider = attrs.noslider || false;
if (!attrs.posturl) throw new TypeError('file-upload %s posturl=/api/xxxx/xxxx required', scope.attrs);