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

Show specific message on ajax error (2) #294

Merged
merged 9 commits into from
Mar 5, 2015
Merged

Show specific message on ajax error (2) #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f5ddd1b
Update README.md
rkwright Nov 22, 2013
1a99b25
Merge branch 'release/0.10'
Dec 20, 2013
35f8105
Merge branch 'release/0.14'
rkwright Apr 30, 2014
4ba4210
Merge branch 'develop'
Apr 30, 2014
a3c4fce
updated dependency
Apr 30, 2014
50cd0dc
Merge branch 'release/0.15'
rkwright Sep 12, 2014
7901539
Fixing merge markers left in lib/Readium.js
ryanackley Sep 14, 2014
e121096
Update messages.json
lmvco Mar 5, 2015
89057bb
Update Dialogs.js
lmvco Mar 5, 2015
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
3 changes: 3 additions & 0 deletions i18n/_locales/en_US/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
"err_epub_corrupt" : {
"message": "Invalid or corrupted EPUB package"
},
"err_ajax": {
"message": "Error in ajax request"
},
"err_dlg_title" : {
"message": "Unexpected Error"
},
Expand Down
7 changes: 5 additions & 2 deletions lib/Dialogs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@ define(['hgn!templates/managed-dialog.html', 'hgn!templates/progress-dialog.html
msg = Strings.err_storage;
break;
case Messages.ERROR_EPUB:
msg = Strings.err_epub_corrupt
msg = Strings.err_epub_corrupt;
break;
case Messages.ERROR_AJAX:
msg = Strings.err_ajax;
break;
default:
msg = Strings.err_unknown;
console.trace();
Expand Down Expand Up @@ -163,4 +166,4 @@ define(['hgn!templates/managed-dialog.html', 'hgn!templates/progress-dialog.html
};

return Dialogs;
});
});
5 changes: 3 additions & 2 deletions lib/Readium.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/**
* @license RequireJS text 2.0.6 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
Expand Down Expand Up @@ -367,7 +366,8 @@ define('text',['module'], function (module) {
return text;
});

define('text!version.json',[],function () { return '{"readiumJs":{"sha":"0bd9ab3a596831c52145fbae852962648caf4fb7","clean":true},"readiumSharedJs":{"sha":"e3d096dabe6d6ea188c9af97fc28fc7c410982b2","clean":true}}';});

define('text!version.json',[],function () { return '{"readiumJs":{"sha":"428b2956dce052598a73f8558b8a686600eabbd2","clean":true},"readiumSharedJs":{"sha":"e3d096dabe6d6ea188c9af97fc28fc7c410982b2","clean":true}}';});

/*
This code is required to IE for console shim
Expand Down Expand Up @@ -29171,3 +29171,4 @@ define('Readium',['require', 'text!version.json', 'console_shim', 'jquery', 'und
return Readium;

});