Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

8 years ago · 02cc9c8344
parent e040c00557 89bee8cf6b
commit 02cc9c8344
2 changed files with 31 additions and 0 deletions
--- a/www/assert/media/index.html
+++ b/www/assert/media/index.html
@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <script data-main="main" src="/bower_components/requirejs/require.js"></script>
+    <style>
+        media {
+            border: 1px solid black;
+            height: 100px;
+            width: 100px;
+            display: block;
+            background-color: red;
+        }
+    </style>
+</head>
+<body>
+<media> my media thing </media>
+<br />
+<a href="https://www.w3schools.com/html/html5_new_elements.asp">valid elements</a>
+
+
--- a/www/assert/media/main.js
+++ b/www/assert/media/main.js
@ -0,0 +1,9 @@
+define([
+    '/bower_components/jquery/dist/jquery.min.js',
+], function () {
+    var $ = window.jQuery;
+
+    $('media').each(function () {
+        window.alert("media tag selection works!");
+    });
+});