Bug Fix: Webcam Attachment in <= Win 7

Flash video overlay was hiding the Comments model dialog. The flash
object is now hidden where <= Win 7 is detected (navigator.userAgent).

Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader.js

@@ -490,9 +490,9 @@ Webcam.init();
             // Setup Dialog
             var dialog = $('<div>')
                 .attr({
-                    id: 'disco_attachmentUpload_imageDialog',
+                    id: 'Disco_AttachmentUpload_ImageDialog',
                     title: 'Upload Image',
-                    'class': 'dialog disco-attachmentUpload-imageDialog'
+                    'class': 'dialog Disco-AttachmentUpload-ImageDialog'
                 });
             dialog.dialog({
                 autoOpen: true,
@@ -548,7 +548,7 @@ Webcam.init();
             var dialog = $('<div>')
                 .attr({
                     title: 'Upload File',
-                    'class': 'dialog disco-attachmentUpload-commentDialog'
+                    '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>');
 
@@ -591,6 +591,10 @@ Webcam.init();
         };
 
         self._uploadImage = function (dataUri) {
+
+            if (self._hideFlashVideoOverlay())
+                $('#webcam_movie_obj, #webcam_movie_embed').css('display', 'none');
+
             var imageData = dataUri.replace(/^data\:image\/\w+\;base64\,/, '');
 
             var imageBlob = new Blob([Webcam.base64DecToArr(imageData)], { type: 'image/jpeg' });
@@ -601,6 +605,9 @@ Webcam.init();
                 img.attr('src', dataUri);
                 return true;
             }, function (result, comments) {
+                if (self._hideFlashVideoOverlay())
+                    $('#webcam_movie_obj, #webcam_movie_embed').css('display', '');
+
                 if (!result)
                     return;
 
@@ -664,6 +671,23 @@ Webcam.init();
         };
         // #endregion
 
+        // Flash Video hides Dom elements (comment dialog) in <= Win7
+        self.__hideFlashVideoOverlay = null;
+        self._hideFlashVideoOverlay = function () {
+            if (self.__hideFlashVideoOverlay === null) {
+                self.__hideFlashVideoOverlay = false;
+
+                // Test for: <= Windows 7
+                try {
+                    var match = /(windows nt) ([\w.]+)/.exec(navigator.userAgent.toLowerCase());
+                    if (!!match && parseFloat(match[2]) <= 6.2) 
+                        self.__hideFlashVideoOverlay = true;
+                } catch (e) { }
+            }
+
+            return self.__hideFlashVideoOverlay;
+        }
+
         return self;
     };
 

Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader.min.js

@@ -1,4 +1,4 @@
-var Webcam={version:"1.0.0",protocol:location.protocol.match(/https/i)?"https":"http",swfURL:"",loaded:!1,live:!1,userMedia:!0,params:{width:0,height:0,dest_width:0,dest_height:0,image_format:"jpeg",jpeg_quality:90,force_flash:!1},hooks:{load:null,live:null,uploadcomplete:null,uploadprogress:null,error:function(n){alert("Webcam.js Error: "+n)}},init:function(){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;navigator.userAgent.match(/Firefox\D+(\d+)/)&&parseInt(RegExp.$1,10)<21&&(this.userMedia=null)},attach:function(n){var t,i,r,u,f,e;if(typeof n=="string"&&(n=document.getElementById(n)||document.querySelector(n)),!n)return this.dispatch("error","Could not locate DOM element to attach to.");this.container=n;this.params.width||(this.params.width=n.offsetWidth);this.params.height||(this.params.height=n.offsetHeight);this.params.dest_width||(this.params.dest_width=this.params.width);this.params.dest_height||(this.params.dest_height=this.params.height);this.params.force_flash&&(this.userMedia=null);this.userMedia?(t=document.createElement("video"),t.setAttribute("autoplay","autoplay"),t.style.width=""+this.params.dest_width+"px",t.style.height=""+this.params.dest_height+"px",i=this.params.width/this.params.dest_width,r=this.params.height/this.params.dest_height,(i!=1||r!=1)&&(n.style.overflow="visible",t.style.webkitTransformOrigin="0px 0px",t.style.mozTransformOrigin="0px 0px",t.style.msTransformOrigin="0px 0px",t.style.oTransformOrigin="0px 0px",t.style.transformOrigin="0px 0px",t.style.webkitTransform="scaleX("+i+") scaleY("+r+")",t.style.mozTransform="scaleX("+i+") scaleY("+r+")",t.style.msTransform="scaleX("+i+") scaleY("+r+")",t.style.oTransform="scaleX("+i+") scaleY("+r+")",t.style.transform="scaleX("+i+") scaleY("+r+")"),n.appendChild(t),this.video=t,u=document.createElement("canvas"),u.width=this.params.dest_width,u.height=this.params.dest_height,f=u.getContext("2d"),this.context=f,this.canvas=u,e=this,navigator.getUserMedia({audio:!1,video:!0},function(n){t.src=window.URL.createObjectURL(n)||n;Webcam.stream=n;Webcam.loaded=!0;Webcam.live=!0;Webcam.dispatch("load");Webcam.dispatch("live")},function(){return e.dispatch("error","Could not access webcam.")})):n.innerHTML=this.getSWFHTML()},reset:function(){if(this.userMedia){try{this.stream.stop()}catch(n){}delete this.stream;delete this.canvas;delete this.context;delete this.video}this.container.innerHTML="";delete this.container;this.loaded=!1;this.live=!1},set:function(){if(arguments.length==1)for(var n in arguments[0])this.params[n]=arguments[0][n];else this.params[arguments[0]]=arguments[1]},on:function(n,t){if(n=n.replace(/^on/i,"").toLowerCase(),typeof this.hooks[n]=="undefined")throw"Event type not supported: "+n;this.hooks[n]=t},dispatch:function(){var n=arguments[0].replace(/^on/i,"").toLowerCase(),t=Array.prototype.slice.call(arguments,1);return this.hooks[n]?(typeof this.hooks[n]=="function"?this.hooks[n].apply(this,t):typeof this.hooks[n]=="array"?this.hooks[n][0][this.hooks[n][1]].apply(this.hooks[n][0],t):window[this.hooks[n]]&&window[this.hooks[n]].apply(window,t),!0):!1},setSWFLocation:function(n){this.swfURL=n},getSWFHTML:function(){var i,u,t,f,r,n,e;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>';if(!this.swfURL){for(i="",u=document.getElementsByTagName("script"),t=0,f=u.length;t<f;t++)r=u[t].getAttribute("src"),r&&r.match(/\/webcam(\.min)?\.js/)&&(i=r.replace(/\/webcam(\.min)?\.js.*$/,""),t=f);this.swfURL=i?i+"/webcam.swf":"webcam.swf"}window.localStorage&&!localStorage.getItem("visited")&&(this.params.new_user=1,localStorage.setItem("visited",1));n="";for(e in this.params)n&&(n+="&"),n+=e+"="+escape(this.params[e]);return""+('<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="'+n+'"/><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="'+n+'"><\/embeLine truncated
+var Webcam={version:"1.0.0",protocol:location.protocol.match(/https/i)?"https":"http",swfURL:"",loaded:!1,live:!1,userMedia:!0,params:{width:0,height:0,dest_width:0,dest_height:0,image_format:"jpeg",jpeg_quality:90,force_flash:!1},hooks:{load:null,live:null,uploadcomplete:null,uploadprogress:null,error:function(n){alert("Webcam.js Error: "+n)}},init:function(){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;navigator.userAgent.match(/Firefox\D+(\d+)/)&&parseInt(RegExp.$1,10)<21&&(this.userMedia=null)},attach:function(n){var t,i,r,u,f,e;if(typeof n=="string"&&(n=document.getElementById(n)||document.querySelector(n)),!n)return this.dispatch("error","Could not locate DOM element to attach to.");this.container=n;this.params.width||(this.params.width=n.offsetWidth);this.params.height||(this.params.height=n.offsetHeight);this.params.dest_width||(this.params.dest_width=this.params.width);this.params.dest_height||(this.params.dest_height=this.params.height);this.params.force_flash&&(this.userMedia=null);this.userMedia?(t=document.createElement("video"),t.setAttribute("autoplay","autoplay"),t.style.width=""+this.params.dest_width+"px",t.style.height=""+this.params.dest_height+"px",i=this.params.width/this.params.dest_width,r=this.params.height/this.params.dest_height,(i!=1||r!=1)&&(n.style.overflow="visible",t.style.webkitTransformOrigin="0px 0px",t.style.mozTransformOrigin="0px 0px",t.style.msTransformOrigin="0px 0px",t.style.oTransformOrigin="0px 0px",t.style.transformOrigin="0px 0px",t.style.webkitTransform="scaleX("+i+") scaleY("+r+")",t.style.mozTransform="scaleX("+i+") scaleY("+r+")",t.style.msTransform="scaleX("+i+") scaleY("+r+")",t.style.oTransform="scaleX("+i+") scaleY("+r+")",t.style.transform="scaleX("+i+") scaleY("+r+")"),n.appendChild(t),this.video=t,u=document.createElement("canvas"),u.width=this.params.dest_width,u.height=this.params.dest_height,f=u.getContext("2d"),this.context=f,this.canvas=u,e=this,navigator.getUserMedia({audio:!1,video:!0},function(n){t.src=window.URL.createObjectURL(n)||n;Webcam.stream=n;Webcam.loaded=!0;Webcam.live=!0;Webcam.dispatch("load");Webcam.dispatch("live")},function(){return e.dispatch("error","Could not access webcam.")})):n.innerHTML=this.getSWFHTML()},reset:function(){if(this.userMedia){try{this.stream.stop()}catch(n){}delete this.stream;delete this.canvas;delete this.context;delete this.video}this.container.innerHTML="";delete this.container;this.loaded=!1;this.live=!1},set:function(){if(arguments.length==1)for(var n in arguments[0])this.params[n]=arguments[0][n];else this.params[arguments[0]]=arguments[1]},on:function(n,t){if(n=n.replace(/^on/i,"").toLowerCase(),typeof this.hooks[n]=="undefined")throw"Event type not supported: "+n;this.hooks[n]=t},dispatch:function(){var n=arguments[0].replace(/^on/i,"").toLowerCase(),t=Array.prototype.slice.call(arguments,1);return this.hooks[n]?(typeof this.hooks[n]=="function"?this.hooks[n].apply(this,t):typeof this.hooks[n]=="array"?this.hooks[n][0][this.hooks[n][1]].apply(this.hooks[n][0],t):window[this.hooks[n]]&&window[this.hooks[n]].apply(window,t),!0):!1},setSWFLocation:function(n){this.swfURL=n},getSWFHTML:function(){var i,u,t,f,r,n,e;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>';if(!this.swfURL){for(i="",u=document.getElementsByTagName("script"),t=0,f=u.length;t<f;t++)r=u[t].getAttribute("src"),r&&r.match(/\/webcam(\.min)?\.js/)&&(i=r.replace(/\/webcam(\.min)?\.js.*$/,""),t=f);this.swfURL=i?i+"/webcam.swf":"webcam.swf"}window.localStorage&&!localStorage.getItem("visited")&&(this.params.new_user=1,localStorage.setItem("visited",1));n="";for(e in this.params)n&&(n+="&"),n+=e+"="+escape(this.params[e]);return""+('<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="'+n+'"/><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="'+n+'"><\/embeLine truncated
 /*
 //# sourceMappingURL=Disco-AttachmentUploader.min.js.map
 */

Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader.min.js.map

@@ -2,7 +2,7 @@
 "version":3,
 "file":"Disco-AttachmentUploader.min.js",
 "lineCount":1,
-"mappings":"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 truncated
+"mappings":"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 truncated
 "sources":["/ClientSource/Scripts/Modules/Disco-AttachmentUploader/webcam.js","/ClientSource/Scripts/Modules/Disco-AttachmentUploader/disco-attachmentuploader.js"],
-"names":["Webcam","location","protocol","match","error","msg","alert","init","navigator","getUserMedia","webkitGetUserMedia","mozGetUserMedia","msGetUserMedia","window","URL","webkitURL","mozURL","msURL","userMedia","userAgent","parseInt","RegExp","$1","attach","elem","video","scaleX","scaleY","canvas","context","self","document","getElementById","querySelector","dispatch","container","params","width","offsetWidth","height","offsetHeight","dest_width","dest_height","force_flash","createElement","setAttribute","style","overflow","webkitTransformOrigin","mozTransformOrigin","msTransformOrigin","oTransformOrigin","transformOrigin","webkitTransform","mozTransform","msTransform","oTransform","transform","appendChild","getContext","stream","src","createObjectURL","loaded","live","innerHTML","getSWFHTML","reset","stop","e","set","arguments","length","key","on","name","callback","replace","toLowerCase","hooks","args","Array","prototype","slice","call","apply","setSWFLocation","url","swfURL","base_url","scpts","idx","len","flashvars","getElementsByTagName","getAttribute","localStorage","getItem","new_user","setItem","escape","getMovie","movie","_snap","snap","drawImage","toDataURL","image_format","jpeg_quality","raw_data","configure","panel","_configure","flashNotify","type","b64ToUint6","nChr","base64DecToArr","sBase64","nBlocksSize","sB64Enc","nInLen","nOutLen","Math","ceil","taBytes","Uint8Array","nMod3","nMod4","nUint24","nOutIdx","nInIdx","charCodeAt","upload","image_data_uri","target_url","form_elem_name","image_fmt","raw_image_data","http","blob","form","XMLHttpRequest","open","addEventListener","lengthComputable","progress","total","onload","http.onload","status","responseText","statusText","Blob","FormData","append","send","$","attachmentUploader","uploadUrl","dropTarget","uploadProgressContainer","_uploadFilesInput","uploadFiles","self.uploadFiles","remove","attr","hide","change","files","target","_uploadFiles","appendTo","click","$document","dragFinished","dragFinishedToken","addClass","removeClass","clearInterval","setTimeout","stopPropagation","preventDefault","originalEvent","dataTransfer","dropEffect","uploadImage","self.uploadImage","captureImage","dataUri","_uploadImage","mediaWidth","mediaHeight","dialog","dialogButtons","close","closest","children","css","find","focus","getFileComments","self.getFileComments","fileName","thumbnailHandler","complete","result","td","img","comments","html","show","text","keypress","which","Upload","Cancel","commentsVal","val","self._uploadImage","imageData","imageBlob","moment","format","_uploadFile","self._uploadFiles","fileList","makeArray","processNextFile","file","shift","indexOf","reader","FileReader","reader.onload","readAsDataURL","self._uploadFile","fileData","formData","xhr","onreadystatechange","xhr.onreadystatechange","readyState","slideUp","Disco","AttachmentUploader"]
+"names":["Webcam","location","protocol","match","error","msg","alert","init","navigator","getUserMedia","webkitGetUserMedia","mozGetUserMedia","msGetUserMedia","window","URL","webkitURL","mozURL","msURL","userMedia","userAgent","parseInt","RegExp","$1","attach","elem","video","scaleX","scaleY","canvas","context","self","document","getElementById","querySelector","dispatch","container","params","width","offsetWidth","height","offsetHeight","dest_width","dest_height","force_flash","createElement","setAttribute","style","overflow","webkitTransformOrigin","mozTransformOrigin","msTransformOrigin","oTransformOrigin","transformOrigin","webkitTransform","mozTransform","msTransform","oTransform","transform","appendChild","getContext","stream","src","createObjectURL","loaded","live","innerHTML","getSWFHTML","reset","stop","e","set","arguments","length","key","on","name","callback","replace","toLowerCase","hooks","args","Array","prototype","slice","call","apply","setSWFLocation","url","swfURL","base_url","scpts","idx","len","flashvars","getElementsByTagName","getAttribute","localStorage","getItem","new_user","setItem","escape","getMovie","movie","_snap","snap","drawImage","toDataURL","image_format","jpeg_quality","raw_data","configure","panel","_configure","flashNotify","type","b64ToUint6","nChr","base64DecToArr","sBase64","nBlocksSize","sB64Enc","nInLen","nOutLen","Math","ceil","taBytes","Uint8Array","nMod3","nMod4","nUint24","nOutIdx","nInIdx","charCodeAt","upload","image_data_uri","target_url","form_elem_name","image_fmt","raw_image_data","http","blob","form","XMLHttpRequest","open","addEventListener","lengthComputable","progress","total","onload","http.onload","status","responseText","statusText","Blob","FormData","append","send","$","attachmentUploader","uploadUrl","dropTarget","uploadProgressContainer","_uploadFilesInput","uploadFiles","self.uploadFiles","remove","attr","hide","change","files","target","_uploadFiles","appendTo","click","$document","dragFinished","dragFinishedToken","addClass","removeClass","clearInterval","setTimeout","stopPropagation","preventDefault","originalEvent","dataTransfer","dropEffect","uploadImage","self.uploadImage","captureImage","dataUri","_uploadImage","mediaWidth","mediaHeight","dialog","dialogButtons","close","closest","children","css","find","focus","getFileComments","self.getFileComments","fileName","thumbnailHandler","complete","result","td","img","comments","html","show","text","keypress","which","Upload","Cancel","commentsVal","val","self._uploadImage","_hideFlashVideoOverlay","imageData","imageBlob","moment","format","_uploadFile","self._uploadFiles","fileList","makeArray","processNextFile","file","shift","indexOf","reader","FileReader","reader.onload","readAsDataURL","self._uploadFile","fileData","formData","xhr","onreadystatechange","xhr.onreadystatechange","readyState","slideUp","__hideFlashVideoOverlay","self._hideFlashVideoOverlay","exec","parseFloat","Disco","AttachmentUploader"]
 }

Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader/disco-attachmentuploader.js

@@ -89,9 +89,9 @@
             // Setup Dialog
             var dialog = $('<div>')
                 .attr({
-                    id: 'disco_attachmentUpload_imageDialog',
+                    id: 'Disco_AttachmentUpload_ImageDialog',
                     title: 'Upload Image',
-                    'class': 'dialog disco-attachmentUpload-imageDialog'
+                    'class': 'dialog Disco-AttachmentUpload-ImageDialog'
                 });
             dialog.dialog({
                 autoOpen: true,
@@ -147,7 +147,7 @@
             var dialog = $('<div>')
                 .attr({
                     title: 'Upload File',
-                    'class': 'dialog disco-attachmentUpload-commentDialog'
+                    '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>');
 
@@ -190,6 +190,10 @@
         };
 
         self._uploadImage = function (dataUri) {
+
+            if (self._hideFlashVideoOverlay())
+                $('#webcam_movie_obj, #webcam_movie_embed').css('display', 'none');
+
             var imageData = dataUri.replace(/^data\:image\/\w+\;base64\,/, '');
 
             var imageBlob = new Blob([Webcam.base64DecToArr(imageData)], { type: 'image/jpeg' });
@@ -200,6 +204,9 @@
                 img.attr('src', dataUri);
                 return true;
             }, function (result, comments) {
+                if (self._hideFlashVideoOverlay())
+                    $('#webcam_movie_obj, #webcam_movie_embed').css('display', '');
+
                 if (!result)
                     return;
 
@@ -263,6 +270,23 @@
         };
         // #endregion
 
+        // Flash Video hides Dom elements (comment dialog) in <= Win7
+        self.__hideFlashVideoOverlay = null;
+        self._hideFlashVideoOverlay = function () {
+            if (self.__hideFlashVideoOverlay === null) {
+                self.__hideFlashVideoOverlay = false;
+
+                // Test for: <= Windows 7
+                try {
+                    var match = /(windows nt) ([\w.]+)/.exec(navigator.userAgent.toLowerCase());
+                    if (!!match && parseFloat(match[2]) <= 6.2) 
+                        self.__hideFlashVideoOverlay = true;
+                } catch (e) { }
+            }
+
+            return self.__hideFlashVideoOverlay;
+        }
+
         return self;
     };