Commit Graph

1067 Commits

Author SHA1 Message Date
Pooya Parsa
ad4aea3546
typo: e -> err 2017-11-11 01:21:10 +03:30
Pooya Parsa
a23fb18399
fix: always add commonChunksPlugin 2017-11-11 01:16:37 +03:30
Sébastien Chopin
0198a184b8
Merge pull request #2070 from clarkdo/nuxtserverinit_error
refactor: log nuxtServerInit error for better error tracing
2017-11-10 08:31:29 +01:00
Clark Du
6b6aa3e392
refactor: log nuxtServerInit error for better error tracing 2017-11-10 14:04:43 +08:00
Atinux
932fbfddfd minor: Call routeChanged event with a 3rd argument if an error happened 2017-11-07 16:26:19 +01:00
Pooya Parsa
711e6a916e fix: add deprecated warn for tapables + simple backward compatibility 2017-11-07 17:18:46 +03:30
Pooya Parsa
e5017c5e2a perf: better vendor chunk
Also disables commons chunk plugin on dev environments for faster builds
2017-11-07 15:35:41 +03:30
Atinux
312ce81a6e fix: Remove console.log 2017-11-07 11:51:46 +01:00
Atinux
6dfe660412 fix: Implement TimeFixPlugin by @egoist to avoid webpack rebuilds 2017-11-07 11:47:55 +01:00
Pooya Parsa
1eee113d6d chore(builder): better naming for plugin generated aliases
Help developers tracing exact source of warns/errors
2017-11-07 13:32:10 +03:30
Pooya Parsa
80fb65040b fix(builder): add hash to generated plugin names
A plugin named `bootstrap` results importing bootstrap jquery!
2017-11-07 13:17:50 +03:30
Pooya Parsa
f626acf1f9 refactor: simplify internal compilers 2017-11-07 13:16:29 +03:30
Clark Du
3ccc57502b
fix: basic.csr /head error 2017-11-07 12:04:21 +08:00
Atinux
f5fa44d8aa debug: Show PostCSS config only when used 2017-11-06 18:30:50 +01:00
Atinux
3d49d8d290 feat: Add Page.watchQuery 2017-11-06 18:30:37 +01:00
Atinux
fb44c2eb8e fix: Fix Layouts transitions 2017-11-06 18:30:15 +01:00
Atinux
e80a77782a update: Use path by default or Page.key 2017-11-06 18:29:45 +01:00
Atinux
07eab4c643 feat: Handle body scripts from vue-meta 2017-11-06 13:33:19 +01:00
Gomah
59ad478037 Add subFolders option for generate 2017-11-06 18:36:28 +11:00
Atinux
e97bb1d099 fix: Handle middleware fn in nuxt.config.js 2017-11-03 17:24:20 +01:00
Atinux
23919a9e01 feat: Add middleware as function 2017-11-03 17:14:05 +01:00
Atinux
c17cb24aaa fix: generate.minify.collapseWhitespace is false by default 2017-11-03 16:00:09 +01:00
Atinux
aa342330d7 fix: Fix PostCSS plugin resolution when used in nuxt.config.js 2017-11-03 12:32:57 +01:00
Atinux
ac3b3f27a7 debug: Show what PostCSS configuration is used 2017-11-03 12:32:57 +01:00
Atinux
42073db289 fix: Remove useless console.log 2017-11-03 12:32:57 +01:00
Sébastien Chopin
241e43504a
Merge pull request #2016 from clarkdo/video_fix
fix: video can not be loaded
2017-11-03 07:39:27 +01:00
Clark Du
04a2ffb016
fix: video can not be loaded 2017-11-03 10:36:01 +08:00
Atinux
a2cc3afe60 fix: Dont call pages asyncData/fetch if middleware redirected or errored 2017-11-02 17:47:33 +01:00
Sébastien Chopin
6e44afedb8 router: Don't call middleware and asyncData on query changes 2017-11-01 16:44:57 +01:00
Atinux
8318ce7510 fix: loadResources after every build 2017-10-31 18:33:25 +01:00
Atinux
76aca28cdc fix: Fix context undefined 2017-10-31 18:32:42 +01:00
Sébastien Chopin
e15c92f1c8
Merge pull request #1914 from dotneet/fix-1408
fix unexpected state resetting #1408
2017-10-31 15:05:22 +01:00
Atinux
8e9f17c491 hooks: Await for modules:before hook 2017-10-31 12:45:32 +01:00
Atinux
7137f848a2 hooks: Handle hooks as object 2017-10-31 12:33:15 +01:00
Sébastien Chopin
daaa5bdd12 hook: Handle hook error and continue process 2017-10-30 23:15:35 +01:00
Sébastien Chopin
ad59f788dc hook: Add render:route hook 2017-10-30 23:15:06 +01:00
Sébastien Chopin
fe0ad908b7 hook: Add generate:page hook 2017-10-30 23:14:21 +01:00
Sébastien Chopin
2e8271f658 lint: Lint file 2017-10-30 22:39:26 +01:00
Sébastien Chopin
94ad5955e6 Hooks ready to be tested 2017-10-30 22:39:08 +01:00
Atinux
f72e620d7d fix: Remove console.log 2017-10-30 18:44:39 +01:00
Atinux
6648695015 refacto: Hooks 2017-10-30 18:41:22 +01:00
Atinux
83815de91b lint: Update linting rule on space-before-paren 2017-10-30 17:51:11 +01:00
Atinux
379d4f72d4 refacto: Refacto nuxt.build() to finish after webpack is done 2017-10-30 15:46:06 +01:00
devneko
4b5a0352ff fix: Fix regression bug related to setContext() 2017-10-30 20:05:12 +09:00
Clark Du
327fabb663
fix: originalPositionFor return null when using babel-loader 2017-10-30 12:15:25 +08:00
devneko
f186cadba6 fix unexpected state reset #1408 2017-10-29 11:02:48 +09:00
devneko
65d645d54c fix regression in dev mode 2017-10-29 10:42:38 +09:00
Sébastien Chopin
bf72a35634 fix: Sanitize head to use titleTemplate as function 2017-10-28 23:36:14 +02:00
Sébastien Chopin
e02e8df224 fix: Fix tests in generate mode with redirect 2017-10-28 22:42:51 +02:00
Sébastien Chopin
41b775a365 patch: Use last version of UglifyES and add IE9 preset 2017-10-28 18:12:21 +02:00
Sébastien Chopin
023f000e24 fix: Give back payload for generate 2017-10-28 18:10:36 +02:00
Sébastien Chopin
262bffc35d minor: Add ENV into app.html template 2017-10-28 16:10:01 +02:00
Sébastien Chopin
3b9f293e40 fix: Fix Hot reloading 2017-10-28 14:09:33 +02:00
Sébastien Chopin
0781814045 lint: Fix lint issue 2017-10-28 11:01:41 +02:00
Sébastien Chopin
b3a1844f6f Merge branch 'dev' into refacto-app 2017-10-28 10:21:47 +02:00
Atinux
8a2adbeee4 patch: Fix typo in warning 2017-10-27 12:17:35 +02:00
John Fischer
5d3156c0c7 Catch cryptic error when a plugin is not found 2017-10-27 13:19:42 +03:30
Clark Du
f5acb6fc0e fix: syntax error in generator.js 2017-10-25 15:35:33 +03:30
Pooya Parsa
5384ee1a5c ctx => app.context 2017-10-25 01:08:31 +03:30
Pooya Parsa
aefa9f8c31 context => appContext 2017-10-25 00:49:14 +03:30
pimlie
72529c69da dont assume /index.html exists 2017-10-23 23:43:59 +02:00
Sebastien Chopin
e3974b4729 deprecation: Deprecate isServer, isClient and dev 2017-10-20 12:05:22 +02:00
Sebastien Chopin
d1ed762c1b Merge branch 'dev' into refacto-app 2017-10-20 10:53:18 +02:00
Sebastien Chopin
7afa5e4c13 Fix serverMiddleware as express app without path 2017-10-20 10:52:07 +02:00
Sébastien Chopin
83c25084f1 Refacto client app 2017-10-20 10:52:07 +02:00
Sébastien Chopin
5b09b92286 Refactor to use only one context and add route.meta 2017-10-20 10:52:07 +02:00
Sébastien Chopin
dd7d8bbafc dev: Improve template debugging in development 2017-10-20 10:52:07 +02:00
Antério Vieira
a66220b58c style(app): spaces removed (#1898) 2017-10-20 11:01:56 +03:30
Sébastien Chopin
733168fdac Merge pull request #1865 from FieryCod/dev
Adds support for folders in /layouts
2017-10-16 14:45:52 +02:00
Clark Du
f8bc7e2383
refactor: renderToString now returns a Promise if no callback is passed 2017-10-16 11:29:09 +08:00
FieryCod
0b46b06c7c Adds support for folders in /layouts 2017-10-15 21:31:01 +02:00
Zhang Chengrong
cf693d04a3 Fix auto load postcss.config.js problem 2017-10-13 11:48:36 +03:30
Pooya Parsa
b6f2405e7e nuxt-child styling 2017-10-07 18:29:36 +03:30
Pooya Parsa
991d5f70ea fix: add __nuxt id 2017-10-07 13:19:30 +03:30
Pooya Parsa
e4af41f529 rewrite nuxt.vue with render function 2017-10-07 13:17:31 +03:30
Pooya Parsa
870cbd6278 rewrite App.vue with render function 2017-10-07 13:13:09 +03:30
Pooya Parsa
f6d09642d7 fix renderAndGetWindow for SPA mode 2017-10-07 12:36:34 +03:30
outofcash
2816c5687d Support for .coffee files for store and middlewares 2017-10-04 23:53:12 +02:00
Sebastien Chopin
9e4f864e4d Fix issue #1629 2017-09-22 16:05:59 +02:00
Mouti'a Benachour
3c7273c5b0 fix error handler if error message is readonly (#1673) 2017-09-17 22:53:17 +04:30
Sebastien Chopin
53dc522849 add: store. & this. 2017-09-14 18:25:34 +02:00
Sébastien Chopin
dcf35933c0 Merge pull request #1620 from homerjam/layout-transitions
add layout transitions
2017-09-12 13:36:52 +02:00
Pooya Parsa
e289edc67e fix: show server errors in console 2017-09-12 02:57:51 +04:30
Pooya Parsa
19a943d44c fix: increase webpack dev timeouts 2017-09-12 01:05:09 +04:30
Pooya Parsa
b41fcbc789 feat: open in editor 2017-09-10 00:52:07 +04:30
James Homer
2bf02731f2 fix page transitions 2017-09-09 12:19:52 +01:00
James Homer
e937937ea1 add layout transitions 2017-09-09 12:19:52 +01:00
Clark Du
afc756f694 move up error print becuse it never be called
Signed-off-by: Clark Du <clark.duxin@gmail.com>
2017-09-08 12:15:29 +08:00
Clark Du
eae828ccc6 remove condition due to 'this.options.dev' is always false
Signed-off-by: Clark Du <clark.duxin@gmail.com>
2017-09-08 12:10:57 +08:00
Sebastien Chopin
03348c85cd hotfix: applyAsyncData only if data is set 2017-09-07 14:44:13 +02:00
Pooya Parsa
9b8d3f11e7 fix: Handle 404 errors in SPA 2017-09-07 17:06:56 +04:30
Pooya Parsa
4d5255e805 fix NUXT.data for SPA 2017-09-07 17:06:45 +04:30
Sebastien Chopin
9a28b8be25 Fix tests 2017-09-07 14:17:53 +02:00
Sebastien Chopin
b114717701 Force preserveWhitespace to false to avoid SSR mismatch 2017-09-07 14:09:28 +02:00
Sebastien Chopin
32d3045884 Preserve whitespace 2017-09-07 13:51:11 +02:00
Sebastien Chopin
4683dc9254 Merge branch 'dev' of github.com:nuxt/nuxt.js into dev 2017-09-07 13:40:14 +02:00
Sebastien Chopin
74bc12da51 fix: Handle synchronous route component 2017-09-07 13:40:10 +02:00
Sébastien Chopin
45b6c9320b Merge pull request #1600 from whtsky/serverState
rename `context.serverState` to `context.nuxtState`
2017-09-07 13:39:03 +02:00
Sébastien Chopin
a5cf2c3c42 Merge pull request #1586 from smadey/dev
Add "resourcesLoaded" plugin for Renderer
2017-09-07 13:37:50 +02:00
Wu Haotian
e06aaaecc5 rename context.serverState to context.nuxtState 2017-09-07 10:46:28 +08:00
Sebastien Chopin
1de4a16a02 fix: Typo 2017-09-06 15:19:51 +02:00
Sebastien Chopin
79a64df422 fix: Move back store hydration before plugins execution 2017-09-06 15:15:32 +02:00
Smadey
fd07d1ff38 Add "resourcesLoaded" plugin for Renderer
Provide the ability to modify resources before use.
2017-09-06 10:38:56 +08:00
Pooya Parsa
251d87914d fix(nuxt-error): always show errors in debug more
SPA mode in debug mode when error is not globally handled (thrown by other nuxt functions) there is no error at all in console logs
2017-09-05 23:35:04 +04:30
Pooya Parsa
888b141a27 feat(renderer): allow disable router.base with prefix:false 2017-09-05 21:16:06 +04:30
Sebastien Chopin
20eb5a5eb0 fix: handle process.env to have nested keys 2017-09-05 11:15:07 +02:00
Pooya Parsa
1fcf3e685e fix(meta): remove data-n-head-ssr 2017-09-05 13:34:59 +04:30
Pooya Parsa
c6c653e68c typo 2017-09-03 00:33:48 +04:30
Pooya Parsa
a5e429830d padding 2017-09-01 21:10:01 +04:30
Pooya Parsa
4af3917f6d right -> left 2017-09-01 21:02:22 +04:30
Pooya Parsa
0d4bbf0b03 allow customize all messages for i18n 2017-09-01 21:00:49 +04:30
Pooya Parsa
2e11827209 spa loading defaults
more design agnostic for general usage
2017-09-01 20:46:08 +04:30
Pooya Parsa
a6a36b1d2f simplify error pages
No dependencies and more mobile friendly
2017-09-01 20:29:56 +04:30
Sebastien Chopin
f4c68e95e2 Add serverState 2017-09-01 10:29:06 +02:00
Sebastien Chopin
7da8785d72 Add context.serverStoreState 2017-08-31 14:46:10 +02:00
Wu Haotian
e2a18d76da Fix typo in lib/app/index.js (#1539) 2017-08-31 10:57:52 +04:30
Pooya Parsa
699b3f6230 disable ModuleConcatenationPlugin 2017-08-30 19:36:16 +04:30
Sebastien Chopin
696ada09c4 Add resourceHints for SPA mode 2017-08-30 14:47:07 +02:00
Clark Du
5616f1acba match correct route when resolveComponents in hash mode 2017-08-30 18:13:01 +08:00
Sébastien Chopin
8dd1bfe169 Add app in store only if store exists 2017-08-29 21:04:14 +02:00
Sébastien Chopin
b00592f157 Merge branch 'dev' of github.com:Atinux/nuxt.js into dev 2017-08-29 20:54:42 +02:00
Sébastien Chopin
b49713a096 Fix Maximum Call Size Stack 2017-08-29 20:53:50 +02:00
Pooya Parsa
c14b3be230 vuex@2.4.0 2017-08-29 22:33:42 +04:30
Artur Wronski
d4563b7f85 fix: compile error when using scrollBehavior
When compiling with babel as middleware the scrollBehavior function was transpiling in
incorrect way. Double function function

fixes #1516
2017-08-29 14:19:06 +02:00
Sebastien Chopin
1eca064338 Merge branch 'dev' of github.com:nuxt/nuxt.js into dev 2017-08-29 14:01:34 +02:00
Sebastien Chopin
f65b2b80e1 Add rtl option to loading 2017-08-29 13:58:45 +02:00
patmood
971095af56 removed scoped css 2017-08-27 10:52:27 -07:00
patmood
02f9454b66 rename progress class to prevent conflicts 2017-08-26 18:16:30 -07:00
Pooya Parsa
192c25e3e8 fix tests 2017-08-25 17:41:13 +04:30
Pooya Parsa
f933dd1f32 improve useMiddleware 2017-08-25 17:37:45 +04:30
Pooya Parsa
a71ac0f41a Merge branch 'dev' of github.com:nuxt/nuxt.js into dev 2017-08-25 16:31:56 +04:30
Pooya Parsa
1ca5739a2f add router base to all middleware 2017-08-25 16:31:16 +04:30
Sebastien Chopin
378d116bf8 typo: Simplify child.children sanitization 2017-08-25 13:54:14 +02:00
Sebastien Chopin
7bc1b35b21 fix: Use file path for chunkName 2017-08-25 12:34:59 +02:00
Sébastien Chopin
3bf1cb90c4 Merge pull request #1480 from whtsky/defaults-babel-presets
Don't set `babelOptions.presets` if babelrc = true
2017-08-25 12:15:52 +02:00
Sébastien Chopin
3985c1d684 Merge pull request #1478 from LookinGit/fix-1248
~ fix asyncData parent + children pages in production build (#1248)
2017-08-25 12:14:11 +02:00
Wu Haotian
e59b3dd4f7
Don't set babelOptions.presets if babelrc = true 2017-08-25 17:36:53 +08:00
LookinGit
16608fad25 ~ fix asyncData parent + children pages in production build (#1248) 2017-08-25 08:56:38 +03:00
Pooya Parsa
cafc94d9f9 fix problem with route chunk names (#1461) 2017-08-25 01:36:56 +04:30
Sébastien Chopin
e32a3755dd feature: Add inject(key, value) as 2nd argument of plugins 2017-08-24 20:38:28 +02:00
Sebastien Chopin
12a31b0914 fix: SSR call router.push after plugin execution 2017-08-24 18:49:26 +02:00
Sébastien Chopin
7738d0c0af Merge pull request #1447 from Zip753/improve-nuxt-config-interface
Improve nuxt.config.js and Nuxt modules API
2017-08-24 15:49:10 +02:00
Sebastien Chopin
fb25c982a7 feature: Add no-ssr component 2017-08-24 12:38:46 +02:00
Sebastien Chopin
04d05de906 process: Add process.mode 2017-08-23 18:21:27 +02:00
Sebastien Chopin
4ac14054f2 context: hotReload -> isHMR 2017-08-23 13:41:37 +02:00
Ivan Nikulin
37abaa0e80
Refactor extendRoutes for Tapable plugins 2017-08-23 08:49:24 +02:00
Ivan Nikulin
9c39c128f2
Add tests for chainFn 2017-08-23 00:50:46 +02:00
Ivan Nikulin
2336b3e6ea
Update extendBuild modules API 2017-08-23 00:50:46 +02:00
Ivan Nikulin
416b84ccae
Update extendRoutes modules API 2017-08-23 00:50:46 +02:00
Ivan Nikulin
8cf5a21752
Change build.extend hook to return new webpack config 2017-08-23 00:50:45 +02:00
Ivan Nikulin
635ee580e9
Change router.extendRoutes hook to return new router config 2017-08-23 00:50:45 +02:00
Pooya Parsa
459363beea fix(renderer): resolve handler key as option for serverMiddleware
#1274
2017-08-23 02:44:44 +04:30
Sebastien Chopin
af909ae8e3 Merge branch 'dev' of github.com:nuxt/nuxt.js into dev 2017-08-22 19:38:02 +02:00
Sebastien Chopin
d7a6761054 css-loader: Don't use root to allow absolute path 2017-08-22 19:37:55 +02:00
32c6d39358 fixes #1438 (#1439) 2017-08-22 18:27:11 +04:30
Sebastien Chopin
88f98fb61d Don't call extend for server if spa mode 2017-08-22 13:56:22 +02:00
Sebastien Chopin
8dca358216 Move store hydration after plugins execution 2017-08-22 11:08:59 +02:00
Pooya Parsa
b931dd40ce fix sass loader with indentedSyntax
fixes #1436

query options cannot be used when options provided
2017-08-22 00:38:39 +04:30
Pooya Parsa
0795d40bb7 fix problems with dll 2017-08-22 00:10:06 +04:30
Pooya Parsa
eb872518b2 disable MinifyPlugin 2017-08-22 00:00:35 +04:30
Pooya Parsa
7973d67f5b fix problems with common chunk 2017-08-21 23:43:08 +04:30
Sebastien Chopin
384aebb67d lint code 2017-08-21 17:31:12 +02:00
Sebastien Chopin
3eb8b2f316 Merge branch 'dev' of github.com:nuxt/nuxt.js into dev 2017-08-21 13:54:56 +02:00
Sebastien Chopin
fed644ddf6 Fix #1423 2017-08-21 13:54:41 +02:00
Pooya Parsa
d7fbe47c31 feat: experimental dll support
`.cache/` should be git ignored in projects.
disabled by default. Can be enabled using `options.build.dll: true`
2017-08-21 15:46:35 +04:30
Sebastien Chopin
8f929c3929 Remove old way to handle meta tags 2017-08-21 11:39:01 +02:00
Sebastien Chopin
39f431efdf Use vue-meta for meta tags 2017-08-21 11:38:21 +02:00
Pooya Parsa
5eb51f07b9 no need to check 2017-08-20 23:24:56 +04:30
Pooya Parsa
f42783af32 better common chunks 2017-08-20 22:52:01 +04:30
Pooya Parsa
9bfd00d3f4 update error page 2017-08-20 17:53:12 +04:30
Pooya Parsa
690cfe2114 improve spa errors 2017-08-20 17:43:42 +04:30
Pooya Parsa
0927c130ed press keys to open developer tools
Stack traces without developer tools are useless. Instead show a beatiful message
2017-08-20 16:20:55 +04:30
Pooya Parsa
8d489349c0 remove resolve-url-loader
Depending on sourcemaps makes many inconsistencies for builds! Same behaviour is supported by vue-loader
2017-08-20 13:33:23 +04:30
Pooya Parsa
086a642332 fix cssSourceMap 2017-08-20 13:08:38 +04:30
Pooya Parsa
75a845e5c7 wandering-cubes 2017-08-20 00:03:21 +04:30
Pooya Parsa
39e0a633db chasing-dots 2017-08-20 00:03:21 +04:30
Sébastien Chopin
e7b7f15166 Remove ssr only check 2017-08-19 15:31:26 +02:00
Pooya Parsa
a289a55a72 simplify modes 2017-08-19 17:52:53 +04:30
Pooya Parsa
278180b4fe Disable cssSourceMap for production by default
Prevents build environment path leaks and reduce js files size (as vue-loader inlines some parts)
2017-08-19 16:40:55 +04:30
Pooya Parsa
673dfcd3c9 imrpove js minify 2017-08-19 15:40:01 +04:30
Pooya Parsa
a585d8cb35 imrpove CLI experience for OPEN url 2017-08-19 14:59:41 +04:30
Pooya Parsa
b2a92e185e SPA Resource Hints using meta
- W3 valid resource hints
- Supporting options.render.resourceHints
2017-08-19 14:20:45 +04:30
Pooya Parsa
80db40fc1f hid -> data-hid 2017-08-19 13:22:39 +04:30
Pooya Parsa
a078a631eb fix meta typos 2017-08-19 13:16:58 +04:30
Pooya Parsa
6fddf61ef7 fix broken extractCSS 2017-08-18 21:12:11 +04:30
Pooya Parsa
81fcc70eca don't overwrite if 200.html already exists 2017-08-18 21:01:55 +04:30
Pooya Parsa
866e31d1a6 Spa Meta 2017-08-18 20:35:01 +04:30
Sebastien Chopin
b83f897339 Set default appear class 2017-08-18 16:47:01 +02:00
Sebastien Chopin
d96a48c3b4 fix typo 2017-08-18 15:46:48 +02:00
Sebastien Chopin
71c34b1d7a Merge branch 'dev' of github.com:nuxt/nuxt.js into dev 2017-08-18 15:44:46 +02:00
Sebastien Chopin
6461bcc9cb Add appear transition on spa mode 2017-08-18 15:44:34 +02:00
Sebastien Chopin
775c9d0850 Fix margin for body 2017-08-18 15:43:50 +02:00
Pooya Parsa
7feeedd432 call forGenerate before modules ready 2017-08-18 17:57:58 +04:30
Sebastien Chopin
c628097862 Merge branch 'dev' of github.com:nuxt/nuxt.js into dev 2017-08-18 15:16:36 +02:00
Pooya Parsa
d589bc5819 static ~> ssr-only 2017-08-18 17:16:03 +04:30
Sebastien Chopin
e709fa4bff Warning if loadingIndicator not found 2017-08-18 14:23:10 +02:00
Sebastien Chopin
06a3d65ebf Use Nuxt.js color by default 2017-08-18 14:22:54 +02:00
Pooya Parsa
fbb6833400 remove SSR related files from generate artifacts 2017-08-18 16:14:47 +04:30
Pooya Parsa
2c4cf1ed4b minor fix 2017-08-18 15:29:32 +04:30
Pooya Parsa
38f9c21f21 fix loadingIndicator default value 2017-08-18 14:59:37 +04:30