Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Changed all usages of the depreciated ".className" to ".type" that were ... #3697

Merged
merged 3 commits into from
May 5, 2013

Conversation

jeffslofish
Copy link
Contributor

...being used on objects returned from the getTokenAt() method. There are many ".className" references that refer to the name of the CSS class, and all these were left alone. Also, any uses of ".className" in the third party code was left alone as well.

This is for Issue #3676

…re being used on objects returned from the getTokenAt() method. There are many ".className" references that refer to the name of the CSS class, and all these were left alone. Also, any uses of ".className" in the third party code was left alone as well.
@redmunds
Copy link
Contributor

redmunds commented May 3, 2013

@jeffslofish Thanks for the pull request. An update has been made to the files in JavaScriptCodeHints that caused a conflict. Please fix so I can merge the code. Thanks.

…-3676

Conflicts:
	src/extensions/default/JavaScriptCodeHints/Session.js
@redmunds
Copy link
Contributor

redmunds commented May 4, 2013

@jeffslofish , something it not right about this pull request since you merged. The "Files Changed" tab shows a lot of files that I don't think you changed. I'm hoping it's a temporary quirk with github.com.

One change you do need to make is running github submodule update to update to the SHA of the updated JavaScriptCodeHints submodules. It also looks like you backed out your change to .className in src/extensions/default/JavaScriptCodeHints/Session.js so you should re-fix that while your pushing the other change.

Hopefully, the "Files Changed" tab will be sorted out by then.

…were being used on objects returned from the getTokenAt() method that was missed during a merge.
@redmunds
Copy link
Contributor

redmunds commented May 5, 2013

Looks good. Merging.

redmunds added a commit that referenced this pull request May 5, 2013
Changed all usages of the depreciated ".className" to ".type" that were ...
@redmunds redmunds merged commit 9e99101 into adobe:master May 5, 2013
redmunds added a commit that referenced this pull request May 5, 2013
This reverts commit 9e99101, reversing
changes made to a9e2771.
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants