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

Fix optimizing of draggabilly and json2 #10534

Merged
merged 1 commit into from
Nov 6, 2015

Conversation

andy-armstrong
Copy link
Contributor

Proposed fix for the release candidate for https://openedx.atlassian.net/browse/TNL-3766

I've kicked off a sandbox build so I'll see how that looks in the morning:

https://andy-armstrong.sandbox.edx.org

FYI: @cahrens @jcdyer

@@ -1748,7 +1748,9 @@ return Unidragger;

if ( typeof define == 'function' && define.amd ) {
// AMD
define( [
define(
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reviewers: this is the key problem which is that the Draggabilly vendor file doesn't correctly define its own module when using RequireJS. This fix allows the file to be bundled by RequireJS Optimizer.

Copy link

Choose a reason for hiding this comment

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

Please add a comment to the code explaining why this is needed and that it is specifically for Studio (since LMS uses a namespaced version).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@andy-armstrong
Copy link
Contributor Author

@cahrens I have no idea what is going on, but I can't log in to Studio on my sandbox. I can't see how my changes could have caused this, although I suppose they must have. There are no errors in the browser, and no errors shown in the cms log file.

@andy-armstrong
Copy link
Contributor Author

I updated my sandbox to the RC branch and am having the same trouble, so it isn't my change. I've kicked off a clean sandbox build in case something went wrong with the last one.

@andy-armstrong
Copy link
Contributor Author

At @cahrens's suggestion, I've removed the JSON2 shim from Studio as it is not needed. The JSON2 library is only used for older browsers, none of which we support.

@andy-armstrong
Copy link
Contributor Author

@cahrens @dianakhuang Please review this fix for this week's release.

@andy-armstrong
Copy link
Contributor Author

FYI you can see a video rendering successfully in Studio on my sandbox:

https://studio-andy-armstrong.sandbox.edx.org/container/block-v1:edX+DemoX+Demo_Course+type@vertical+block@vertical_0270f6de40fc

@cahrens
Copy link

cahrens commented Nov 6, 2015

👍

@dianakhuang
Copy link
Contributor

👍 yay for getting rid of things we don't need.

@andy-armstrong
Copy link
Contributor Author

jenkins run python

@andy-armstrong
Copy link
Contributor Author

jenkins run lettuce

@andy-armstrong
Copy link
Contributor Author

jenkins run bokchoy

@andy-armstrong
Copy link
Contributor Author

jenkins run lettuce

2 similar comments
@andy-armstrong
Copy link
Contributor Author

jenkins run lettuce

@andy-armstrong
Copy link
Contributor Author

jenkins run lettuce

andy-armstrong added a commit that referenced this pull request Nov 6, 2015
Fix optimizing of draggabilly and json2
@andy-armstrong andy-armstrong merged commit a3ff4d5 into rc/2015-11-10 Nov 6, 2015
@andy-armstrong andy-armstrong deleted the andya/fix-studio-videos branch November 6, 2015 17:12
@andy-armstrong andy-armstrong restored the andya/fix-studio-videos branch November 6, 2015 21:31
@andy-armstrong andy-armstrong deleted the andya/fix-studio-videos branch February 5, 2016 17:16
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.

3 participants