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

JS Update – further separate original forge.jquery.js functions into … #24

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

visuale
Copy link
Contributor

@visuale visuale commented Aug 18, 2015

…individuated scripts. The controllers (docJSCtrl.js, newsJSCtrl.js, etc.) could probably all be consolidated to one script but I'm not sure about that functionality.

…individuated scripts. The controllers (docJSCtrl.js, newsJSCtrl.js, etc.) could probably all be consolidated to one script but I'm not sure about that functionality.
@gastaldi
Copy link
Member

It looks ok, but it seems that there are some conflicts with the master branch. Can you fix it?

@visuale
Copy link
Contributor Author

visuale commented Aug 18, 2015

Sorry, I'll have a look now.

@visuale
Copy link
Contributor Author

visuale commented Aug 18, 2015

Sorry George. Disregard this last commit – I think I just went in a big circle.

@visuale
Copy link
Contributor Author

visuale commented Aug 18, 2015

Are you still seeing a conflict? I think my HEAD might be screwed up... the only change I (think that I) corrected was in the scripts that were loaded on app/index.html

@gastaldi
Copy link
Member

I fixed the conflict locally, but I am seeing some collateral issues with it, like the footer not being in the bottom when scrolling

@gastaldi
Copy link
Member

screenshot from 2015-08-18 17 32 42

@gastaldi
Copy link
Member

if you do a git rebase master, your branch should not present any conflicts

@visuale
Copy link
Contributor Author

visuale commented Aug 18, 2015

Just figure that out as you were typing :-)

I "think" I'm back up to date.

@visuale
Copy link
Contributor Author

visuale commented Aug 18, 2015

I'll have a look at that other issue. Weird.

…to wait an extra couple of hundredths of a second before activating script
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