Skip to content

Commit 369b610

Browse files
taylorotwelltaylorotwell
committed
Merge remote-tracking branch 'origin/master'
2 parents d43a585 + 76e10d0 commit 369b610

File tree

6 files changed

+39
-27
lines changed

6 files changed

+39
-27
lines changed

‎public/assets/js/laravel.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10446,12 +10446,17 @@ $(function() {
1044610446
});
1044710447

1044810448
// It's nice to just write in Markdown, so this will adjust
10449-
// our blockquote style to fill in the icon flag and label
10450-
$('.docs blockquote p:first-child').each(function() {
10451-
str = $(this).html();
10452-
match = str.match(/\{(.*?)\}/),
10453-
icon = word = match[1];
10449+
// our blockquote style to fill in the icon flag and label
10450+
$('.docs blockquote p:first-child').each(function() {
10451+
var str = $(this).html();
10452+
var match = str.match(/\{(.*?)\}/);
10453+
10454+
if (match) {
10455+
var icon = match[1] || false;
10456+
var word = match[1] || false;
10457+
}
1045410458

10459+
if (icon) {
1045510460
switch (icon) {
1045610461
case "note":
1045710462
icon = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" version="1.1" x="0px" y="0px" width="90px" height="90px" viewBox="0 0 90 90" enable-background="new 0 0 90 90" xml:space="preserve"><path fill="#FFFFFF" d="M45 0C20.1 0 0 20.1 0 45s20.1 45 45 45 45-20.1 45-45S69.9 0 45 0zM45 74.5c-3.6 0-6.5-2.9-6.5-6.5s2.9-6.5 6.5-6.5 6.5 2.9 6.5 6.5S48.6 74.5 45 74.5zM52.1 23.9l-2.5 29.6c0 2.5-2.1 4.6-4.6 4.6 -2.5 0-4.6-2.1-4.6-4.6l-2.5-29.6c-0.1-0.4-0.1-0.7-0.1-1.1 0-4 3.2-7.2 7.2-7.2 4 0 7.2 3.2 7.2 7.2C52.2 23.1 52.2 23.5 52.1 23.9z"/></svg>';
@@ -10464,11 +10469,10 @@ $(function() {
1046410469
icon = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" version="1.1" x="0px" y="0px" width="68.9px" height="59.9px" viewBox="0 0 68.9 59.9" enable-background="new 0 0 68.9 59.9" xml:space="preserve"><path fill="#FFFFFF" d="M63.7 0H5.3C2.4 0 0 2.4 0 5.3v49.3c0 2.9 2.4 5.3 5.3 5.3h58.3c2.9 0 5.3-2.4 5.3-5.3V5.3C69 2.4 66.6 0 63.7 0zM5.3 4h58.3c0.7 0 1.3 0.6 1.3 1.3V48H4V5.3C4 4.6 4.6 4 5.3 4zM13 52v4h-2v-4H13zM17 52h2v4h-2V52zM23 52h2v4h-2V52zM29 52h2v4h-2V52zM35 52h2v4h-2V52zM41 52h2v4h-2V52zM4 54.7V52h3v4H5.3C4.6 56 4 55.4 4 54.7zM63.7 56H47v-4h18v2.7C65 55.4 64.4 56 63.7 56zM26 38.7c0.3 0.2 0.7 0.3 1 0.3 0.4 0 0.7-0.1 1-0.3l17-10c0.6-0.4 1-1 1-1.7s-0.4-1.4-1-1.7l-17-10c-0.6-0.4-1.4-0.4-2 0s-1 1-1 1.7v20C25 37.7 25.4 38.4 26 38.7zM29 20.5L40.1 27 29 33.5V20.5z"/></svg>';
1046510470
break;
1046610471
}
10467-
1046810472
$(this).html(str.replace(/\{(.*?)\}/, '<div class="flag"><span class="svg">'+ icon +'</span></div>'));
1046910473
$(this).parent().addClass('has-icon ' + word);
10470-
10471-
});
10474+
}
10475+
});
1047210476

1047310477
Mousetrap.bind('/', function(e) {
1047410478
$('#search-input').focus();

‎public/assets/js/laravel.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/build/assets/js/laravel-467ca06a.js renamed to ‎public/build/assets/js/laravel-02364550.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10446,12 +10446,17 @@ $(function() {
1044610446
});
1044710447

1044810448
// It's nice to just write in Markdown, so this will adjust
10449-
// our blockquote style to fill in the icon flag and label
10450-
$('.docs blockquote p:first-child').each(function() {
10451-
str = $(this).html();
10452-
match = str.match(/\{(.*?)\}/),
10453-
icon = word = match[1];
10449+
// our blockquote style to fill in the icon flag and label
10450+
$('.docs blockquote p:first-child').each(function() {
10451+
var str = $(this).html();
10452+
var match = str.match(/\{(.*?)\}/);
10453+
10454+
if (match) {
10455+
var icon = match[1] || false;
10456+
var word = match[1] || false;
10457+
}
1045410458

10459+
if (icon) {
1045510460
switch (icon) {
1045610461
case "note":
1045710462
icon = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" version="1.1" x="0px" y="0px" width="90px" height="90px" viewBox="0 0 90 90" enable-background="new 0 0 90 90" xml:space="preserve"><path fill="#FFFFFF" d="M45 0C20.1 0 0 20.1 0 45s20.1 45 45 45 45-20.1 45-45S69.9 0 45 0zM45 74.5c-3.6 0-6.5-2.9-6.5-6.5s2.9-6.5 6.5-6.5 6.5 2.9 6.5 6.5S48.6 74.5 45 74.5zM52.1 23.9l-2.5 29.6c0 2.5-2.1 4.6-4.6 4.6 -2.5 0-4.6-2.1-4.6-4.6l-2.5-29.6c-0.1-0.4-0.1-0.7-0.1-1.1 0-4 3.2-7.2 7.2-7.2 4 0 7.2 3.2 7.2 7.2C52.2 23.1 52.2 23.5 52.1 23.9z"/></svg>';
@@ -10464,11 +10469,10 @@ $(function() {
1046410469
icon = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" version="1.1" x="0px" y="0px" width="68.9px" height="59.9px" viewBox="0 0 68.9 59.9" enable-background="new 0 0 68.9 59.9" xml:space="preserve"><path fill="#FFFFFF" d="M63.7 0H5.3C2.4 0 0 2.4 0 5.3v49.3c0 2.9 2.4 5.3 5.3 5.3h58.3c2.9 0 5.3-2.4 5.3-5.3V5.3C69 2.4 66.6 0 63.7 0zM5.3 4h58.3c0.7 0 1.3 0.6 1.3 1.3V48H4V5.3C4 4.6 4.6 4 5.3 4zM13 52v4h-2v-4H13zM17 52h2v4h-2V52zM23 52h2v4h-2V52zM29 52h2v4h-2V52zM35 52h2v4h-2V52zM41 52h2v4h-2V52zM4 54.7V52h3v4H5.3C4.6 56 4 55.4 4 54.7zM63.7 56H47v-4h18v2.7C65 55.4 64.4 56 63.7 56zM26 38.7c0.3 0.2 0.7 0.3 1 0.3 0.4 0 0.7-0.1 1-0.3l17-10c0.6-0.4 1-1 1-1.7s-0.4-1.4-1-1.7l-17-10c-0.6-0.4-1.4-0.4-2 0s-1 1-1 1.7v20C25 37.7 25.4 38.4 26 38.7zM29 20.5L40.1 27 29 33.5V20.5z"/></svg>';
1046510470
break;
1046610471
}
10467-
1046810472
$(this).html(str.replace(/\{(.*?)\}/, '<div class="flag"><span class="svg">'+ icon +'</span></div>'));
1046910473
$(this).parent().addClass('has-icon ' + word);
10470-
10471-
});
10474+
}
10475+
});
1047210476

1047310477
Mousetrap.bind('/', function(e) {
1047410478
$('#search-input').focus();

‎public/build/assets/js/laravel.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/build/rev-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"assets/css/laravel.css": "assets/css/laravel-610f9586.css",
3-
"assets/js/laravel.js": "assets/js/laravel-467ca06a.js"
3+
"assets/js/laravel.js": "assets/js/laravel-02364550.js"
44
}

‎resources/assets/js/laravel.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,17 @@ $(function() {
4242
});
4343

4444
// It's nice to just write in Markdown, so this will adjust
45-
// our blockquote style to fill in the icon flag and label
46-
$('.docs blockquote p:first-child').each(function() {
47-
str = $(this).html();
48-
match = str.match(/\{(.*?)\}/),
49-
icon = word = match[1];
45+
// our blockquote style to fill in the icon flag and label
46+
$('.docs blockquote p:first-child').each(function() {
47+
var str = $(this).html();
48+
var match = str.match(/\{(.*?)\}/);
49+
50+
if (match) {
51+
var icon = match[1] || false;
52+
var word = match[1] || false;
53+
}
5054

55+
if (icon) {
5156
switch (icon) {
5257
case "note":
5358
icon = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" version="1.1" x="0px" y="0px" width="90px" height="90px" viewBox="0 0 90 90" enable-background="new 0 0 90 90" xml:space="preserve"><path fill="#FFFFFF" d="M45 0C20.1 0 0 20.1 0 45s20.1 45 45 45 45-20.1 45-45S69.9 0 45 0zM45 74.5c-3.6 0-6.5-2.9-6.5-6.5s2.9-6.5 6.5-6.5 6.5 2.9 6.5 6.5S48.6 74.5 45 74.5zM52.1 23.9l-2.5 29.6c0 2.5-2.1 4.6-4.6 4.6 -2.5 0-4.6-2.1-4.6-4.6l-2.5-29.6c-0.1-0.4-0.1-0.7-0.1-1.1 0-4 3.2-7.2 7.2-7.2 4 0 7.2 3.2 7.2 7.2C52.2 23.1 52.2 23.5 52.1 23.9z"/></svg>';
@@ -60,11 +65,10 @@ $(function() {
6065
icon = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" version="1.1" x="0px" y="0px" width="68.9px" height="59.9px" viewBox="0 0 68.9 59.9" enable-background="new 0 0 68.9 59.9" xml:space="preserve"><path fill="#FFFFFF" d="M63.7 0H5.3C2.4 0 0 2.4 0 5.3v49.3c0 2.9 2.4 5.3 5.3 5.3h58.3c2.9 0 5.3-2.4 5.3-5.3V5.3C69 2.4 66.6 0 63.7 0zM5.3 4h58.3c0.7 0 1.3 0.6 1.3 1.3V48H4V5.3C4 4.6 4.6 4 5.3 4zM13 52v4h-2v-4H13zM17 52h2v4h-2V52zM23 52h2v4h-2V52zM29 52h2v4h-2V52zM35 52h2v4h-2V52zM41 52h2v4h-2V52zM4 54.7V52h3v4H5.3C4.6 56 4 55.4 4 54.7zM63.7 56H47v-4h18v2.7C65 55.4 64.4 56 63.7 56zM26 38.7c0.3 0.2 0.7 0.3 1 0.3 0.4 0 0.7-0.1 1-0.3l17-10c0.6-0.4 1-1 1-1.7s-0.4-1.4-1-1.7l-17-10c-0.6-0.4-1.4-0.4-2 0s-1 1-1 1.7v20C25 37.7 25.4 38.4 26 38.7zM29 20.5L40.1 27 29 33.5V20.5z"/></svg>';
6166
break;
6267
}
63-
6468
$(this).html(str.replace(/\{(.*?)\}/, '<div class="flag"><span class="svg">'+ icon +'</span></div>'));
6569
$(this).parent().addClass('has-icon ' + word);
66-
67-
});
70+
}
71+
});
6872

6973
Mousetrap.bind('/', function(e) {
7074
$('#search-input').focus();

0 commit comments

Comments
 (0)