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

Default Loading... to blank #306

Merged
merged 1 commit into from
Oct 14, 2016
Merged

Default Loading... to blank #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/components/oc-client/src/oc-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var oc = oc || {};
MESSAGES_ERRORS_RENDERING = 'Error rendering component: {0}, error: {1}',
MESSAGES_ERRORS_RETRIEVING = 'Failed to retrieve the component. Retrying in {0} seconds...'.replace('{0}', RETRY_INTERVAL/1000),
MESSAGES_ERRORS_VIEW_ENGINE_NOT_SUPPORTED = 'Error loading component: view engine "{0}" not supported',
MESSAGES_LOADING_COMPONENT = 'Loading...',
MESSAGES_LOADING_COMPONENT = oc.conf.loadingMessage || '',
MESSAGES_RENDERED = 'Component \'{0}\' correctly rendered',
MESSAGES_RETRIEVING = 'Unrendered component found. Trying to retrieve it...';

Expand Down
1 change: 1 addition & 0 deletions test/configuration/test-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
var oc = oc || {};
oc.conf = oc.conf || {};
oc.conf.retryInterval = 1;
oc.conf.loadingMessage = 'Loading';
4 changes: 2 additions & 2 deletions test/front-end/render-nested-component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe('oc-client : renderNestedComponent', function(){
afterEach(cleanup);

it('should show loading message first', function(){
expect(htmlBeforeRendering).toContain('Loading...');
expect(htmlBeforeRendering).toContain('Loading');
});

it('should inject component html when rendering is done', function(){
Expand All @@ -71,7 +71,7 @@ describe('oc-client : renderNestedComponent', function(){
afterEach(cleanup);

it('should show loading message first', function(){
expect(htmlBeforeRendering).toContain('Loading...');
expect(htmlBeforeRendering).toContain('Loading');
});

it('should remove loading message then', function(){
Expand Down