Conversation
…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.
Member
|
It looks ok, but it seems that there are some conflicts with the master branch. Can you fix it? |
Contributor
Author
|
Sorry, I'll have a look now. |
Contributor
Author
|
Sorry George. Disregard this last commit – I think I just went in a big circle. |
Contributor
Author
|
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 |
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 |
Member
|
|
Member
|
if you do a |
Contributor
Author
|
Just figure that out as you were typing :-) I "think" I'm back up to date. |
Contributor
Author
|
I'll have a look at that other issue. Weird. |
…to wait an extra couple of hundredths of a second before activating script
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
…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.