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.

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

Issues/1022 #58

Merged
merged 2 commits into from
Oct 7, 2013
Merged

Issues/1022 #58

merged 2 commits into from
Oct 7, 2013

Conversation

cosimoc
Copy link
Contributor

@cosimoc cosimoc commented Oct 2, 2013

Fixes for endlessm/eos-shell#1022

@@ -484,7 +523,10 @@ const WeblinkFrame = new Lang.Class({
},

_onCategoryClicked: function(button) {
this._stack.set_visible_child_name(button.category);
let category = button.category;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This conflicts with dev.

I believe that the only change needed wrt the code in dev would be to add a line like

this._currentCategory = button.category;

@felipeerias
Copy link
Contributor

It works well, but a couple of changes are needed so it can be merged with dev.

This is analogous to what AppFrame does.

[endlessm/eos-shell#1022]
Use the URL instead of the linkId, since the CMS is currently leaving
those empty.

[endlessm/eos-shell#1022]
@cosimoc
Copy link
Contributor Author

cosimoc commented Oct 4, 2013

Rebased to dev and ready for another CR.

@felipeerias
Copy link
Contributor

CR pass.

felipeerias added a commit that referenced this pull request Oct 7, 2013
@felipeerias felipeerias merged commit 4aa1a61 into dev Oct 7, 2013
@cosimoc cosimoc deleted the issues/1022 branch October 7, 2013 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants