Merge lp:~tpeeters/ubuntu-ui-toolkit/revertPageWrapperUtils into lp:ubuntu-ui-toolkit

Proposed by Tim Peeters
Status: Merged
Approved by: Florian Boucault
Approved revision: 511
Merged at revision: 510
Proposed branch: lp:~tpeeters/ubuntu-ui-toolkit/revertPageWrapperUtils
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 22 lines (+2/-3)
1 file modified
modules/Ubuntu/Components/PageWrapperUtils.js (+2/-3)
To merge this branch: bzr merge lp:~tpeeters/ubuntu-ui-toolkit/revertPageWrapperUtils
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu SDK team Pending
Review via email: mp+165453@code.launchpad.net

Commit message

revert changes to PageWrapperUtils.jp from revision 501 because it breaks phone-app

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/PageWrapperUtils.js'
2--- modules/Ubuntu/Components/PageWrapperUtils.js 2013-05-17 07:03:20 +0000
3+++ modules/Ubuntu/Components/PageWrapperUtils.js 2013-05-23 17:52:26 +0000
4@@ -14,7 +14,7 @@
5 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-.pragma library // FIXME: cannot refer to Component.Error if I use this.
9+//.pragma library // FIXME: cannot refer to Component.Error if I use this.
10
11 /*!
12 \internal
13@@ -34,8 +34,7 @@
14
15 var pageObject;
16 if (pageComponent) {
17- // FIXME: Component.Error is the last in the enum, number 3
18- if (pageComponent.status === 3) {
19+ if (pageComponent.status === Component.Error) {
20 throw new Error("Error while loading page: " + pageComponent.errorString());
21 } else {
22 // create the object

Subscribers

People subscribed via source and target branches

to status/vote changes: