Feature #44: Image capture WebRTC & HTML5 FileIO

Silverlight was previously used to capture webcam pictures and upload
file attachments. HTML5 FileIO is now used for all attachment uploading
- including drag-drop support. WebRTC is used to capture webcam images -
this falls back to a Flash polyfill when WebRTC isn't supported.
This commit is contained in:
Gary Sharp
2014-06-05 21:01:43 +10:00
parent d040ab094c
commit b64ac3b16f
40 changed files with 3221 additions and 2444 deletions
@@ -0,0 +1,675 @@
///#source 1 1 /ClientSource/Scripts/Modules/Disco-AttachmentUploader/webcam.js
// WebcamJS v1.0
// Webcam library for capturing JPEG/PNG images in JavaScript
// Attempts getUserMedia, falls back to Flash
// Author: Joseph Huckaby: http://github.com/jhuckaby
// Based on JPEGCam: http://code.google.com/p/jpegcam/
// Copyright (c) 2012 Joseph Huckaby
// Licensed under the MIT License
/* Usage:
<div id="my_camera" style="width:320px; height:240px;"></div>
<div id="my_result"></div>
<script language="JavaScript">
Webcam.attach( '#my_camera' );
function take_snapshot() {
var data_uri = Webcam.snap();
document.getElementById('my_result').innerHTML =
'<img src="'+data_uri+'"/>';
}
</script>
<a href="javascript:void(take_snapshot())">Take Snapshot</a>
*/
var Webcam = {
version: '1.0.0',
// globals
protocol: location.protocol.match(/https/i) ? 'https' : 'http',
swfURL: '', // URI to webcam.swf movie (defaults to cwd)
loaded: false, // true when webcam movie finishes loading
live: false, // true when webcam is initialized and ready to snap
userMedia: true, // true when getUserMedia is supported natively
params: {
width: 0,
height: 0,
dest_width: 0, // size of captured image
dest_height: 0, // these default to width/height
image_format: 'jpeg', // image format (may be jpeg or png)
jpeg_quality: 90, // jpeg image quality from 0 (worst) to 100 (best)
force_flash: false // force flash mode
},
hooks: {
load: null,
live: null,
uploadcomplete: null,
uploadprogress: null,
error: function(msg) { alert("Webcam.js Error: " + msg); }
}, // callback hook functions
init: function() {
// initialize, check for getUserMedia support
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
this.userMedia = this.userMedia && !!navigator.getUserMedia && !!window.URL;
// Older versions of firefox (< 21) apparently claim support but user media does not actually work
if (navigator.userAgent.match(/Firefox\D+(\d+)/)) {
if (parseInt(RegExp.$1, 10) < 21) this.userMedia = null;
}
},
attach: function(elem) {
// create webcam preview and attach to DOM element
// pass in actual DOM reference, ID, or CSS selector
if (typeof(elem) == 'string') {
elem = document.getElementById(elem) || document.querySelector(elem);
}
if (!elem) {
return this.dispatch('error', "Could not locate DOM element to attach to.");
}
this.container = elem;
if (!this.params.width) this.params.width = elem.offsetWidth;
if (!this.params.height) this.params.height = elem.offsetHeight;
// set defaults for dest_width / dest_height if not set
if (!this.params.dest_width) this.params.dest_width = this.params.width;
if (!this.params.dest_height) this.params.dest_height = this.params.height;
// if force_flash is set, disable userMedia
if (this.params.force_flash) this.userMedia = null;
if (this.userMedia) {
// setup webcam video container
var video = document.createElement('video');
video.setAttribute('autoplay', 'autoplay');
video.style.width = '' + this.params.dest_width + 'px';
video.style.height = '' + this.params.dest_height + 'px';
// adjust scale if dest_width or dest_height is different
var scaleX = this.params.width / this.params.dest_width;
var scaleY = this.params.height / this.params.dest_height;
if ((scaleX != 1.0) || (scaleY != 1.0)) {
elem.style.overflow = 'visible';
video.style.webkitTransformOrigin = '0px 0px';
video.style.mozTransformOrigin = '0px 0px';
video.style.msTransformOrigin = '0px 0px';
video.style.oTransformOrigin = '0px 0px';
video.style.transformOrigin = '0px 0px';
video.style.webkitTransform = 'scaleX('+scaleX+') scaleY('+scaleY+')';
video.style.mozTransform = 'scaleX('+scaleX+') scaleY('+scaleY+')';
video.style.msTransform = 'scaleX('+scaleX+') scaleY('+scaleY+')';
video.style.oTransform = 'scaleX('+scaleX+') scaleY('+scaleY+')';
video.style.transform = 'scaleX('+scaleX+') scaleY('+scaleY+')';
}
// add video element to dom
elem.appendChild( video );
this.video = video;
// create offscreen canvas element to hold pixels later on
var canvas = document.createElement('canvas');
canvas.width = this.params.dest_width;
canvas.height = this.params.dest_height;
var context = canvas.getContext('2d');
this.context = context;
this.canvas = canvas;
// ask user for access to their camera
var self = this;
navigator.getUserMedia({
"audio": false,
"video": true
},
function(stream) {
// got access, attach stream to video
video.src = window.URL.createObjectURL( stream ) || stream;
Webcam.stream = stream;
Webcam.loaded = true;
Webcam.live = true;
Webcam.dispatch('load');
Webcam.dispatch('live');
},
function(err) {
return self.dispatch('error', "Could not access webcam.");
});
}
else {
// flash fallback
elem.innerHTML = this.getSWFHTML();
}
},
reset: function() {
// shutdown camera, reset to potentially attach again
if (this.userMedia) {
try { this.stream.stop(); } catch (e) {;}
delete this.stream;
delete this.canvas;
delete this.context;
delete this.video;
}
this.container.innerHTML = '';
delete this.container;
this.loaded = false;
this.live = false;
},
set: function() {
// set one or more params
// variable argument list: 1 param = hash, 2 params = key, value
if (arguments.length == 1) {
for (var key in arguments[0]) {
this.params[key] = arguments[0][key];
}
}
else {
this.params[ arguments[0] ] = arguments[1];
}
},
on: function(name, callback) {
// set callback hook
// supported hooks: onLoad, onError, onLive
name = name.replace(/^on/i, '').toLowerCase();
if (typeof(this.hooks[name]) == 'undefined')
throw "Event type not supported: " + name;
this.hooks[name] = callback;
},
dispatch: function() {
// fire hook callback, passing optional value to it
var name = arguments[0].replace(/^on/i, '').toLowerCase();
var args = Array.prototype.slice.call(arguments, 1);
if (this.hooks[name]) {
if (typeof(this.hooks[name]) == 'function') {
// callback is function reference, call directly
this.hooks[name].apply(this, args);
}
else if (typeof(this.hooks[name]) == 'array') {
// callback is PHP-style object instance method
this.hooks[name][0][this.hooks[name][1]].apply(this.hooks[name][0], args);
}
else if (window[this.hooks[name]]) {
// callback is global function name
window[ this.hooks[name] ].apply(window, args);
}
return true;
}
return false; // no hook defined
},
setSWFLocation: function(url) {
// set location of SWF movie (defaults to webcam.swf in cwd)
this.swfURL = url;
},
getSWFHTML: function() {
// Return HTML for embedding flash based webcam capture movie
var html = '';
// make sure we aren't running locally (flash doesn't work)
if (location.protocol.match(/file/)) {
return '<h1 style="color:red">Sorry, the Webcam.js Flash fallback does not work from local disk. Please upload it to a web server first.</h1>';
}
// set default swfURL if not explicitly set
if (!this.swfURL) {
// find our script tag, and use that base URL
var base_url = '';
var scpts = document.getElementsByTagName('script');
for (var idx = 0, len = scpts.length; idx < len; idx++) {
var src = scpts[idx].getAttribute('src');
if (src && src.match(/\/webcam(\.min)?\.js/)) {
base_url = src.replace(/\/webcam(\.min)?\.js.*$/, '');
idx = len;
}
}
if (base_url) this.swfURL = base_url + '/webcam.swf';
else this.swfURL = 'webcam.swf';
}
// if this is the user's first visit, set flashvar so flash privacy settings panel is shown first
if (window.localStorage && !localStorage.getItem('visited')) {
this.params.new_user = 1;
localStorage.setItem('visited', 1);
}
// construct flashvars string
var flashvars = '';
for (var key in this.params) {
if (flashvars) flashvars += '&';
flashvars += key + '=' + escape(this.params[key]);
}
html += '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="'+this.protocol+'://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" width="'+this.params.width+'" height="'+this.params.height+'" id="webcam_movie_obj" align="middle"><param name="allowScriptAccess" value="always" /><param name="allowFullScreen" value="false" /><param name="movie" value="'+this.swfURL+'" /><param name="loop" value="false" /><param name="menu" value="false" /><param name="quality" value="best" /><param name="bgcolor" value="#ffffff" /><param name="flashvars" value="'+flashvars+'"/><embed id="webcam_movie_embed" src="'+this.swfURL+'" loop="false" menu="false" quality="best" bgcolor="#ffffff" width="'+this.params.width+'" height="'+this.params.height+'" name="webcam_movie_embed" align="middle" allowScriptAccess="always" allowFullScreen="false" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" flashvars="'+flashvars+'"></embed></object>';
return html;
},
getMovie: function() {
// get reference to movie object/embed in DOM
if (!this.loaded) return this.dispatch('error', "Flash Movie is not loaded yet");
var movie = document.getElementById('webcam_movie_obj');
if (!movie || !movie._snap) movie = document.getElementById('webcam_movie_embed');
if (!movie) this.dispatch('error', "Cannot locate Flash movie in DOM");
return movie;
},
snap: function() {
// take snapshot and return image data uri
if (!this.loaded) return this.dispatch('error', "Webcam is not loaded yet");
if (!this.live) return this.dispatch('error', "Webcam is not live yet");
if (this.userMedia) {
// native implementation
this.context.drawImage(this.video, 0, 0, this.params.dest_width, this.params.dest_height);
return this.canvas.toDataURL('image/' + this.params.image_format, this.params.jpeg_quality / 100 );
}
else {
// flash fallback
var raw_data = this.getMovie()._snap();
return 'data:image/'+this.params.image_format+';base64,' + raw_data;
}
},
configure: function(panel) {
// open flash configuration panel -- specify tab name:
// "camera", "privacy", "default", "localStorage", "microphone", "settingsManager"
if (!panel) panel = "camera";
this.getMovie()._configure(panel);
},
flashNotify: function(type, msg) {
// receive notification from flash about event
switch (type) {
case 'flashLoadComplete':
// movie loaded successfully
this.loaded = true;
this.dispatch('load');
break;
case 'cameraLive':
// camera is live and ready to snap
this.live = true;
this.dispatch('live');
break;
case 'error':
// Flash error
this.dispatch('error', msg);
break;
default:
// catch-all event, just in case
// console.log("webcam flash_notify: " + type + ": " + msg);
break;
}
},
b64ToUint6: function(nChr) {
// convert base64 encoded character to 6-bit integer
// from: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Base64_encoding_and_decoding
return nChr > 64 && nChr < 91 ? nChr - 65
: nChr > 96 && nChr < 123 ? nChr - 71
: nChr > 47 && nChr < 58 ? nChr + 4
: nChr === 43 ? 62 : nChr === 47 ? 63 : 0;
},
base64DecToArr: function(sBase64, nBlocksSize) {
// convert base64 encoded string to Uintarray
// from: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Base64_encoding_and_decoding
var sB64Enc = sBase64.replace(/[^A-Za-z0-9\+\/]/g, ""), nInLen = sB64Enc.length,
nOutLen = nBlocksSize ? Math.ceil((nInLen * 3 + 1 >> 2) / nBlocksSize) * nBlocksSize : nInLen * 3 + 1 >> 2,
taBytes = new Uint8Array(nOutLen);
for (var nMod3, nMod4, nUint24 = 0, nOutIdx = 0, nInIdx = 0; nInIdx < nInLen; nInIdx++) {
nMod4 = nInIdx & 3;
nUint24 |= this.b64ToUint6(sB64Enc.charCodeAt(nInIdx)) << 18 - 6 * nMod4;
if (nMod4 === 3 || nInLen - nInIdx === 1) {
for (nMod3 = 0; nMod3 < 3 && nOutIdx < nOutLen; nMod3++, nOutIdx++) {
taBytes[nOutIdx] = nUint24 >>> (16 >>> nMod3 & 24) & 255;
}
nUint24 = 0;
}
}
return taBytes;
},
upload: function(image_data_uri, target_url, callback) {
// submit image data to server using binary AJAX
if (callback) Webcam.on('uploadComplete', callback);
var form_elem_name = 'webcam';
// detect image format from within image_data_uri
var image_fmt = '';
if (image_data_uri.match(/^data\:image\/(\w+)/))
image_fmt = RegExp.$1;
else
throw "Cannot locate image format in Data URI";
// extract raw base64 data from Data URI
var raw_image_data = image_data_uri.replace(/^data\:image\/\w+\;base64\,/, '');
// contruct use AJAX object
var http = new XMLHttpRequest();
http.open("POST", target_url, true);
// setup progress events
if (http.upload && http.upload.addEventListener) {
http.upload.addEventListener( 'progress', function(e) {
if (e.lengthComputable) {
var progress = e.loaded / e.total;
Webcam.dispatch('uploadProgress', progress, e);
}
}, false );
}
// completion handler
http.onload = function() {
Webcam.dispatch('uploadComplete', http.status, http.responseText, http.statusText);
};
// create a blob and decode our base64 to binary
var blob = new Blob( [ this.base64DecToArr(raw_image_data) ], {type: 'image/'+image_fmt} );
// stuff into a form, so servers can easily receive it as a standard file upload
var form = new FormData();
form.append( form_elem_name, blob, form_elem_name+"."+image_fmt.replace(/e/, '') );
// send data to server
http.send(form);
}
};
Webcam.init();
///#source 1 1 /ClientSource/Scripts/Modules/Disco-AttachmentUploader/disco-attachmentuploader.js
/// <reference path="webcam.js" />
; (function (window, document, $, Webcam) {
"use strict";
var attachmentUploader = function (uploadUrl, dropTarget, uploadProgressContainer) {
var self = this;
self.uploadUrl = uploadUrl;
self.dropTarget = dropTarget;
self.uploadProgressContainer = uploadProgressContainer;
// #region File Selection Support
self._uploadFilesInput = null;
self.uploadFiles = function () {
if (!!self._uploadFilesInput) {
self._uploadFilesInput.remove();
}
self._uploadFilesInput = $('<input>');
self._uploadFilesInput.attr({
type: 'file',
multiple: 'multiple',
title: 'Disco File Uploading'
})
.hide()
.change(function (e) {
var files = e.target.files;
if (!!files && files.length > 0) {
self._uploadFiles(files);
}
self._uploadFilesInput.remove();
}).appendTo(self.uploadProgressContainer)
.click();
};
// #endregion
// #region File Drop Support
if (!!self.dropTarget) {
var $document = $(document);
var dragFinished = false;
var dragFinishedToken = null;
$document.on('dragover', function () {
self.dropTarget.addClass('dragHighlight');
self.dropTarget.removeClass('dragHover');
dragFinished = false;
});
$document.on('dragleave', function () {
if (!!dragFinishedToken)
window.clearInterval(dragFinishedToken);
dragFinished = true;
window.setTimeout(function () {
if (dragFinished)
self.dropTarget.removeClass('dragHighlight');
dragFinishedToken = null;
}, 200);
});
self.dropTarget.on('dragover', function (e) {
e.stopPropagation();
e.preventDefault();
self.dropTarget.addClass('dragHover');
dragFinished = false;
e.originalEvent.dataTransfer.dropEffect = 'copy';
});
self.dropTarget.on('drop', function (e) {
e.stopPropagation();
e.preventDefault();
dragFinished = true;
self.dropTarget.removeClass('dragHighlight');
var files = e.originalEvent.dataTransfer.files;
self._uploadFiles(files);
});
}
// #endregion
// #region Webcam Support
self.uploadImage = function () {
var mediaWidth = 720;
var mediaHeight = 540;
var mediaStream;
// Setup Dialog
var dialog = $('<div>')
.attr({
id: 'disco_attachmentUpload_imageDialog',
title: 'Upload Image',
'class': 'dialog disco-attachmentUpload-imageDialog'
});
dialog.dialog({
autoOpen: true,
draggable: false,
modal: true,
resizable: false,
width: mediaWidth,
height: mediaHeight,
close: function () {
Webcam.reset();
window.setTimeout(function () {
dialog.dialog('destroy');
}, 1);
}
}).closest('.ui-dialog').children('.ui-dialog-titlebar').css('border-bottom', 'none');
var dialogButtons = [{
text: 'Capture',
click: captureImage
}];
// Capturing
function captureImage() {
var dataUri = Webcam.snap();
self._uploadImage(dataUri);
}
Webcam.set({
width: mediaWidth,
height: mediaHeight,
dest_width: mediaWidth * 1.5,
dest_height: mediaHeight * 1.5,
jpeg_quality: 95
});
Webcam.setSWFLocation('/ClientSource/Scripts/Modules/Disco-AttachmentUploader/webcam.swf');
Webcam.on('error', function (error) {
alert(error);
dialog.dialog('close');
});
Webcam.on('live', function () {
dialog.dialog('option', 'buttons', dialogButtons);
dialog.closest('.ui-dialog')
.children('.ui-dialog-buttonpane')
.css('margin-top', 0)
.find('.ui-button:first').focus();
});
Webcam.attach(dialog.attr('id'));
};
// #endregion
// #region Helpers
self.getFileComments = function (fileName, thumbnailHandler, complete) {
var result = false;
var dialog = $('<div>')
.attr({
title: 'Upload File',
'class': 'dialog disco-attachmentUpload-commentDialog'
});
dialog.html('<table><tr><th>File Name:</th><td class="filename"></td></tr><tr><th>Comments:</th><td><input class="comments" type="text"></input></td></tr><tr><td class="thumbnail" colspan="2"><img /></td></tr></table>');
if (!!thumbnailHandler) {
var td = dialog.find('td.thumbnail');
var img = td.find('img');
if (thumbnailHandler(img))
td.show();
}
dialog.find('td.filename').text(fileName).attr('title', fileName);
var comments = dialog.find('input.comments')
.keypress(function (e) {
if (e.which === 13) {
result = true;
dialog.dialog("close");
}
});
dialog.dialog({
resizable: false,
width: 400,
modal: true,
autoOpen: true,
buttons: {
"Upload": function () {
result = true;
dialog.dialog("close");
},
Cancel: function () {
dialog.dialog("close");
}
},
close: function () {
var commentsVal = comments.val();
dialog.dialog('destroy').remove();
complete(result, commentsVal);
}
});
};
self._uploadImage = function (dataUri) {
var imageData = dataUri.replace(/^data\:image\/\w+\;base64\,/, '');
var imageBlob = new Blob([Webcam.base64DecToArr(imageData)], { type: 'image/jpeg' });
var fileName = 'CapturedImage-' + moment().format('YYYYMMDD-HHmmss') + '.jpg';
self.getFileComments(fileName, function (img) {
img.attr('src', dataUri);
return true;
}, function (result, comments) {
if (!result)
return;
self._uploadFile(imageBlob, fileName, comments);
});
};
self._uploadFiles = function (fileList) {
var files = $.makeArray(fileList);
var processNextFile = function () {
if (!files || files.length === 0)
return;
var file = files.shift();
self.getFileComments(file.name, function (img) {
if (!!file.type && file.type.indexOf('image/') === 0) {
var reader = new FileReader();
reader.onload = function (e) {
img.attr('src', e.target.result);
};
reader.readAsDataURL(file);
return true;
}
return false;
}, function (result, comments) {
if (!result)
return;
self._uploadFile(file, file.name, comments);
processNextFile();
});
};
processNextFile();
};
self._uploadFile = function (fileData, fileName, comments) {
var formData = new FormData();
var xhr = new XMLHttpRequest();
var progress = $('<div>')
.append($('<i>').addClass('fa fa-cog fa-spin'))
.append($('<span>').text('Uploading: ' + fileName))
.appendTo(self.uploadProgressContainer);
formData.append('Comments', comments);
formData.append('File', fileData, fileName);
xhr.open("POST", self.uploadUrl, true);
xhr.onreadystatechange = function () {
if (xhr.readyState === 4 && xhr.status === 200) {
if (xhr.status !== 200) {
alert('Error Uploading [' + fileName + ']: ' + xhr.responseText);
}
progress.slideUp(400, function () {
progress.remove();
});
}
};
xhr.send(formData);
};
// #endregion
return self;
};
if (!document.Disco) {
document.Disco = {};
}
document.Disco.AttachmentUploader = attachmentUploader;
}(this, document, $, Webcam));
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<bundle minify="true" runOnBuild="true" output="Disco-AttachmentUploader.js">
<file>/ClientSource/Scripts/Modules/Disco-AttachmentUploader/webcam.js</file>
<file>/ClientSource/Scripts/Modules/Disco-AttachmentUploader/disco-attachmentuploader.js</file>
</bundle>
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1,274 @@
/// <reference path="webcam.js" />
; (function (window, document, $, Webcam) {
"use strict";
var attachmentUploader = function (uploadUrl, dropTarget, uploadProgressContainer) {
var self = this;
self.uploadUrl = uploadUrl;
self.dropTarget = dropTarget;
self.uploadProgressContainer = uploadProgressContainer;
// #region File Selection Support
self._uploadFilesInput = null;
self.uploadFiles = function () {
if (!!self._uploadFilesInput) {
self._uploadFilesInput.remove();
}
self._uploadFilesInput = $('<input>');
self._uploadFilesInput.attr({
type: 'file',
multiple: 'multiple',
title: 'Disco File Uploading'
})
.hide()
.change(function (e) {
var files = e.target.files;
if (!!files && files.length > 0) {
self._uploadFiles(files);
}
self._uploadFilesInput.remove();
}).appendTo(self.uploadProgressContainer)
.click();
};
// #endregion
// #region File Drop Support
if (!!self.dropTarget) {
var $document = $(document);
var dragFinished = false;
var dragFinishedToken = null;
$document.on('dragover', function () {
self.dropTarget.addClass('dragHighlight');
self.dropTarget.removeClass('dragHover');
dragFinished = false;
});
$document.on('dragleave', function () {
if (!!dragFinishedToken)
window.clearInterval(dragFinishedToken);
dragFinished = true;
window.setTimeout(function () {
if (dragFinished)
self.dropTarget.removeClass('dragHighlight');
dragFinishedToken = null;
}, 200);
});
self.dropTarget.on('dragover', function (e) {
e.stopPropagation();
e.preventDefault();
self.dropTarget.addClass('dragHover');
dragFinished = false;
e.originalEvent.dataTransfer.dropEffect = 'copy';
});
self.dropTarget.on('drop', function (e) {
e.stopPropagation();
e.preventDefault();
dragFinished = true;
self.dropTarget.removeClass('dragHighlight');
var files = e.originalEvent.dataTransfer.files;
self._uploadFiles(files);
});
}
// #endregion
// #region Webcam Support
self.uploadImage = function () {
var mediaWidth = 720;
var mediaHeight = 540;
var mediaStream;
// Setup Dialog
var dialog = $('<div>')
.attr({
id: 'disco_attachmentUpload_imageDialog',
title: 'Upload Image',
'class': 'dialog disco-attachmentUpload-imageDialog'
});
dialog.dialog({
autoOpen: true,
draggable: false,
modal: true,
resizable: false,
width: mediaWidth,
height: mediaHeight,
close: function () {
Webcam.reset();
window.setTimeout(function () {
dialog.dialog('destroy');
}, 1);
}
}).closest('.ui-dialog').children('.ui-dialog-titlebar').css('border-bottom', 'none');
var dialogButtons = [{
text: 'Capture',
click: captureImage
}];
// Capturing
function captureImage() {
var dataUri = Webcam.snap();
self._uploadImage(dataUri);
}
Webcam.set({
width: mediaWidth,
height: mediaHeight,
dest_width: mediaWidth * 1.5,
dest_height: mediaHeight * 1.5,
jpeg_quality: 95
});
Webcam.setSWFLocation('/ClientSource/Scripts/Modules/Disco-AttachmentUploader/webcam.swf');
Webcam.on('error', function (error) {
alert(error);
dialog.dialog('close');
});
Webcam.on('live', function () {
dialog.dialog('option', 'buttons', dialogButtons);
dialog.closest('.ui-dialog')
.children('.ui-dialog-buttonpane')
.css('margin-top', 0)
.find('.ui-button:first').focus();
});
Webcam.attach(dialog.attr('id'));
};
// #endregion
// #region Helpers
self.getFileComments = function (fileName, thumbnailHandler, complete) {
var result = false;
var dialog = $('<div>')
.attr({
title: 'Upload File',
'class': 'dialog disco-attachmentUpload-commentDialog'
});
dialog.html('<table><tr><th>File Name:</th><td class="filename"></td></tr><tr><th>Comments:</th><td><input class="comments" type="text"></input></td></tr><tr><td class="thumbnail" colspan="2"><img /></td></tr></table>');
if (!!thumbnailHandler) {
var td = dialog.find('td.thumbnail');
var img = td.find('img');
if (thumbnailHandler(img))
td.show();
}
dialog.find('td.filename').text(fileName).attr('title', fileName);
var comments = dialog.find('input.comments')
.keypress(function (e) {
if (e.which === 13) {
result = true;
dialog.dialog("close");
}
});
dialog.dialog({
resizable: false,
width: 400,
modal: true,
autoOpen: true,
buttons: {
"Upload": function () {
result = true;
dialog.dialog("close");
},
Cancel: function () {
dialog.dialog("close");
}
},
close: function () {
var commentsVal = comments.val();
dialog.dialog('destroy').remove();
complete(result, commentsVal);
}
});
};
self._uploadImage = function (dataUri) {
var imageData = dataUri.replace(/^data\:image\/\w+\;base64\,/, '');
var imageBlob = new Blob([Webcam.base64DecToArr(imageData)], { type: 'image/jpeg' });
var fileName = 'CapturedImage-' + moment().format('YYYYMMDD-HHmmss') + '.jpg';
self.getFileComments(fileName, function (img) {
img.attr('src', dataUri);
return true;
}, function (result, comments) {
if (!result)
return;
self._uploadFile(imageBlob, fileName, comments);
});
};
self._uploadFiles = function (fileList) {
var files = $.makeArray(fileList);
var processNextFile = function () {
if (!files || files.length === 0)
return;
var file = files.shift();
self.getFileComments(file.name, function (img) {
if (!!file.type && file.type.indexOf('image/') === 0) {
var reader = new FileReader();
reader.onload = function (e) {
img.attr('src', e.target.result);
};
reader.readAsDataURL(file);
return true;
}
return false;
}, function (result, comments) {
if (!result)
return;
self._uploadFile(file, file.name, comments);
processNextFile();
});
};
processNextFile();
};
self._uploadFile = function (fileData, fileName, comments) {
var formData = new FormData();
var xhr = new XMLHttpRequest();
var progress = $('<div>')
.append($('<i>').addClass('fa fa-cog fa-spin'))
.append($('<span>').text('Uploading: ' + fileName))
.appendTo(self.uploadProgressContainer);
formData.append('Comments', comments);
formData.append('File', fileData, fileName);
xhr.open("POST", self.uploadUrl, true);
xhr.onreadystatechange = function () {
if (xhr.readyState === 4 && xhr.status === 200) {
if (xhr.status !== 200) {
alert('Error Uploading [' + fileName + ']: ' + xhr.responseText);
}
progress.slideUp(400, function () {
progress.remove();
});
}
};
xhr.send(formData);
};
// #endregion
return self;
};
if (!document.Disco) {
document.Disco = {};
}
document.Disco.AttachmentUploader = attachmentUploader;
}(this, document, $, Webcam));
@@ -0,0 +1,398 @@
// WebcamJS v1.0
// Webcam library for capturing JPEG/PNG images in JavaScript
// Attempts getUserMedia, falls back to Flash
// Author: Joseph Huckaby: http://github.com/jhuckaby
// Based on JPEGCam: http://code.google.com/p/jpegcam/
// Copyright (c) 2012 Joseph Huckaby
// Licensed under the MIT License
/* Usage:
<div id="my_camera" style="width:320px; height:240px;"></div>
<div id="my_result"></div>
<script language="JavaScript">
Webcam.attach( '#my_camera' );
function take_snapshot() {
var data_uri = Webcam.snap();
document.getElementById('my_result').innerHTML =
'<img src="'+data_uri+'"/>';
}
</script>
<a href="javascript:void(take_snapshot())">Take Snapshot</a>
*/
var Webcam = {
version: '1.0.0',
// globals
protocol: location.protocol.match(/https/i) ? 'https' : 'http',
swfURL: '', // URI to webcam.swf movie (defaults to cwd)
loaded: false, // true when webcam movie finishes loading
live: false, // true when webcam is initialized and ready to snap
userMedia: true, // true when getUserMedia is supported natively
params: {
width: 0,
height: 0,
dest_width: 0, // size of captured image
dest_height: 0, // these default to width/height
image_format: 'jpeg', // image format (may be jpeg or png)
jpeg_quality: 90, // jpeg image quality from 0 (worst) to 100 (best)
force_flash: false // force flash mode
},
hooks: {
load: null,
live: null,
uploadcomplete: null,
uploadprogress: null,
error: function(msg) { alert("Webcam.js Error: " + msg); }
}, // callback hook functions
init: function() {
// initialize, check for getUserMedia support
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
this.userMedia = this.userMedia && !!navigator.getUserMedia && !!window.URL;
// Older versions of firefox (< 21) apparently claim support but user media does not actually work
if (navigator.userAgent.match(/Firefox\D+(\d+)/)) {
if (parseInt(RegExp.$1, 10) < 21) this.userMedia = null;
}
},
attach: function(elem) {
// create webcam preview and attach to DOM element
// pass in actual DOM reference, ID, or CSS selector
if (typeof(elem) == 'string') {
elem = document.getElementById(elem) || document.querySelector(elem);
}
if (!elem) {
return this.dispatch('error', "Could not locate DOM element to attach to.");
}
this.container = elem;
if (!this.params.width) this.params.width = elem.offsetWidth;
if (!this.params.height) this.params.height = elem.offsetHeight;
// set defaults for dest_width / dest_height if not set
if (!this.params.dest_width) this.params.dest_width = this.params.width;
if (!this.params.dest_height) this.params.dest_height = this.params.height;
// if force_flash is set, disable userMedia
if (this.params.force_flash) this.userMedia = null;
if (this.userMedia) {
// setup webcam video container
var video = document.createElement('video');
video.setAttribute('autoplay', 'autoplay');
video.style.width = '' + this.params.dest_width + 'px';
video.style.height = '' + this.params.dest_height + 'px';
// adjust scale if dest_width or dest_height is different
var scaleX = this.params.width / this.params.dest_width;
var scaleY = this.params.height / this.params.dest_height;
if ((scaleX != 1.0) || (scaleY != 1.0)) {
elem.style.overflow = 'visible';
video.style.webkitTransformOrigin = '0px 0px';
video.style.mozTransformOrigin = '0px 0px';
video.style.msTransformOrigin = '0px 0px';
video.style.oTransformOrigin = '0px 0px';
video.style.transformOrigin = '0px 0px';
video.style.webkitTransform = 'scaleX('+scaleX+') scaleY('+scaleY+')';
video.style.mozTransform = 'scaleX('+scaleX+') scaleY('+scaleY+')';
video.style.msTransform = 'scaleX('+scaleX+') scaleY('+scaleY+')';
video.style.oTransform = 'scaleX('+scaleX+') scaleY('+scaleY+')';
video.style.transform = 'scaleX('+scaleX+') scaleY('+scaleY+')';
}
// add video element to dom
elem.appendChild( video );
this.video = video;
// create offscreen canvas element to hold pixels later on
var canvas = document.createElement('canvas');
canvas.width = this.params.dest_width;
canvas.height = this.params.dest_height;
var context = canvas.getContext('2d');
this.context = context;
this.canvas = canvas;
// ask user for access to their camera
var self = this;
navigator.getUserMedia({
"audio": false,
"video": true
},
function(stream) {
// got access, attach stream to video
video.src = window.URL.createObjectURL( stream ) || stream;
Webcam.stream = stream;
Webcam.loaded = true;
Webcam.live = true;
Webcam.dispatch('load');
Webcam.dispatch('live');
},
function(err) {
return self.dispatch('error', "Could not access webcam.");
});
}
else {
// flash fallback
elem.innerHTML = this.getSWFHTML();
}
},
reset: function() {
// shutdown camera, reset to potentially attach again
if (this.userMedia) {
try { this.stream.stop(); } catch (e) {;}
delete this.stream;
delete this.canvas;
delete this.context;
delete this.video;
}
this.container.innerHTML = '';
delete this.container;
this.loaded = false;
this.live = false;
},
set: function() {
// set one or more params
// variable argument list: 1 param = hash, 2 params = key, value
if (arguments.length == 1) {
for (var key in arguments[0]) {
this.params[key] = arguments[0][key];
}
}
else {
this.params[ arguments[0] ] = arguments[1];
}
},
on: function(name, callback) {
// set callback hook
// supported hooks: onLoad, onError, onLive
name = name.replace(/^on/i, '').toLowerCase();
if (typeof(this.hooks[name]) == 'undefined')
throw "Event type not supported: " + name;
this.hooks[name] = callback;
},
dispatch: function() {
// fire hook callback, passing optional value to it
var name = arguments[0].replace(/^on/i, '').toLowerCase();
var args = Array.prototype.slice.call(arguments, 1);
if (this.hooks[name]) {
if (typeof(this.hooks[name]) == 'function') {
// callback is function reference, call directly
this.hooks[name].apply(this, args);
}
else if (typeof(this.hooks[name]) == 'array') {
// callback is PHP-style object instance method
this.hooks[name][0][this.hooks[name][1]].apply(this.hooks[name][0], args);
}
else if (window[this.hooks[name]]) {
// callback is global function name
window[ this.hooks[name] ].apply(window, args);
}
return true;
}
return false; // no hook defined
},
setSWFLocation: function(url) {
// set location of SWF movie (defaults to webcam.swf in cwd)
this.swfURL = url;
},
getSWFHTML: function() {
// Return HTML for embedding flash based webcam capture movie
var html = '';
// make sure we aren't running locally (flash doesn't work)
if (location.protocol.match(/file/)) {
return '<h1 style="color:red">Sorry, the Webcam.js Flash fallback does not work from local disk. Please upload it to a web server first.</h1>';
}
// set default swfURL if not explicitly set
if (!this.swfURL) {
// find our script tag, and use that base URL
var base_url = '';
var scpts = document.getElementsByTagName('script');
for (var idx = 0, len = scpts.length; idx < len; idx++) {
var src = scpts[idx].getAttribute('src');
if (src && src.match(/\/webcam(\.min)?\.js/)) {
base_url = src.replace(/\/webcam(\.min)?\.js.*$/, '');
idx = len;
}
}
if (base_url) this.swfURL = base_url + '/webcam.swf';
else this.swfURL = 'webcam.swf';
}
// if this is the user's first visit, set flashvar so flash privacy settings panel is shown first
if (window.localStorage && !localStorage.getItem('visited')) {
this.params.new_user = 1;
localStorage.setItem('visited', 1);
}
// construct flashvars string
var flashvars = '';
for (var key in this.params) {
if (flashvars) flashvars += '&';
flashvars += key + '=' + escape(this.params[key]);
}
html += '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="'+this.protocol+'://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" width="'+this.params.width+'" height="'+this.params.height+'" id="webcam_movie_obj" align="middle"><param name="allowScriptAccess" value="always" /><param name="allowFullScreen" value="false" /><param name="movie" value="'+this.swfURL+'" /><param name="loop" value="false" /><param name="menu" value="false" /><param name="quality" value="best" /><param name="bgcolor" value="#ffffff" /><param name="flashvars" value="'+flashvars+'"/><embed id="webcam_movie_embed" src="'+this.swfURL+'" loop="false" menu="false" quality="best" bgcolor="#ffffff" width="'+this.params.width+'" height="'+this.params.height+'" name="webcam_movie_embed" align="middle" allowScriptAccess="always" allowFullScreen="false" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" flashvars="'+flashvars+'"></embed></object>';
return html;
},
getMovie: function() {
// get reference to movie object/embed in DOM
if (!this.loaded) return this.dispatch('error', "Flash Movie is not loaded yet");
var movie = document.getElementById('webcam_movie_obj');
if (!movie || !movie._snap) movie = document.getElementById('webcam_movie_embed');
if (!movie) this.dispatch('error', "Cannot locate Flash movie in DOM");
return movie;
},
snap: function() {
// take snapshot and return image data uri
if (!this.loaded) return this.dispatch('error', "Webcam is not loaded yet");
if (!this.live) return this.dispatch('error', "Webcam is not live yet");
if (this.userMedia) {
// native implementation
this.context.drawImage(this.video, 0, 0, this.params.dest_width, this.params.dest_height);
return this.canvas.toDataURL('image/' + this.params.image_format, this.params.jpeg_quality / 100 );
}
else {
// flash fallback
var raw_data = this.getMovie()._snap();
return 'data:image/'+this.params.image_format+';base64,' + raw_data;
}
},
configure: function(panel) {
// open flash configuration panel -- specify tab name:
// "camera", "privacy", "default", "localStorage", "microphone", "settingsManager"
if (!panel) panel = "camera";
this.getMovie()._configure(panel);
},
flashNotify: function(type, msg) {
// receive notification from flash about event
switch (type) {
case 'flashLoadComplete':
// movie loaded successfully
this.loaded = true;
this.dispatch('load');
break;
case 'cameraLive':
// camera is live and ready to snap
this.live = true;
this.dispatch('live');
break;
case 'error':
// Flash error
this.dispatch('error', msg);
break;
default:
// catch-all event, just in case
// console.log("webcam flash_notify: " + type + ": " + msg);
break;
}
},
b64ToUint6: function(nChr) {
// convert base64 encoded character to 6-bit integer
// from: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Base64_encoding_and_decoding
return nChr > 64 && nChr < 91 ? nChr - 65
: nChr > 96 && nChr < 123 ? nChr - 71
: nChr > 47 && nChr < 58 ? nChr + 4
: nChr === 43 ? 62 : nChr === 47 ? 63 : 0;
},
base64DecToArr: function(sBase64, nBlocksSize) {
// convert base64 encoded string to Uintarray
// from: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Base64_encoding_and_decoding
var sB64Enc = sBase64.replace(/[^A-Za-z0-9\+\/]/g, ""), nInLen = sB64Enc.length,
nOutLen = nBlocksSize ? Math.ceil((nInLen * 3 + 1 >> 2) / nBlocksSize) * nBlocksSize : nInLen * 3 + 1 >> 2,
taBytes = new Uint8Array(nOutLen);
for (var nMod3, nMod4, nUint24 = 0, nOutIdx = 0, nInIdx = 0; nInIdx < nInLen; nInIdx++) {
nMod4 = nInIdx & 3;
nUint24 |= this.b64ToUint6(sB64Enc.charCodeAt(nInIdx)) << 18 - 6 * nMod4;
if (nMod4 === 3 || nInLen - nInIdx === 1) {
for (nMod3 = 0; nMod3 < 3 && nOutIdx < nOutLen; nMod3++, nOutIdx++) {
taBytes[nOutIdx] = nUint24 >>> (16 >>> nMod3 & 24) & 255;
}
nUint24 = 0;
}
}
return taBytes;
},
upload: function(image_data_uri, target_url, callback) {
// submit image data to server using binary AJAX
if (callback) Webcam.on('uploadComplete', callback);
var form_elem_name = 'webcam';
// detect image format from within image_data_uri
var image_fmt = '';
if (image_data_uri.match(/^data\:image\/(\w+)/))
image_fmt = RegExp.$1;
else
throw "Cannot locate image format in Data URI";
// extract raw base64 data from Data URI
var raw_image_data = image_data_uri.replace(/^data\:image\/\w+\;base64\,/, '');
// contruct use AJAX object
var http = new XMLHttpRequest();
http.open("POST", target_url, true);
// setup progress events
if (http.upload && http.upload.addEventListener) {
http.upload.addEventListener( 'progress', function(e) {
if (e.lengthComputable) {
var progress = e.loaded / e.total;
Webcam.dispatch('uploadProgress', progress, e);
}
}, false );
}
// completion handler
http.onload = function() {
Webcam.dispatch('uploadComplete', http.status, http.responseText, http.statusText);
};
// create a blob and decode our base64 to binary
var blob = new Blob( [ this.base64DecToArr(raw_image_data) ], {type: 'image/'+image_fmt} );
// stuff into a form, so servers can easily receive it as a standard file upload
var form = new FormData();
form.append( form_elem_name, blob, form_elem_name+"."+image_fmt.replace(/e/, '') );
// send data to server
http.send(form);
}
};
Webcam.init();
@@ -1,414 +0,0 @@
///#source 1 1 /ClientSource/Scripts/Modules/Silverlight/Silverlight.js
if (!window.Silverlight) {
window.Silverlight = {};
}
// Silverlight control instance counter for memory mgt
Silverlight._silverlightCount = 0;
Silverlight.fwlinkRoot = 'http://go2.microsoft.com/fwlink/?LinkID=';
Silverlight.onGetSilverlight = null;
Silverlight.onSilverlightInstalled = function () { window.location.reload(false); };
//////////////////////////////////////////////////////////////////
// isInstalled, checks to see if the correct version is installed
//////////////////////////////////////////////////////////////////
Silverlight.isInstalled = function (version) {
var isVersionSupported = false;
var container = null;
try {
var control = null;
try {
control = new ActiveXObject('AgControl.AgControl');
if (version == null) {
isVersionSupported = true;
}
else if (control.IsVersionSupported(version)) {
isVersionSupported = true;
}
control = null;
}
catch (e) {
var plugin = navigator.plugins["Silverlight Plug-In"];
if (plugin) {
if (version === null) {
isVersionSupported = true;
}
else {
var actualVer = plugin.description;
if (actualVer === "1.0.30226.2")
actualVer = "2.0.30226.2";
var actualVerArray = actualVer.split(".");
while (actualVerArray.length > 3) {
actualVerArray.pop();
}
while (actualVerArray.length < 4) {
actualVerArray.push(0);
}
var reqVerArray = version.split(".");
while (reqVerArray.length > 4) {
reqVerArray.pop();
}
var requiredVersionPart;
var actualVersionPart
var index = 0;
do {
requiredVersionPart = parseInt(reqVerArray[index]);
actualVersionPart = parseInt(actualVerArray[index]);
index++;
}
while (index < reqVerArray.length && requiredVersionPart === actualVersionPart);
if (requiredVersionPart <= actualVersionPart && !isNaN(requiredVersionPart)) {
isVersionSupported = true;
}
}
}
}
}
catch (e) {
isVersionSupported = false;
}
if (container) {
document.body.removeChild(container);
}
return isVersionSupported;
}
Silverlight.WaitForInstallCompletion = function () {
if (!Silverlight.isBrowserRestartRequired && Silverlight.onSilverlightInstalled) {
try {
navigator.plugins.refresh();
}
catch (e) {
}
if (Silverlight.isInstalled(null)) {
Silverlight.onSilverlightInstalled();
}
else {
setTimeout(Silverlight.WaitForInstallCompletion, 3000);
}
}
}
Silverlight.__startup = function () {
Silverlight.isBrowserRestartRequired = Silverlight.isInstalled(null);//(!window.ActiveXObject || Silverlight.isInstalled(null));
if (!Silverlight.isBrowserRestartRequired) {
Silverlight.WaitForInstallCompletion();
}
if (window.removeEventListener) {
window.removeEventListener('load', Silverlight.__startup, false);
}
else {
window.detachEvent('onload', Silverlight.__startup);
}
}
if (window.addEventListener) {
window.addEventListener('load', Silverlight.__startup, false);
}
else {
window.attachEvent('onload', Silverlight.__startup);
}
///////////////////////////////////////////////////////////////////////////////
// createObject(); Params:
// parentElement of type Element, the parent element of the Silverlight Control
// source of type String
// id of type string
// properties of type String, object literal notation { name:value, name:value, name:value},
// current properties are: width, height, background, framerate, isWindowless, enableHtmlAccess, inplaceInstallPrompt: all are of type string
// events of type String, object literal notation { name:value, name:value, name:value},
// current events are onLoad onError, both are type string
// initParams of type Object or object literal notation { name:value, name:value, name:value}
// userContext of type Object
/////////////////////////////////////////////////////////////////////////////////
Silverlight.createObject = function (source, parentElement, id, properties, events, initParams, userContext) {
var slPluginHelper = new Object();
var slProperties = properties;
var slEvents = events;
slPluginHelper.version = slProperties.version;
slProperties.source = source;
slPluginHelper.alt = slProperties.alt;
//rename properties to their tag property names
if (initParams)
slProperties.initParams = initParams;
if (slProperties.isWindowless && !slProperties.windowless)
slProperties.windowless = slProperties.isWindowless;
if (slProperties.framerate && !slProperties.maxFramerate)
slProperties.maxFramerate = slProperties.framerate;
if (id && !slProperties.id)
slProperties.id = id;
// remove elements which are not to be added to the instantiation tag
delete slProperties.ignoreBrowserVer;
delete slProperties.inplaceInstallPrompt;
delete slProperties.version;
delete slProperties.isWindowless;
delete slProperties.framerate;
delete slProperties.data;
delete slProperties.src;
delete slProperties.alt;
// detect that the correct version of Silverlight is installed, else display install
if (Silverlight.isInstalled(slPluginHelper.version)) {
//move unknown events to the slProperties array
for (var name in slEvents) {
if (slEvents[name]) {
if (name == "onLoad" && typeof slEvents[name] == "function" && slEvents[name].length != 1) {
var onLoadHandler = slEvents[name];
slEvents[name] = function (sender) { return onLoadHandler(document.getElementById(id), userContext, sender) };
}
var handlerName = Silverlight.__getHandlerName(slEvents[name]);
if (handlerName != null) {
slProperties[name] = handlerName;
slEvents[name] = null;
}
else {
throw "typeof events." + name + " must be 'function' or 'string'";
}
}
}
slPluginHTML = Silverlight.buildHTML(slProperties);
}
//The control could not be instantiated. Show the installation prompt
else {
slPluginHTML = Silverlight.buildPromptHTML(slPluginHelper);
}
// insert or return the HTML
if (parentElement) {
parentElement.innerHTML = slPluginHTML;
}
else {
return slPluginHTML;
}
}
///////////////////////////////////////////////////////////////////////////////
//
// create HTML that instantiates the control
//
///////////////////////////////////////////////////////////////////////////////
Silverlight.buildHTML = function (slProperties) {
var htmlBuilder = [];
htmlBuilder.push('<object type=\"application/x-silverlight\" data="data:application/x-silverlight,"');
if (slProperties.id != null) {
htmlBuilder.push(' id="' + slProperties.id + '"');
}
if (slProperties.width != null) {
htmlBuilder.push(' width="' + slProperties.width + '"');
}
if (slProperties.height != null) {
htmlBuilder.push(' height="' + slProperties.height + '"');
}
htmlBuilder.push(' >');
delete slProperties.id;
delete slProperties.width;
delete slProperties.height;
for (var name in slProperties) {
if (slProperties[name]) {
htmlBuilder.push('<param name="' + Silverlight.HtmlAttributeEncode(name) + '" value="' + Silverlight.HtmlAttributeEncode(slProperties[name]) + '" />');
}
}
htmlBuilder.push('<\/object>');
return htmlBuilder.join('');
}
// createObjectEx, takes a single parameter of all createObject parameters enclosed in {}
Silverlight.createObjectEx = function (params) {
var parameters = params;
var html = Silverlight.createObject(parameters.source, parameters.parentElement, parameters.id, parameters.properties, parameters.events, parameters.initParams, parameters.context);
if (parameters.parentElement == null) {
return html;
}
}
///////////////////////////////////////////////////////////////////////////////////////////////
// Builds the HTML to prompt the user to download and install Silverlight
///////////////////////////////////////////////////////////////////////////////////////////////
Silverlight.buildPromptHTML = function (slPluginHelper) {
var slPluginHTML = "";
var urlRoot = Silverlight.fwlinkRoot;
var shortVer = slPluginHelper.version;
if (slPluginHelper.alt) {
slPluginHTML = slPluginHelper.alt;
}
else {
if (!shortVer) {
shortVer = "";
}
slPluginHTML = "<a href='javascript:Silverlight.getSilverlight(\"{1}\");' style='text-decoration: none;'><img src='{2}' alt='Get Microsoft Silverlight' style='border-style: none'/></a>";
slPluginHTML = slPluginHTML.replace('{1}', shortVer);
slPluginHTML = slPluginHTML.replace('{2}', urlRoot + '108181');
}
return slPluginHTML;
}
Silverlight.getSilverlight = function (version) {
if (Silverlight.onGetSilverlight) {
Silverlight.onGetSilverlight();
}
var shortVer = "";
var reqVerArray = String(version).split(".");
if (reqVerArray.length > 1) {
var majorNum = parseInt(reqVerArray[0]);
if (isNaN(majorNum) || majorNum < 2) {
shortVer = "1.0";
}
else {
shortVer = reqVerArray[0] + '.' + reqVerArray[1];
}
}
var verArg = "";
if (shortVer.match(/^\d+\056\d+$/)) {
verArg = "&v=" + shortVer;
}
Silverlight.followFWLink("114576" + verArg);
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// Navigates to a url based on fwlinkid
///////////////////////////////////////////////////////////////////////////////////////////////
Silverlight.followFWLink = function (linkid) {
top.location = Silverlight.fwlinkRoot + String(linkid);
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// Encodes special characters in input strings as charcodes
///////////////////////////////////////////////////////////////////////////////////////////////
Silverlight.HtmlAttributeEncode = function (strInput) {
var c;
var retVal = '';
if (strInput == null) {
return null;
}
for (var cnt = 0; cnt < strInput.length; cnt++) {
c = strInput.charCodeAt(cnt);
if (((c > 96) && (c < 123)) ||
((c > 64) && (c < 91)) ||
((c > 43) && (c < 58) && (c != 47)) ||
(c == 95)) {
retVal = retVal + String.fromCharCode(c);
}
else {
retVal = retVal + '&#' + c + ';';
}
}
return retVal;
}
///////////////////////////////////////////////////////////////////////////////
//
// Default error handling function to be used when a custom error handler is
// not present
//
///////////////////////////////////////////////////////////////////////////////
Silverlight.default_error_handler = function (sender, args) {
var iErrorCode;
var errorType = args.ErrorType;
iErrorCode = args.ErrorCode;
var errMsg = "\nSilverlight error message \n";
errMsg += "ErrorCode: " + iErrorCode + "\n";
errMsg += "ErrorType: " + errorType + " \n";
errMsg += "Message: " + args.ErrorMessage + " \n";
if (errorType == "ParserError") {
errMsg += "XamlFile: " + args.xamlFile + " \n";
errMsg += "Line: " + args.lineNumber + " \n";
errMsg += "Position: " + args.charPosition + " \n";
}
else if (errorType == "RuntimeError") {
if (args.lineNumber != 0) {
errMsg += "Line: " + args.lineNumber + " \n";
errMsg += "Position: " + args.charPosition + " \n";
}
errMsg += "MethodName: " + args.methodName + " \n";
}
alert(errMsg);
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// Releases event handler resources when the page is unloaded
///////////////////////////////////////////////////////////////////////////////////////////////
Silverlight.__cleanup = function () {
for (var i = Silverlight._silverlightCount - 1; i >= 0; i--) {
window['__slEvent' + i] = null;
}
Silverlight._silverlightCount = 0;
if (window.removeEventListener) {
window.removeEventListener('unload', Silverlight.__cleanup, false);
}
else {
window.detachEvent('onunload', Silverlight.__cleanup);
}
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// Releases event handler resources when the page is unloaded
///////////////////////////////////////////////////////////////////////////////////////////////
Silverlight.__getHandlerName = function (handler) {
var handlerName = "";
if (typeof handler == "string") {
handlerName = handler;
}
else if (typeof handler == "function") {
if (Silverlight._silverlightCount == 0) {
if (window.addEventListener) {
window.addEventListener('onunload', Silverlight.__cleanup, false);
}
else {
window.attachEvent('onunload', Silverlight.__cleanup);
}
}
var count = Silverlight._silverlightCount++;
handlerName = "__slEvent" + count;
window[handlerName] = handler;
}
else {
handlerName = null;
}
return handlerName;
}
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<bundle minify="true" runOnBuild="true">
<file>/ClientSource/Scripts/Modules/Silverlight/Silverlight.js</file>
</bundle>
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,413 +0,0 @@
if (!window.Silverlight) {
window.Silverlight = {};
}
// Silverlight control instance counter for memory mgt
Silverlight._silverlightCount = 0;
Silverlight.fwlinkRoot = 'http://go2.microsoft.com/fwlink/?LinkID=';
Silverlight.onGetSilverlight = null;
Silverlight.onSilverlightInstalled = function () { window.location.reload(false); };
//////////////////////////////////////////////////////////////////
// isInstalled, checks to see if the correct version is installed
//////////////////////////////////////////////////////////////////
Silverlight.isInstalled = function (version) {
var isVersionSupported = false;
var container = null;
try {
var control = null;
try {
control = new ActiveXObject('AgControl.AgControl');
if (version == null) {
isVersionSupported = true;
}
else if (control.IsVersionSupported(version)) {
isVersionSupported = true;
}
control = null;
}
catch (e) {
var plugin = navigator.plugins["Silverlight Plug-In"];
if (plugin) {
if (version === null) {
isVersionSupported = true;
}
else {
var actualVer = plugin.description;
if (actualVer === "1.0.30226.2")
actualVer = "2.0.30226.2";
var actualVerArray = actualVer.split(".");
while (actualVerArray.length > 3) {
actualVerArray.pop();
}
while (actualVerArray.length < 4) {
actualVerArray.push(0);
}
var reqVerArray = version.split(".");
while (reqVerArray.length > 4) {
reqVerArray.pop();
}
var requiredVersionPart;
var actualVersionPart
var index = 0;
do {
requiredVersionPart = parseInt(reqVerArray[index]);
actualVersionPart = parseInt(actualVerArray[index]);
index++;
}
while (index < reqVerArray.length && requiredVersionPart === actualVersionPart);
if (requiredVersionPart <= actualVersionPart && !isNaN(requiredVersionPart)) {
isVersionSupported = true;
}
}
}
}
}
catch (e) {
isVersionSupported = false;
}
if (container) {
document.body.removeChild(container);
}
return isVersionSupported;
}
Silverlight.WaitForInstallCompletion = function () {
if (!Silverlight.isBrowserRestartRequired && Silverlight.onSilverlightInstalled) {
try {
navigator.plugins.refresh();
}
catch (e) {
}
if (Silverlight.isInstalled(null)) {
Silverlight.onSilverlightInstalled();
}
else {
setTimeout(Silverlight.WaitForInstallCompletion, 3000);
}
}
}
Silverlight.__startup = function () {
Silverlight.isBrowserRestartRequired = Silverlight.isInstalled(null);//(!window.ActiveXObject || Silverlight.isInstalled(null));
if (!Silverlight.isBrowserRestartRequired) {
Silverlight.WaitForInstallCompletion();
}
if (window.removeEventListener) {
window.removeEventListener('load', Silverlight.__startup, false);
}
else {
window.detachEvent('onload', Silverlight.__startup);
}
}
if (window.addEventListener) {
window.addEventListener('load', Silverlight.__startup, false);
}
else {
window.attachEvent('onload', Silverlight.__startup);
}
///////////////////////////////////////////////////////////////////////////////
// createObject(); Params:
// parentElement of type Element, the parent element of the Silverlight Control
// source of type String
// id of type string
// properties of type String, object literal notation { name:value, name:value, name:value},
// current properties are: width, height, background, framerate, isWindowless, enableHtmlAccess, inplaceInstallPrompt: all are of type string
// events of type String, object literal notation { name:value, name:value, name:value},
// current events are onLoad onError, both are type string
// initParams of type Object or object literal notation { name:value, name:value, name:value}
// userContext of type Object
/////////////////////////////////////////////////////////////////////////////////
Silverlight.createObject = function (source, parentElement, id, properties, events, initParams, userContext) {
var slPluginHelper = new Object();
var slProperties = properties;
var slEvents = events;
slPluginHelper.version = slProperties.version;
slProperties.source = source;
slPluginHelper.alt = slProperties.alt;
//rename properties to their tag property names
if (initParams)
slProperties.initParams = initParams;
if (slProperties.isWindowless && !slProperties.windowless)
slProperties.windowless = slProperties.isWindowless;
if (slProperties.framerate && !slProperties.maxFramerate)
slProperties.maxFramerate = slProperties.framerate;
if (id && !slProperties.id)
slProperties.id = id;
// remove elements which are not to be added to the instantiation tag
delete slProperties.ignoreBrowserVer;
delete slProperties.inplaceInstallPrompt;
delete slProperties.version;
delete slProperties.isWindowless;
delete slProperties.framerate;
delete slProperties.data;
delete slProperties.src;
delete slProperties.alt;
// detect that the correct version of Silverlight is installed, else display install
if (Silverlight.isInstalled(slPluginHelper.version)) {
//move unknown events to the slProperties array
for (var name in slEvents) {
if (slEvents[name]) {
if (name == "onLoad" && typeof slEvents[name] == "function" && slEvents[name].length != 1) {
var onLoadHandler = slEvents[name];
slEvents[name] = function (sender) { return onLoadHandler(document.getElementById(id), userContext, sender) };
}
var handlerName = Silverlight.__getHandlerName(slEvents[name]);
if (handlerName != null) {
slProperties[name] = handlerName;
slEvents[name] = null;
}
else {
throw "typeof events." + name + " must be 'function' or 'string'";
}
}
}
slPluginHTML = Silverlight.buildHTML(slProperties);
}
//The control could not be instantiated. Show the installation prompt
else {
slPluginHTML = Silverlight.buildPromptHTML(slPluginHelper);
}
// insert or return the HTML
if (parentElement) {
parentElement.innerHTML = slPluginHTML;
}
else {
return slPluginHTML;
}
}
///////////////////////////////////////////////////////////////////////////////
//
// create HTML that instantiates the control
//
///////////////////////////////////////////////////////////////////////////////
Silverlight.buildHTML = function (slProperties) {
var htmlBuilder = [];
htmlBuilder.push('<object type=\"application/x-silverlight\" data="data:application/x-silverlight,"');
if (slProperties.id != null) {
htmlBuilder.push(' id="' + slProperties.id + '"');
}
if (slProperties.width != null) {
htmlBuilder.push(' width="' + slProperties.width + '"');
}
if (slProperties.height != null) {
htmlBuilder.push(' height="' + slProperties.height + '"');
}
htmlBuilder.push(' >');
delete slProperties.id;
delete slProperties.width;
delete slProperties.height;
for (var name in slProperties) {
if (slProperties[name]) {
htmlBuilder.push('<param name="' + Silverlight.HtmlAttributeEncode(name) + '" value="' + Silverlight.HtmlAttributeEncode(slProperties[name]) + '" />');
}
}
htmlBuilder.push('<\/object>');
return htmlBuilder.join('');
}
// createObjectEx, takes a single parameter of all createObject parameters enclosed in {}
Silverlight.createObjectEx = function (params) {
var parameters = params;
var html = Silverlight.createObject(parameters.source, parameters.parentElement, parameters.id, parameters.properties, parameters.events, parameters.initParams, parameters.context);
if (parameters.parentElement == null) {
return html;
}
}
///////////////////////////////////////////////////////////////////////////////////////////////
// Builds the HTML to prompt the user to download and install Silverlight
///////////////////////////////////////////////////////////////////////////////////////////////
Silverlight.buildPromptHTML = function (slPluginHelper) {
var slPluginHTML = "";
var urlRoot = Silverlight.fwlinkRoot;
var shortVer = slPluginHelper.version;
if (slPluginHelper.alt) {
slPluginHTML = slPluginHelper.alt;
}
else {
if (!shortVer) {
shortVer = "";
}
slPluginHTML = "<a href='javascript:Silverlight.getSilverlight(\"{1}\");' style='text-decoration: none;'><img src='{2}' alt='Get Microsoft Silverlight' style='border-style: none'/></a>";
slPluginHTML = slPluginHTML.replace('{1}', shortVer);
slPluginHTML = slPluginHTML.replace('{2}', urlRoot + '108181');
}
return slPluginHTML;
}
Silverlight.getSilverlight = function (version) {
if (Silverlight.onGetSilverlight) {
Silverlight.onGetSilverlight();
}
var shortVer = "";
var reqVerArray = String(version).split(".");
if (reqVerArray.length > 1) {
var majorNum = parseInt(reqVerArray[0]);
if (isNaN(majorNum) || majorNum < 2) {
shortVer = "1.0";
}
else {
shortVer = reqVerArray[0] + '.' + reqVerArray[1];
}
}
var verArg = "";
if (shortVer.match(/^\d+\056\d+$/)) {
verArg = "&v=" + shortVer;
}
Silverlight.followFWLink("114576" + verArg);
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// Navigates to a url based on fwlinkid
///////////////////////////////////////////////////////////////////////////////////////////////
Silverlight.followFWLink = function (linkid) {
top.location = Silverlight.fwlinkRoot + String(linkid);
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// Encodes special characters in input strings as charcodes
///////////////////////////////////////////////////////////////////////////////////////////////
Silverlight.HtmlAttributeEncode = function (strInput) {
var c;
var retVal = '';
if (strInput == null) {
return null;
}
for (var cnt = 0; cnt < strInput.length; cnt++) {
c = strInput.charCodeAt(cnt);
if (((c > 96) && (c < 123)) ||
((c > 64) && (c < 91)) ||
((c > 43) && (c < 58) && (c != 47)) ||
(c == 95)) {
retVal = retVal + String.fromCharCode(c);
}
else {
retVal = retVal + '&#' + c + ';';
}
}
return retVal;
}
///////////////////////////////////////////////////////////////////////////////
//
// Default error handling function to be used when a custom error handler is
// not present
//
///////////////////////////////////////////////////////////////////////////////
Silverlight.default_error_handler = function (sender, args) {
var iErrorCode;
var errorType = args.ErrorType;
iErrorCode = args.ErrorCode;
var errMsg = "\nSilverlight error message \n";
errMsg += "ErrorCode: " + iErrorCode + "\n";
errMsg += "ErrorType: " + errorType + " \n";
errMsg += "Message: " + args.ErrorMessage + " \n";
if (errorType == "ParserError") {
errMsg += "XamlFile: " + args.xamlFile + " \n";
errMsg += "Line: " + args.lineNumber + " \n";
errMsg += "Position: " + args.charPosition + " \n";
}
else if (errorType == "RuntimeError") {
if (args.lineNumber != 0) {
errMsg += "Line: " + args.lineNumber + " \n";
errMsg += "Position: " + args.charPosition + " \n";
}
errMsg += "MethodName: " + args.methodName + " \n";
}
alert(errMsg);
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// Releases event handler resources when the page is unloaded
///////////////////////////////////////////////////////////////////////////////////////////////
Silverlight.__cleanup = function () {
for (var i = Silverlight._silverlightCount - 1; i >= 0; i--) {
window['__slEvent' + i] = null;
}
Silverlight._silverlightCount = 0;
if (window.removeEventListener) {
window.removeEventListener('unload', Silverlight.__cleanup, false);
}
else {
window.detachEvent('onunload', Silverlight.__cleanup);
}
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// Releases event handler resources when the page is unloaded
///////////////////////////////////////////////////////////////////////////////////////////////
Silverlight.__getHandlerName = function (handler) {
var handlerName = "";
if (typeof handler == "string") {
handlerName = handler;
}
else if (typeof handler == "function") {
if (Silverlight._silverlightCount == 0) {
if (window.addEventListener) {
window.addEventListener('onunload', Silverlight.__cleanup, false);
}
else {
window.attachEvent('onunload', Silverlight.__cleanup);
}
}
var count = Silverlight._silverlightCount++;
handlerName = "__slEvent" + count;
window[handlerName] = handler;
}
else {
handlerName = null;
}
return handlerName;
}
+100
View File
@@ -4743,6 +4743,106 @@ div.form > table table.sub > tbody > tr > th.name {
border-right: none;
padding-right: 0;
}
div.disco-attachmentUpload-dropTarget {
display: none;
}
div.disco-attachmentUpload-dropTarget.dragHighlight {
display: block;
position: absolute;
z-index: 1000;
top: 0;
left: 0;
width: calc(100% - 6px);
height: calc(100% - 6px);
background-color: rgba(251, 218, 152, 0.5);
border: 3px dashed #f0a30a;
}
div.disco-attachmentUpload-dropTarget.dragHighlight h2 {
margin-top: 3em !important;
color: #2c1e02;
text-align: center;
font-weight: bold;
}
div.disco-attachmentUpload-dropTarget.dragHighlight.dragHover {
background-color: rgba(173, 235, 110, 0.5);
border: 3px dashed #60a917;
}
div.disco-attachmentUpload-dropTarget.dragHighlight.dragHover h2 {
color: #000000;
}
div.disco-attachmentUpload-progress {
position: absolute;
right: 0px;
bottom: 48px;
}
div.disco-attachmentUpload-progress > div {
background-color: #fafafa;
padding: 4px 8px;
}
div.disco-attachmentUpload-progress > div i {
color: #1e6dab;
margin-right: 4px;
}
div.disco-attachmentUpload-commentDialog {
padding: 0.25em 0.5em !important;
}
div.disco-attachmentUpload-commentDialog table {
border: solid 1px #f4f4f4;
border-collapse: collapse;
table-layout: fixed;
}
div.disco-attachmentUpload-commentDialog table > tbody > tr > td {
border: solid 1px #f4f4f4;
background-color: #ffffff;
}
div.disco-attachmentUpload-commentDialog table > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
}
div.disco-attachmentUpload-commentDialog table > thead > tr > th,
div.disco-attachmentUpload-commentDialog table > tbody > tr > th {
background-color: #f4f4f4;
border: solid 1px #f4f4f4;
}
div.disco-attachmentUpload-commentDialog table > tbody > tr:hover > td {
background-color: #fefefe;
}
div.disco-attachmentUpload-commentDialog table > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
}
div.disco-attachmentUpload-commentDialog table > tfoot > tr > th,
div.disco-attachmentUpload-commentDialog table > tfoot > tr > td {
background-color: #f4f4f4;
}
div.disco-attachmentUpload-commentDialog table th {
width: 80px;
}
div.disco-attachmentUpload-commentDialog table td.filename {
font-family: Consolas, "Courier New", monospace;
white-space: nowrap;
overflow: hidden;
-ms-text-overflow: ellipsis;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
}
div.disco-attachmentUpload-commentDialog table input.comments {
width: calc(100% - 5px);
}
div.disco-attachmentUpload-commentDialog table td.thumbnail {
display: none;
text-align: center;
}
div.disco-attachmentUpload-commentDialog table td.thumbnail img {
border: 1px solid #9e9e9e;
max-height: 250px;
max-width: 374px;
}
div.disco-attachmentUpload-imageDialog {
background-color: #000000 !important;
padding: 0 !important;
overflow: hidden !important;
width: 720px !important;
height: 540px !important;
}
.d-priority-high {
color: #fa6800;
width: 1.2857142857142858em;
File diff suppressed because one or more lines are too long
@@ -44,10 +44,10 @@
// Status
@StatusUnknown: @HeaderBackgroundColour;
@StatusSuccess: #60a917;
@StatusSuccess: @ThemeGreen;
@StatusInformation: @ButtonColour;
@StatusWarning: #f0a30a;
@StatusAlert: #fa6800;
@StatusWarning: @ThemeAmber;
@StatusAlert: @ThemeOrange;
@StatusError: @ButtonAlertColour;
@StatusRemove: @ButtonAlertColour;
+8 -1
View File
@@ -253,12 +253,16 @@
#DeviceDetailTab-DetailsContainer > table > tbody > tr > td {
padding: 10px 6px;
}
#deviceShowResources #Attachments {
#deviceShowResources #AttachmentsContainer {
padding: 0;
}
#deviceShowResources #Attachments {
position: relative;
border: 1px solid #cccccc;
background-color: #ffffff;
}
#deviceShowResources #Attachments div.attachmentOutput {
position: relative;
height: 115px;
overflow: auto;
font-size: 0.95em;
@@ -303,6 +307,9 @@
height: 48px;
width: 48px;
}
#deviceShowResources #Attachments div.attachmentOutput > a span.icon img.loading {
display: none;
}
#deviceShowResources #Attachments div.attachmentOutput > a:hover {
background-color: #ededed;
border: 1px solid #cccccc;
+10 -2
View File
@@ -210,12 +210,17 @@
#deviceShowResources {
#Attachments {
#AttachmentsContainer {
padding: 0;
}
#Attachments {
position: relative;
border: 1px solid @SubtleBorderColour;
background-color: @white;
div.attachmentOutput {
position: relative;
height: 115px;
overflow: auto;
font-size: 0.95em;
@@ -260,6 +265,10 @@
img {
height: 48px;
width: 48px;
&.loading {
display: none;
}
}
}
@@ -457,7 +466,6 @@
color: @StatusInformation;
}
}
// Icons used within Devices_Import_Review
@import "FontAwesome\variables.less";
File diff suppressed because one or more lines are too long
+16 -4
View File
@@ -243,8 +243,11 @@
border-top: none;
background-color: #eee;
}
#jobShowResources #Comments {
#jobShowResources #CommentsContainer {
padding: 0;
width: 375px;
}
#jobShowResources #Comments {
height: 300px;
padding: 0;
border: 1px solid #cccccc;
@@ -329,13 +332,19 @@
background-color: #ededed;
border: 1px solid #cccccc;
}
#jobShowResources #Attachments {
height: 300px;
#jobShowResources #AttachmentsContainer {
padding: 0;
border: 1px solid #cccccc;
}
#jobShowResources #Attachments {
position: relative;
height: 300px;
border-top: 1px solid #cccccc;
border-right: 1px solid #cccccc;
border-bottom: 1px solid #cccccc;
background-color: #ffffff;
}
#jobShowResources #Attachments div.attachmentOutput {
position: relative;
height: 249px;
overflow: auto;
}
@@ -379,6 +388,9 @@
height: 48px;
width: 48px;
}
#jobShowResources #Attachments div.attachmentOutput > a span.icon img.loading {
display: none;
}
#jobShowResources #Attachments div.attachmentOutput > a:hover {
background-color: #ededed;
border: 1px solid #cccccc;
+19 -4
View File
@@ -215,8 +215,12 @@
#jobShowResources {
#Comments {
#CommentsContainer {
padding: 0;
width: 375px;
}
#Comments {
height: 300px;
padding: 0;
border: 1px solid @SubtleBorderColour;
@@ -318,13 +322,20 @@
}
}
#Attachments {
height: 300px;
#AttachmentsContainer {
padding: 0;
border: 1px solid @SubtleBorderColour;
}
#Attachments {
position: relative;
height: 300px;
border-top: 1px solid @SubtleBorderColour;
border-right: 1px solid @SubtleBorderColour;
border-bottom: 1px solid @SubtleBorderColour;
background-color: @white;
div.attachmentOutput {
position: relative;
height: 249px;
overflow: auto;
@@ -368,6 +379,10 @@
img {
height: 48px;
width: 48px;
&.loading {
display: none;
}
}
}
File diff suppressed because one or more lines are too long
+100
View File
@@ -1082,6 +1082,106 @@ div.form > table table.sub > tbody > tr > th.name {
border-right: none;
padding-right: 0;
}
div.disco-attachmentUpload-dropTarget {
display: none;
}
div.disco-attachmentUpload-dropTarget.dragHighlight {
display: block;
position: absolute;
z-index: 1000;
top: 0;
left: 0;
width: calc(100% - 6px);
height: calc(100% - 6px);
background-color: rgba(251, 218, 152, 0.5);
border: 3px dashed #f0a30a;
}
div.disco-attachmentUpload-dropTarget.dragHighlight h2 {
margin-top: 3em !important;
color: #2c1e02;
text-align: center;
font-weight: bold;
}
div.disco-attachmentUpload-dropTarget.dragHighlight.dragHover {
background-color: rgba(173, 235, 110, 0.5);
border: 3px dashed #60a917;
}
div.disco-attachmentUpload-dropTarget.dragHighlight.dragHover h2 {
color: #000000;
}
div.disco-attachmentUpload-progress {
position: absolute;
right: 0px;
bottom: 48px;
}
div.disco-attachmentUpload-progress > div {
background-color: #fafafa;
padding: 4px 8px;
}
div.disco-attachmentUpload-progress > div i {
color: #1e6dab;
margin-right: 4px;
}
div.disco-attachmentUpload-commentDialog {
padding: 0.25em 0.5em !important;
}
div.disco-attachmentUpload-commentDialog table {
border: solid 1px #f4f4f4;
border-collapse: collapse;
table-layout: fixed;
}
div.disco-attachmentUpload-commentDialog table > tbody > tr > td {
border: solid 1px #f4f4f4;
background-color: #ffffff;
}
div.disco-attachmentUpload-commentDialog table > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfc;
}
div.disco-attachmentUpload-commentDialog table > thead > tr > th,
div.disco-attachmentUpload-commentDialog table > tbody > tr > th {
background-color: #f4f4f4;
border: solid 1px #f4f4f4;
}
div.disco-attachmentUpload-commentDialog table > tbody > tr:hover > td {
background-color: #fefefe;
}
div.disco-attachmentUpload-commentDialog table > tbody > tr:hover:nth-child(odd) > td {
background-color: #fafafa;
}
div.disco-attachmentUpload-commentDialog table > tfoot > tr > th,
div.disco-attachmentUpload-commentDialog table > tfoot > tr > td {
background-color: #f4f4f4;
}
div.disco-attachmentUpload-commentDialog table th {
width: 80px;
}
div.disco-attachmentUpload-commentDialog table td.filename {
font-family: Consolas, "Courier New", monospace;
white-space: nowrap;
overflow: hidden;
-ms-text-overflow: ellipsis;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
}
div.disco-attachmentUpload-commentDialog table input.comments {
width: calc(100% - 5px);
}
div.disco-attachmentUpload-commentDialog table td.thumbnail {
display: none;
text-align: center;
}
div.disco-attachmentUpload-commentDialog table td.thumbnail img {
border: 1px solid #9e9e9e;
max-height: 250px;
max-width: 374px;
}
div.disco-attachmentUpload-imageDialog {
background-color: #000000 !important;
padding: 0 !important;
overflow: hidden !important;
width: 720px !important;
height: 540px !important;
}
.d-priority-high {
color: #fa6800;
width: 1.2857142857142858em;
+97 -3
View File
@@ -907,9 +907,9 @@ select {
color: #444;
}
select.small {
padding: 0;
}
select.small {
padding: 0;
}
input[type="submit"], button {
font-family: @FontFamilyBody;
@@ -1075,6 +1075,100 @@ div.form {
}
}
// Attachment Uploader
div.disco-attachmentUpload-dropTarget {
display: none;
&.dragHighlight {
display: block;
position: absolute;
z-index: 1000;
top: 0;
left: 0;
width: calc(~"100% - 6px");
height: calc(~"100% - 6px");
background-color: fadeOut(lighten(@ThemeAmber, 30%), 50%);
border: 3px dashed @ThemeAmber;
h2 {
margin-top: 3em !important;
color: darken(@ThemeAmber, 40%);
text-align: center;
font-weight: bold;
}
&.dragHover {
background-color: fadeOut(lighten(@ThemeGreen, 30%), 50%);
border: 3px dashed @ThemeGreen;
h2 {
color: darken(@ThemeGreen, 40%);
}
}
}
}
div.disco-attachmentUpload-progress {
position: absolute;
right: 0px;
bottom: 48px;
& > div {
background-color: @BackgroundColourLight;
padding: 4px 8px;
i {
color: @StatusInformation;
margin-right: 4px;
}
}
}
div.disco-attachmentUpload-commentDialog {
padding: 0.25em 0.5em !important;
table {
.tableData;
table-layout: fixed;
th {
width: 80px;
}
td.filename {
font-family: @FontFamilyMono;
white-space: nowrap;
overflow: hidden;
-ms-text-overflow: ellipsis;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
}
input.comments {
width: calc(~"100% - 5px");
}
td.thumbnail {
display: none;
text-align: center;
img {
border: 1px solid @ButtonHoverColour;
max-height: 250px;
max-width: 374px;
}
}
}
}
div.disco-attachmentUpload-imageDialog {
background-color: @black !important;
padding: 0 !important;
overflow: hidden !important;
width: 720px !important;
height: 540px !important;
}
// Priority Colours
.d-priority-high {
color: @PriorityHigh;
File diff suppressed because one or more lines are too long
+8 -1
View File
@@ -231,12 +231,16 @@
#UserDetailTab-Authorization #UserDetailTab-Authorization_NoAccess h3 {
margin-bottom: 10px;
}
#userShowResources #Attachments {
#userShowResources #AttachmentsContainer {
padding: 0;
}
#userShowResources #Attachments {
position: relative;
border: 1px solid #cccccc;
background-color: #ffffff;
}
#userShowResources #Attachments div.attachmentOutput {
position: relative;
height: 115px;
overflow: auto;
font-size: 0.95em;
@@ -281,6 +285,9 @@
height: 48px;
width: 48px;
}
#userShowResources #Attachments div.attachmentOutput > a span.icon img.loading {
display: none;
}
#userShowResources #Attachments div.attachmentOutput > a:hover span.remove {
opacity: .5;
}
+13 -7
View File
@@ -206,12 +206,17 @@
#userShowResources {
#Attachments {
#AttachmentsContainer {
padding: 0;
}
#Attachments {
position: relative;
border: 1px solid @SubtleBorderColour;
background-color: @white;
div.attachmentOutput {
position: relative;
height: 115px;
overflow: auto;
font-size: 0.95em;
@@ -256,6 +261,10 @@
img {
height: 48px;
width: 48px;
&.loading {
display: none;
}
}
}
@@ -272,8 +281,7 @@
cursor: pointer;
opacity: 0;
&:hover
{
&:hover {
opacity: 1;
}
}
@@ -290,8 +298,7 @@
background-color: @white;
padding: 3px;
span.action
{
span.action {
color: @HeaderBackgroundColour;
display: block;
margin: 0 4px 0 0;
@@ -301,8 +308,7 @@
border: 1px solid @white;
padding: .5em;
&:hover
{
&:hover {
color: @HyperLinkColour;
background-color: @SubtleColour;
border: 1px solid @SubtleBorderColour;
File diff suppressed because one or more lines are too long