Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable eslint cache, added all folders to HTML linting, supress eslint warning for 3rd party libs #900

Merged
merged 2 commits into from
May 16, 2017
Merged

Enable eslint cache, added all folders to HTML linting, supress eslint warning for 3rd party libs #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ff0a05
Enable eslint cache, added all folders to HTML linting, supressed esl…
KaptenJansson May 16, 2017
75ab399
Merge branch 'gh-pages' into fixLintWarnings
KaptenJansson May 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ module.exports = function(grunt) {
options: {
csslintrc: '.csslintrc'
},
src: ['src/content/**/*.css']
src: ['src/content/**/*.css', '!**/third_party/*.css' ]
},
eslint: {
options: {
configFile: '.eslintrc'
configFile: '.eslintrc',
cache: true
},
target: ['src/content/**/*.js', 'test/*.js']
target: ['src/content/**/*.js', 'test/*.js', '!**/third_party/*.js' ]
},
githooks: {
all: {
Expand All @@ -27,9 +28,8 @@ module.exports = function(grunt) {
htmlhint: {
html1: {
src: [
'src/content/datachannel/**/index.html',
'src/content/getusermedia/**/index.html',
'src/content/peerconnection/**/index.html'
'src/content/**/*.html',
'!**/third_party/*.html'
]
}
},
Expand Down
6 changes: 3 additions & 3 deletions src/content/capture/video-contenthint/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@
<h1><a href="//webrtc.github.io/samples/" title="WebRTC samples homepage">WebRTC samples</a> <span>Guiding video encoding with content hints</span></h1>

<div id="videos">
<div class='video-container'>
<div class="video-container">
<h2>Source video file (high bitrate)</h2>
<video id="srcVideo" controls muted loop>
<source src="../../../video/mixed-content.webm" type="video/webm" />
<p>This browser does not support the video element.</p>
</video>
</div>
<div class='video-container'>
<div class="video-container">
<h2>"motion" video @ 50kbps</h2>
<video id="motionVideo" autoplay muted></video>
</div>
<div class='video-container'>
<div class="video-container">
<h2>"detail" video @ 50kbps</h2>
<video id="detailVideo" autoplay muted></video>
</div>
Expand Down
16 changes: 8 additions & 8 deletions src/content/devices/multi/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,19 @@ <h2>Local media files:</h2>

</div>

<p>This demo must be run from localhost or over HTTPS 45.0.2441.x or later.<p>
<p>This demo must be run from localhost or over HTTPS 45.0.2441.x or later.</p>
<p><strong>Enable experimental Web Platform features</strong> must be enabled from the chrome://flags page or run Chrome with the following flag:</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;<code>--enable-blink-features=EnumerateDevices,AudioOutputDevices</code></p>
<p>More information about running Chrome with flags is available from <a href="https://www.chromium.org/developers/how-tos/run-chromium-with-flags" title="The Chromium Projects: Run Chromium with flags">The Chromium Projects</a>.</p>

<a href="https://github.com/webrtc/samples/tree/gh-pages/src/content/devices/multi" title="View source for this page on GitHub" id="viewSource">View source on GitHub</a>
</div>
</div>

<script src="https://webrtc.github.io/adapter/adapter-latest.js"></script>
<script src="../../../js/common.js"></script>
<script src="js/main.js"></script>
<script src="https://webrtc.github.io/adapter/adapter-latest.js"></script>
<script src="../../../js/common.js"></script>
<script src="js/main.js"></script>

<script src="../../../js/lib/ga.js"></script>
<script src="../../../js/lib/ga.js"></script>

</body>
</html>
</body>
</html>
8 changes: 8 additions & 0 deletions src/content/extensions/multipleroutes/src/background.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
<!doctype html>
<!--
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree.
-->
<script src="utils.js"></script>
<script src="eventPage.js"></script>
12 changes: 12 additions & 0 deletions src/content/extensions/multipleroutes/src/options.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,47 @@
<!doctype html>
<!--
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree.
-->
<html>
<body>
<p id="Mode0">
<input type="radio" name="ip_policy_selection" id="default" value="default">
<label for="default">
<span i18n-content="netli_default_radio"></span>
</label>
</p>
<p id="Mode1">
<input type="radio" name="ip_policy_selection"
id="default_public_and_private_interfaces"
value="default_public_and_private_interfaces">
<label for="default_public_and_private_interfaces">
<span i18n-content="netli_default_public_and_private_interfaces_radio"></span>
</label>
</p>
<p id="Mode2">
<input type="radio" name="ip_policy_selection"
id="default_public_interface_only"
value="default_public_interface_only">
<label for="default_public_interface_only">
<span i18n-content="netli_default_public_interface_only_radio"></span>
</label>
</p>
<p id="Mode3">
<input type="radio" name="ip_policy_selection"
id="disable_non_proxied_udp" value="disable_non_proxied_udp">
<label for="disable_non_proxied_udp" id="for_disable_non_proxied_udp">
<span i18n-content="netli_disable_non_proxied_udp_radio"></span>
</label>
</p>
<p>
<label id="not_supported">
<span i18n-content="netli_option_not_supported"></span>
</label>
</p>
<script src="utils.js"></script>
<script src="options.js"></script>
</body>
Expand Down