jmontoyaa 8 rokov pred
rodič
commit
438e6d0719
26 zmenil súbory, kde vykonal 156 pridanie a 71 odobranie
  1. 4 4
      app/Resources/public/assets/mediaelement/.bower.json
  2. BIN
      app/Resources/public/assets/mediaelement/build/flashmediaelement-cdn.swf
  3. BIN
      app/Resources/public/assets/mediaelement/build/flashmediaelement-debug.swf
  4. BIN
      app/Resources/public/assets/mediaelement/build/flashmediaelement.swf
  5. 25 9
      app/Resources/public/assets/mediaelement/build/mediaelement-and-player.js
  6. 0 0
      app/Resources/public/assets/mediaelement/build/mediaelement-and-player.min.js
  7. 24 27
      app/Resources/public/assets/mediaelement/build/mediaelementplayer.css
  8. 25 9
      app/Resources/public/assets/mediaelement/build/mediaelementplayer.js
  9. 0 0
      app/Resources/public/assets/mediaelement/build/mediaelementplayer.min.css
  10. 0 0
      app/Resources/public/assets/mediaelement/build/mediaelementplayer.min.js
  11. 12 1
      app/Resources/public/assets/mediaelement/changelog.md
  12. 4 4
      app/Resources/public/assets/pwstrength-bootstrap/.bower.json
  13. 11 1
      app/Resources/public/assets/pwstrength-bootstrap/OPTIONS.md
  14. 13 1
      app/Resources/public/assets/pwstrength-bootstrap/README.md
  15. 1 1
      app/Resources/public/assets/pwstrength-bootstrap/bower.json
  16. 6 1
      app/Resources/public/assets/pwstrength-bootstrap/dist/pwstrength-bootstrap.js
  17. 1 1
      app/Resources/public/assets/pwstrength-bootstrap/dist/pwstrength-bootstrap.min.js
  18. 0 0
      app/Resources/public/assets/pwstrength-bootstrap/dist/pwstrength-bootstrap.min.map
  19. 1 0
      app/Resources/public/assets/pwstrength-bootstrap/src/options.js
  20. 4 0
      app/Resources/public/assets/pwstrength-bootstrap/src/rules.js
  21. 4 4
      app/Resources/public/assets/webcamjs/.bower.json
  22. 10 1
      app/Resources/public/assets/webcamjs/README.md
  23. 1 1
      app/Resources/public/assets/webcamjs/bower.json
  24. 1 1
      app/Resources/public/assets/webcamjs/package.json
  25. 9 4
      app/Resources/public/assets/webcamjs/webcam.js
  26. 0 1
      app/Resources/public/assets/webcamjs/webcam.min.js

+ 4 - 4
app/Resources/public/assets/mediaelement/.bower.json

@@ -23,12 +23,12 @@
     "./build/mediaelement-and-player.js",
     "./build/mediaelementplayer.css"
   ],
-  "version": "2.22.0",
-  "_release": "2.22.0",
+  "version": "2.22.1",
+  "_release": "2.22.1",
   "_resolution": {
     "type": "version",
-    "tag": "2.22.0",
-    "commit": "c8ab5f4c70f3ea1655bb36ef6af20976c940f65a"
+    "tag": "2.22.1",
+    "commit": "add004709742e81e578022ff6adafd372d25e107"
   },
   "_source": "https://github.com/johndyer/mediaelement.git",
   "_target": "2.*",

BIN
app/Resources/public/assets/mediaelement/build/flashmediaelement-cdn.swf


BIN
app/Resources/public/assets/mediaelement/build/flashmediaelement-debug.swf


BIN
app/Resources/public/assets/mediaelement/build/flashmediaelement.swf


+ 25 - 9
app/Resources/public/assets/mediaelement/build/mediaelement-and-player.js

@@ -2430,7 +2430,7 @@ if (typeof jQuery != 'undefined') {
 					.addClass(t.$media[0].className)
 					.insertBefore(t.$media)
 					.focus(function ( e ) {
-						if( !t.controlsAreVisible && !t.hasFocus ) {
+						if( !t.controlsAreVisible && !t.hasFocus && t.controlsEnabled) {
 							t.showControls(true);
 							// In versions older than IE11, the focus causes the playbar to be displayed
 							// if user clicks on the Play/Pause button in the control bar once it attempts
@@ -2732,6 +2732,10 @@ if (typeof jQuery != 'undefined') {
 								} else {
 									t.pause();
 								}
+
+								var button = t.$media.closest('.mejs-container').find('.mejs-overlay-button'),
+									pressed = button.attr('aria-pressed');
+								button.attr('aria-pressed', !pressed);
 							}
 						};
 
@@ -2878,7 +2882,10 @@ if (typeof jQuery != 'undefined') {
 						var $target = $(e.relatedTarget);
 						if (t.keyboardAction && $target.parents('.mejs-container').length === 0) {
 							t.keyboardAction = false;
-							t.hideControls(true);
+							if (t.isVideo && !t.options.alwaysShowControls) {
+								t.hideControls(true);
+							}
+
 						}
 					}
 				});
@@ -3247,7 +3254,7 @@ if (typeof jQuery != 'undefined') {
 			// this needs to come last so it's on top
 			bigPlay =
 				$('<div class="mejs-overlay mejs-layer mejs-overlay-play">'+
-					'<div class="mejs-overlay-button"></div>'+
+					'<div class="mejs-overlay-button" role="button" aria-label="' + mejs.i18n.t('Play') + '" aria-pressed="false"></div>'+
 				'</div>')
 				.appendTo(layers)
 				.bind('click', function() {	 // Removed 'touchstart' due issues on Samsung Android devices where a tap on bigPlay started and immediately stopped the video
@@ -3255,6 +3262,10 @@ if (typeof jQuery != 'undefined') {
 						if (media.paused) {
 							media.play();
 						}
+
+						var button = $(this).find('.mejs-overlay-button'),
+							pressed = button.attr('aria-pressed');
+						button.attr('aria-pressed', !!pressed);
 					}
 				});
 
@@ -3807,8 +3818,8 @@ if (typeof jQuery != 'undefined') {
 				var keyCode = e.keyCode,
 					duration = media.duration,
 					seekTime = media.currentTime,
-					seekForward  = player.options.defaultSeekForwardInterval(duration),
-					seekBackward = player.options.defaultSeekBackwardInterval(duration);
+					seekForward  = player.options.defaultSeekForwardInterval(media),
+					seekBackward = player.options.defaultSeekBackwardInterval(media);
 
 				switch (keyCode) {
 				case 37: // left
@@ -3988,7 +3999,10 @@ if (typeof jQuery != 'undefined') {
 			t.currenttime = t.controls.find('.mejs-currenttime');
 
 			media.addEventListener('timeupdate',function() {
-				player.updateCurrent();
+				if (t.controlsAreVisible) {
+					player.updateCurrent();
+				}
+
 			}, false);
 		},
 
@@ -4018,7 +4032,9 @@ if (typeof jQuery != 'undefined') {
 			t.durationD = t.controls.find('.mejs-duration');
 
 			media.addEventListener('timeupdate',function() {
-				player.updateDuration();
+				if (t.controlsAreVisible) {
+					player.updateDuration();
+				}
 			}, false);
 		},
 		
@@ -4646,8 +4662,8 @@ if (typeof jQuery != 'undefined') {
 
 			var t = this;
 
-			if (mejs.MediaFeatures.hasiOSFullScreen) {
-				t.media.webkitEnterFullscreen();
+			if (mejs.MediaFeatures.isiOS && mejs.MediaFeatures.hasiOSFullScreen && typeof t.media.webkitEnterFullscreen === 'function') {
+			    t.media.webkitEnterFullscreen();
 				return;
 			}
 

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
app/Resources/public/assets/mediaelement/build/mediaelement-and-player.min.js


+ 24 - 27
app/Resources/public/assets/mediaelement/build/mediaelementplayer.css

@@ -12,7 +12,7 @@
 .mejs-container {
 	position: relative;
 	background: #000;
-	font-family: Helvetica, Arial;
+	font-family: "Helvetica", Arial, serif;
 	text-align: left;
 	vertical-align: top;
 	text-indent: 0;
@@ -98,7 +98,6 @@
 .mejs-poster img {
 	border: 0;
 	padding: 0;
-	border: 0;
 }
 
 .mejs-overlay {
@@ -118,11 +117,11 @@
 	width: 100px;
 	height: 100px;
 	margin: -50px 0 0 -50px;
-	background: url(bigplay.svg) no-repeat;
+	background: url("bigplay.svg") no-repeat;
 }
 
 .no-svg .mejs-overlay-button {
-	background-image: url(bigplay.png);
+	background-image: url("bigplay.png");
 }
 
 .mejs-overlay:hover .mejs-overlay-button {
@@ -137,7 +136,7 @@
 	height: 80px;
 	margin: -40px 0 0 -40px;
 	background: #333;
-	background: url(background.png);
+	background: url("background.png");
 	background: rgba(0, 0, 0, 0.9);
 	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(50,50,50,0.9)), to(rgba(0,0,0,0.9)));
 	background: -webkit-linear-gradient(top, rgba(50,50,50,0.9), rgba(0,0,0,0.9));
@@ -151,7 +150,7 @@
 	display: block;
 	width: 80px;
 	height: 80px;
-	background: transparent url(loading.gif) 50% 50% no-repeat;
+	background: transparent url("loading.gif") 50% 50% no-repeat;
 }
 
 /* End: LAYERS */
@@ -164,7 +163,7 @@
 	padding: 0;
 	bottom: 0;
 	left: 0;
-	background: url(background.png);
+	background: url("background.png");
 	background: rgba(0, 0, 0, 0.7);
 	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(50,50,50,0.7)), to(rgba(0,0,0,0.7)));
 	background: -webkit-linear-gradient(top, rgba(50,50,50,0.7), rgba(0,0,0,0.7));
@@ -186,7 +185,7 @@
 	height: 26px;
 	font-size: 11px;
 	line-height: 11px;
-	font-family: Helvetica, Arial;
+	font-family: "Helvetica", Arial, serif;
 	border: 0;
 }
 
@@ -202,11 +201,11 @@
 	height: 16px;
 	width: 16px;
 	border: 0;
-	background: transparent url(controls.svg) no-repeat;
+	background: transparent url("controls.svg") no-repeat;
 }
 
 .no-svg .mejs-controls .mejs-button button {
-	background-image: url(controls.png);
+	background-image: url("controls.png");
 }
 
 	/* :focus for accessibility */
@@ -435,7 +434,7 @@
 	display: none;
 	height: 115px;
 	width: 25px;
-	background: url(background.png);
+	background: url("background.png");
 	background: rgba(50, 50, 50, 0.7);
 	-webkit-border-radius: 0;
 	-moz-border-radius: 0;
@@ -571,7 +570,7 @@
 	right: -51px;
 	width: 85px;
 	height: 100px;
-	background: url(background.png);
+	background: url("background.png");
 	background: rgba(50,50,50,0.7);
 	border: solid 1px transparent;
 	padding: 10px 10px 0 10px;
@@ -613,7 +612,7 @@
 	float: left;
 	padding: 4px 0 0 0;
 	line-height: 15px;
-	font-family: helvetica, arial;
+	font-family: "Helvetica", Arial, serif;
 	font-size: 10px;
 }
 
@@ -626,7 +625,7 @@
 	position: absolute;
 	top: 0;
 	left: 0;
-	-xborder-right: solid 1px #fff;
+	border-right: solid 1px #fff;
 	width: 10000px;
 	z-index: 1;
 }
@@ -725,7 +724,7 @@
 
 .mejs-captions-text {
 	padding: 3px 5px;
-	background: url(background.png);
+	background: url("background.png");
 	background: rgba(20, 20, 20, 0.5);
 	white-space: pre-wrap;
 }
@@ -795,7 +794,7 @@
 }
 
 .mejs-contextmenu .mejs-contextmenu-item {
-	font-family: Helvetica, Arial;
+	font-family: "Helvetica", Arial, serif;
 	font-size: 12px;
 	padding: 4px 6px;
 	cursor: pointer;
@@ -822,7 +821,7 @@
 	right: -10px;
 	width: 130px;
 	height: 100px;
-	background: url(background.png);
+	background: url("background.png");
 	background: rgba(50,50,50,0.7);
 	border: solid 1px transparent;
 	padding: 10px;
@@ -860,7 +859,7 @@
 	float: left;
 	padding: 4px 0 0 0;
 	line-height: 15px;
-	font-family: helvetica, arial;
+	font-family: "Helvetica", Arial, serif;
 	font-size: 10px;
 }
 /* End: Source Chooser */
@@ -872,7 +871,7 @@
 	left: 0;
 	width: 100%;
 	height: 100%;
-	background: url(background.png);
+	background: url("background.png");
 	background: rgba(50,50,50,0.7);
 	z-index: 1000;
 	overflow: hidden;
@@ -885,7 +884,7 @@
 	position: absolute;
 	right: 0;
 	top: 0;
-	background: url(background.png);
+	background: url("background.png");
 	background: rgba(50,50,50,0.7);
 	color: #fff;
 	padding: 4px;
@@ -916,7 +915,7 @@ div.mejs-speed-button {
 	left: -10px;
 	width: 60px;
 	height: 100px;
-	background: url(background.png);
+	background: url("background.png");
 	background: rgba(50, 50, 50, 0.7);
 	border: solid 1px transparent;
 	padding: 0;
@@ -964,8 +963,8 @@ div.mejs-speed-button {
 	float: left;
 	padding: 4px 0 0 0;
 	line-height: 15px;
-	font-family: helvetica, arial;
-	font-size: 11.5px;
+	font-family: "Helvetica", Arial, serif;
+	font-size: 11px;
 	color: white;
 	margin-left: 5px;
 	cursor: pointer;
@@ -980,8 +979,7 @@ div.mejs-speed-button {
 /* Start: Jump Forward */
 
 .mejs-controls .mejs-button.mejs-jump-forward-button {
-	background: transparent url(jumpforward.png) no-repeat;
-	background-position: 3px 3px;
+	background: transparent url("jumpforward.png") no-repeat 3px 3px;
 }
 .mejs-controls .mejs-button.mejs-jump-forward-button button {
 	background: transparent;
@@ -995,8 +993,7 @@ div.mejs-speed-button {
 /* Start: Skip Back */
 
 .mejs-controls .mejs-button.mejs-skip-back-button {
-	background: transparent url(skipback.png) no-repeat;
-	background-position: 3px 3px;
+	background: transparent url("skipback.png") no-repeat 3px 3px;
 }
 .mejs-controls .mejs-button.mejs-skip-back-button button {
 	background: transparent;

+ 25 - 9
app/Resources/public/assets/mediaelement/build/mediaelementplayer.js

@@ -363,7 +363,7 @@ if (typeof jQuery != 'undefined') {
 					.addClass(t.$media[0].className)
 					.insertBefore(t.$media)
 					.focus(function ( e ) {
-						if( !t.controlsAreVisible && !t.hasFocus ) {
+						if( !t.controlsAreVisible && !t.hasFocus && t.controlsEnabled) {
 							t.showControls(true);
 							// In versions older than IE11, the focus causes the playbar to be displayed
 							// if user clicks on the Play/Pause button in the control bar once it attempts
@@ -665,6 +665,10 @@ if (typeof jQuery != 'undefined') {
 								} else {
 									t.pause();
 								}
+
+								var button = t.$media.closest('.mejs-container').find('.mejs-overlay-button'),
+									pressed = button.attr('aria-pressed');
+								button.attr('aria-pressed', !pressed);
 							}
 						};
 
@@ -811,7 +815,10 @@ if (typeof jQuery != 'undefined') {
 						var $target = $(e.relatedTarget);
 						if (t.keyboardAction && $target.parents('.mejs-container').length === 0) {
 							t.keyboardAction = false;
-							t.hideControls(true);
+							if (t.isVideo && !t.options.alwaysShowControls) {
+								t.hideControls(true);
+							}
+
 						}
 					}
 				});
@@ -1180,7 +1187,7 @@ if (typeof jQuery != 'undefined') {
 			// this needs to come last so it's on top
 			bigPlay =
 				$('<div class="mejs-overlay mejs-layer mejs-overlay-play">'+
-					'<div class="mejs-overlay-button"></div>'+
+					'<div class="mejs-overlay-button" role="button" aria-label="' + mejs.i18n.t('Play') + '" aria-pressed="false"></div>'+
 				'</div>')
 				.appendTo(layers)
 				.bind('click', function() {	 // Removed 'touchstart' due issues on Samsung Android devices where a tap on bigPlay started and immediately stopped the video
@@ -1188,6 +1195,10 @@ if (typeof jQuery != 'undefined') {
 						if (media.paused) {
 							media.play();
 						}
+
+						var button = $(this).find('.mejs-overlay-button'),
+							pressed = button.attr('aria-pressed');
+						button.attr('aria-pressed', !!pressed);
 					}
 				});
 
@@ -1740,8 +1751,8 @@ if (typeof jQuery != 'undefined') {
 				var keyCode = e.keyCode,
 					duration = media.duration,
 					seekTime = media.currentTime,
-					seekForward  = player.options.defaultSeekForwardInterval(duration),
-					seekBackward = player.options.defaultSeekBackwardInterval(duration);
+					seekForward  = player.options.defaultSeekForwardInterval(media),
+					seekBackward = player.options.defaultSeekBackwardInterval(media);
 
 				switch (keyCode) {
 				case 37: // left
@@ -1921,7 +1932,10 @@ if (typeof jQuery != 'undefined') {
 			t.currenttime = t.controls.find('.mejs-currenttime');
 
 			media.addEventListener('timeupdate',function() {
-				player.updateCurrent();
+				if (t.controlsAreVisible) {
+					player.updateCurrent();
+				}
+
 			}, false);
 		},
 
@@ -1951,7 +1965,9 @@ if (typeof jQuery != 'undefined') {
 			t.durationD = t.controls.find('.mejs-duration');
 
 			media.addEventListener('timeupdate',function() {
-				player.updateDuration();
+				if (t.controlsAreVisible) {
+					player.updateDuration();
+				}
 			}, false);
 		},
 		
@@ -2579,8 +2595,8 @@ if (typeof jQuery != 'undefined') {
 
 			var t = this;
 
-			if (mejs.MediaFeatures.hasiOSFullScreen) {
-				t.media.webkitEnterFullscreen();
+			if (mejs.MediaFeatures.isiOS && mejs.MediaFeatures.hasiOSFullScreen && typeof t.media.webkitEnterFullscreen === 'function') {
+			    t.media.webkitEnterFullscreen();
 				return;
 			}
 

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
app/Resources/public/assets/mediaelement/build/mediaelementplayer.min.css


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
app/Resources/public/assets/mediaelement/build/mediaelementplayer.min.js


+ 12 - 1
app/Resources/public/assets/mediaelement/changelog.md

@@ -1,5 +1,16 @@
 ### Version History
 
+*2.22.1 (2016/08/18)*
+
+* Fix wrong parameter sent to defaultSeekForwardInterval and defaultSeekBackwardInterval options (https://github.com/johndyer/mediaelement/pull/1784) @marjune163
+* Fullscreen in Safari Mac must show player skin (https://github.com/johndyer/mediaelement/pull/1794) @ale-grosselle
+* Fix for aspect ratio when playing Hls Flash video if m3u8 does not have a resolution indicated (#1790) (https://github.com/johndyer/mediaelement/pull/1791) @ale-grosselle
+* Only focus the play button when the control bar is not hidden (https://github.com/johndyer/mediaelement/pull/1798) @schrolli
+* Avoid hiding audio controls when tabbing (#1668) (https://github.com/johndyer/mediaelement/pull/1804) @ron666
+* Stylesheet minor fixes (https://github.com/johndyer/mediaelement/pull/1808) @ron666
+* Time update on rail only when controls are visible (#1683) (https://github.com/johndyer/mediaelement/pull/1801) @ron666
+* ARIA attributes for big play button to continue improving player accessibility (https://github.com/johndyer/mediaelement/pull/1803) @ron666
+
 *2.22.0 (2016/07/17)*
 
 * Introduce new stretching models (stretching: 'fill','responsive') (https://github.com/johndyer/mediaelement/pull/1760) @ron666
@@ -858,4 +869,4 @@ Fixes and updates
 * thin line when controls are off
 * system-wide events
 * Ogg/Theora playback
-* Better alignment with native MediaElement (using shimichanga.com techniques)
+* Better alignment with native MediaElement (using shimichanga.com techniques)

+ 4 - 4
app/Resources/public/assets/pwstrength-bootstrap/.bower.json

@@ -1,6 +1,6 @@
 {
   "name": "pwstrength-bootstrap",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "homepage": "https://github.com/ablanco/jquery.pwstrength.bootstrap",
   "authors": [
     "Alejandro Blanco <alejandro.b.e@gmail.com>"
@@ -35,11 +35,11 @@
     "Gruntfile.js",
     "package.json"
   ],
-  "_release": "2.0.1",
+  "_release": "2.0.2",
   "_resolution": {
     "type": "version",
-    "tag": "2.0.1",
-    "commit": "b132030c05fc2d979590dd44b37a14deb1330745"
+    "tag": "2.0.2",
+    "commit": "cafffc55da15c4e9c2c7ee32fa39231c460ef718"
   },
   "_source": "https://github.com/ablanco/jquery.pwstrength.bootstrap.git",
   "_target": "*",

+ 11 - 1
app/Resources/public/assets/pwstrength-bootstrap/OPTIONS.md

@@ -56,6 +56,16 @@ Let's see the options of each section.
   This handler will also be called when the `change` or the `onpaste` events
   happen.
 
+* __onScore__:
+
+  Default: `undefined` (Function)
+
+  A callback function that will be called when the score is calculted by the
+  rules engine, allowing for a final modification before rendering the result.
+
+  The options, the word and the score will be passed as arguments, in that
+  order.
+
 * __zxcvbn__:
 
   Default: `false` (Boolean)
@@ -352,7 +362,7 @@ Let's see the options of each section.
 ```javascript
 var options = {};
 options.common = {
-    minChar: 8;
+    minChar: 8
 };
 options.rules = {
     activated: {

+ 13 - 1
app/Resources/public/assets/pwstrength-bootstrap/README.md

@@ -133,7 +133,7 @@ That would avoid looking for sequences in the password being tested.
 
 ## Callback Functions
 
-The plugin provides two callback functions, onLoad and onKeyUp.  You can use
+The plugin provides three callback functions, onLoad, onKeyUp, and scoreCalculated.  You can use
 them like this:
 
 ```javascript
@@ -145,6 +145,18 @@ $(document).ready(function () {
         },
         onKeyUp: function (evt, data) {
             $("#length-help-text").text("Current length: " + $(evt.target).val().length + " and score: " + data.score);
+        },
+        onScore: function (options, word, totalScoreCalculated) {
+            // If my word meets a specific scenario, I want the min score to
+            // be the level 1 score, for example.
+            if (word.length === 20 && totalScoreCalculated < options.ui.scores[1]) {
+                // Score doesn't meet the score[1]. So we will return the min
+                // numbers of points to get that score instead.
+                return options.ui.score[1]
+            }
+            // Fall back to the score that was calculated by the rules engine.
+            // Must pass back the score to set the total score variable.
+            return totalScoreCalculated;
         }
     };
     $(':password').pwstrength(options);

+ 1 - 1
app/Resources/public/assets/pwstrength-bootstrap/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "pwstrength-bootstrap",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "homepage": "https://github.com/ablanco/jquery.pwstrength.bootstrap",
   "authors": [
     "Alejandro Blanco <alejandro.b.e@gmail.com>"

+ 6 - 1
app/Resources/public/assets/pwstrength-bootstrap/dist/pwstrength-bootstrap.js

@@ -1,6 +1,6 @@
 /*!
 * jQuery Password Strength plugin for Twitter Bootstrap
-* Version: 2.0.1
+* Version: 2.0.2
 *
 * Copyright (c) 2008-2013 Tane Piper
 * Copyright (c) 2013 Alejandro Blanco
@@ -198,6 +198,10 @@ try {
             }
         });
 
+        if ($.isFunction(options.common.onScore)) {
+            totalScore = options.common.onScore(options, word, totalScore);
+        }
+
         return totalScore;
     };
 }(jQuery, rulesEngine));
@@ -223,6 +227,7 @@ defaultOptions.common.userInputs = [
 ];
 defaultOptions.common.onLoad = undefined;
 defaultOptions.common.onKeyUp = undefined;
+defaultOptions.common.onScore = undefined;
 defaultOptions.common.zxcvbn = false;
 defaultOptions.common.zxcvbnTerms = [
     // List of disrecommended words

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 1
app/Resources/public/assets/pwstrength-bootstrap/dist/pwstrength-bootstrap.min.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
app/Resources/public/assets/pwstrength-bootstrap/dist/pwstrength-bootstrap.min.map


+ 1 - 0
app/Resources/public/assets/pwstrength-bootstrap/src/options.js

@@ -19,6 +19,7 @@ defaultOptions.common.userInputs = [
 ];
 defaultOptions.common.onLoad = undefined;
 defaultOptions.common.onKeyUp = undefined;
+defaultOptions.common.onScore = undefined;
 defaultOptions.common.zxcvbn = false;
 defaultOptions.common.zxcvbnTerms = [
     // List of disrecommended words

+ 4 - 0
app/Resources/public/assets/pwstrength-bootstrap/src/rules.js

@@ -153,6 +153,10 @@ try {
             }
         });
 
+        if ($.isFunction(options.common.onScore)) {
+            totalScore = options.common.onScore(options, word, totalScore);
+        }
+
         return totalScore;
     };
 }(jQuery, rulesEngine));

+ 4 - 4
app/Resources/public/assets/webcamjs/.bower.json

@@ -1,6 +1,6 @@
 {
   "name": "webcamjs",
-  "version": "1.0.12",
+  "version": "1.0.15",
   "homepage": "https://github.com/jhuckaby/webcamjs",
   "authors": [
     "Joseph Huckaby <jhuckaby@gmail.com>"
@@ -21,11 +21,11 @@
     "demos",
     "flash"
   ],
-  "_release": "1.0.12",
+  "_release": "1.0.15",
   "_resolution": {
     "type": "version",
-    "tag": "v1.0.12",
-    "commit": "1d84cba577c025414cea79ca04412c9599f5b6e6"
+    "tag": "v1.0.15",
+    "commit": "15b3fedfc1bd5e6cb8b0ed4460ee0f56a8adbfa8"
   },
   "_source": "https://github.com/jhuckaby/webcamjs.git",
   "_target": "1.0.*",

+ 10 - 1
app/Resources/public/assets/webcamjs/README.md

@@ -104,13 +104,22 @@ If you want to override the default settings, just call `Webcam.set()` and pass
 | `crop_height` | (Disabled) | Height of the final cropped image in pixels, defaults to `dest_height`. |
 | `image_format` | jpeg | Desired image format of captured image, may be "jpeg" or "png". |
 | `jpeg_quality` | 90 | For JPEG images, this is the desired quality, from 0 (worst) to 100 (best). |
+| `enable_flash` | true | Enable or disable Flash fallback, if there is no native webcam access. |
 | `force_flash` | false | Setting this to true will always run in Adobe Flash fallback mode. |
 | `flip_horiz` | false | Setting this to true will flip the image horizontally (mirror mode). |
 | `fps` | 30 | Set the desired fps (frames per second) capture rate. |
 | `swfURL` | "./webcam.swf" | Set an alternate location for the Adobe Flash fallback SWF file
 | `flashNotDetectedText` | "ERROR: No Adobe Flash Player detected.  Webcam.js relies on Flash for browsers that do not support getUserMedia (like yours)." | text/html for flash player not detected.
 | `unfreeze_snap` | true | Whether to unfreeze the camera after snap (defaults to true)
-Here is an example of overriding some parameters.  Remember to call this *before* you attach the viewer.
+| `upload_name` | "webcam" | Which HTTP POST parameter name to use when uploading the webcam image file.
+
+Here is an example of overriding a single parameter.  Remember to call this *before* you attach the viewer.
+
+```js
+	Webcam.set('flip_horiz', true);
+```
+
+You can also set multiple parameters at once by passing in an object, like this:
 
 ```javascript
 	Webcam.set({

+ 1 - 1
app/Resources/public/assets/webcamjs/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "webcamjs",
-  "version": "1.0.12",
+  "version": "1.0.15",
   "homepage": "https://github.com/jhuckaby/webcamjs",
   "authors": [
     "Joseph Huckaby <jhuckaby@gmail.com>"

+ 1 - 1
app/Resources/public/assets/webcamjs/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "webcamjs",
-	"version": "1.0.12",
+	"version": "1.0.15",
 	"description": "HTML5 Webcam Image Capture Library with Flash Fallback",
 	"author": "Joseph Huckaby <jhuckaby@gmail.com>",
 	"homepage": "https://github.com/jhuckaby/webcamjs",

+ 9 - 4
app/Resources/public/assets/webcamjs/webcam.js

@@ -1,4 +1,4 @@
-// WebcamJS v1.0.12
+// WebcamJS v1.0.15
 // Webcam library for capturing JPEG/PNG images in JavaScript
 // Attempts getUserMedia, falls back to Flash
 // Author: Joseph Huckaby: http://github.com/jhuckaby
@@ -34,7 +34,7 @@ FlashError.prototype = new IntermediateInheritor();
 WebcamError.prototype = new IntermediateInheritor();
 
 var Webcam = {
-	version: '1.0.12',
+	version: '1.0.15',
 	
 	// globals
 	protocol: location.protocol.match(/https/i) ? 'https' : 'http',
@@ -49,6 +49,7 @@ var Webcam = {
 		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)
+		enable_flash: true,    // enable flash fallback,
 		force_flash: false,    // force flash mode,
 		flip_horiz: false,     // flip image horiz (mirror mode)
 		fps: 30,               // camera frames per second
@@ -56,6 +57,7 @@ var Webcam = {
 		constraints: null,     // custom user media constraints,
 		swfURL: '',            // URI to webcam.swf movie (defaults to the js location)
 		flashNotDetectedText: 'ERROR: No Adobe Flash Player detected.  Webcam.js relies on Flash for browsers that do not support getUserMedia (like yours).',
+		noInterfaceFoundText: 'No supported webcam interface found.',
 		unfreeze_snap: true    // Whether to unfreeze the camera after snap (defaults to true)
 	},
 
@@ -193,7 +195,7 @@ var Webcam = {
 			.catch( function(err) {
 				// JH 2016-07-31 Instead of dispatching error, now falling back to Flash if userMedia fails (thx @john2014)
 				// JH 2016-08-07 But only if flash is actually installed -- if not, dispatch error here and now.
-				if (self.detectFlash()) {
+				if (self.params.enable_flash && self.detectFlash()) {
 					setTimeout( function() { self.params.force_flash = 1; self.attach(elem); }, 1 );
 				}
 				else {
@@ -201,13 +203,16 @@ var Webcam = {
 				}
 			});
 		}
-		else {
+		else if (this.params.enable_flash && this.detectFlash()) {
 			// flash fallback
 			window.Webcam = Webcam; // needed for flash-to-js interface
 			var div = document.createElement('div');
 			div.innerHTML = this.getSWFHTML();
 			elem.appendChild( div );
 		}
+		else {
+			this.dispatch('error', new WebcamError( this.params.noInterfaceFoundText ));
+		}
 		
 		// setup final crop for live preview
 		if (this.params.crop_width && this.params.crop_height) {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 1
app/Resources/public/assets/webcamjs/webcam.min.js


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov