History

Merge pull request #1052 from gengjiawen/patch-2

bump vue to 2.6.10

Jasper van Merle committed 7 years ago

Commit 3b175c72 parents b15f8c6 6002d6a4 files · +30 −6Browse files

Unified · Split

4 files
  1. assets/javascripts/templates/pages/about_tmpl.coffee +2 −2
  2. lib/docs/filters/vue/clean_html.rb +9 −0
  3. lib/docs/filters/vue/entries.rb +17 −2
  4. lib/docs/scrapers/vue.rb +2 −2
assets/javascripts/templates/pages/about_tmpl.coffee+2−2
@@ -758,9 +758,9 @@ credits = [ · 757 unmodified lines
758758 'https://raw.githubusercontent.com/vuejs/vue-router/dev/LICENSE'
759759 ], [
760760 'Vue.js',
761− '2013-2018 Evan You, Vue.js contributors',
761+ '2013-present Yuxi Evan You',
762762 'MIT',
763− 'https://raw.githubusercontent.com/vuejs/vue/master/LICENSE'
763+ 'https://raw.githubusercontent.com/vuejs/vuejs.org/master/LICENSE'
764764 ], [
765765 'Vuex',
766766 '2015-present Evan You',
lib/docs/filters/vue/clean_html.rb+9−0
@@ -16,10 +16,19 @@ module Docs · 15 unmodified lines
1616 node['data-language'] = node['class'][/highlight (\w+)/, 1]
1717 end
1818
19+ css('pre').each do |node|
20+ node.content = node.content.strip
21+ node['data-language'] = 'javascript'
22+ end
23+
1924 css('iframe').each do |node|
2025 node['sandbox'] = 'allow-forms allow-scripts allow-same-origin'
2126 end
2227
28+ css('details').each do |node|
29+ node.name = 'div'
30+ end
31+
2332 doc
2433 end
2534 end
lib/docs/filters/vue/entries.rb+17−2
@@ -2,11 +2,16 @@ module Docs · 1 unmodified line
22 class Vue
33 class EntriesFilter < Docs::EntriesFilter
44 def get_name
5− if slug == 'api/'
5+ if slug == 'api/' || slug == 'api/index'
66 'API'
7+ elsif slug == 'style-guide/'
8+ 'Style Guide'
79 else
810 name = at_css('.content h1').content
911 node = at_css(".sidebar .menu-root a[href='#{File.basename(slug)}']")
12+
13+ return name if node.nil?
14+
1015 index = node.parent.parent.css('> li > a').to_a.index(node)
1116 name.prepend "#{index + 1}. " if index
1217 name
@@ -16,6 +21,8 @@ module Docs · 3 unmodified lines
1621 def get_type
1722 if slug.start_with?('guide')
1823 'Guide'
24+ elsif slug == 'style-guide/'
25+ 'Style Guide'
1926 else
2027 'API'
2128 end
@@ -31,7 +38,15 @@ module Docs · 9 unmodified lines
3138 else
3239 name = node.content.strip
3340 name.sub! %r{\(.*\)}, '()'
34− entries << [name, node['id'], "API: #{type}"]
41+ name.sub! /(essential|strongly recommended|recommended|use with caution)\Z/, ''
42+
43+ current_type = "API: #{type}"
44+ if slug == 'style-guide/'
45+ current_type = "Style Guide: "
46+ current_type += type.sub(/( Rules: )/, ': ').split('(')[0]
47+ end
48+
49+ entries << [name, node['id'], current_type]
3550 end
3651 end
3752 end
lib/docs/scrapers/vue.rb+2−2
@@ -15,12 +15,12 @@ module Docs · 14 unmodified lines
1515 options[:replace_paths] = { 'guide/' => 'guide/index.html' }
1616
1717 options[:attribution] = <<-HTML
18− &copy; 2013&ndash;2018 Evan You, Vue.js contributors<br>
18+ &copy; 2013&ndash;present Yuxi Evan You<br>
1919 Licensed under the MIT License.
2020 HTML
2121
2222 version '2' do
23− self.release = '2.5.16'
23+ self.release = '2.6.10'
2424 self.base_url = 'https://vuejs.org/v2/'
2525 self.root_path = 'guide/index.html'
2626 self.initial_paths = %w(api/)