merge from dev

2016-01-12 14:55:45 -05:00
parent 9e1a2cf66a
commit 189942e289
298 changed files with 53049 additions and 5413 deletions
@@ -0,0 +1,18 @@
+<!doctype html>
+<html>
+	<script src="../../jquery.js"></script>
+	<script>
+		var called = false,
+			error = false;
+
+		window.onerror = function() { error = true; };
+
+		jQuery( window ).on( "beforeunload", function( event ) {
+			called = true;
+			return "maybe";
+		}).on( "load", function( event ) {
+			$( window ).triggerHandler( "beforeunload" );
+			window.parent.iframeCallback( called && !error );
+		});
+	</script>
+</html>