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

Multi-Project-Extension #312

Merged
merged 7 commits into from
Dec 6, 2020
Merged

Conversation

MysticJay
Copy link
Contributor

After V0.30 was released the code, that was initially sumbmitted for PR#221 got corrupted.
Revamped the branch and fixed the code.

After V0.30 was released the code, that was initially sumbmitted for PR#221 got corrupted.
Revamped the branch and fixed the code.
@MysticJay MysticJay changed the title Code updated for V0.30 Multi-Project-Extension Jan 16, 2020
Various smaller cosmetic changes
in Bookmarks only SYNC default Namespace
BKMrks did not load
fixed typos
@MysticJay MysticJay requested a review from modos189 January 18, 2020 21:01
MysticJay and others added 3 commits February 13, 2020 10:26
BM
- highlights and markes follow the changed project.
- sync will only act on default storage.
- typos fixed
MPE
- removed debug code
@modos189
Copy link
Contributor

In the first commit I fixed the syntax, and in the second I removed the font-awesome. Why? In the task #236 we discussed the use of icons - they should be font or svg.
I'm in favor of using svg, but anyway - icons should not be in the form of a plugin, but in the core and become standard, otherwise only there two plugins will use icons and that will be the end of it.

Also note https://github.com/IITC-CE/ingress-intel-total-conversion/pull/312/files#diff-3073581708df23c3f1bd259521cb3021R8.
I replaced the code sample with a link to documentation - you just need to create this page and move the sample there

@MysticJay
Copy link
Contributor Author

Syntax changes are ok, while I prefer way more comments and explanations to each function. The dividers between the functions helped a lot to reverse engineer the code. But this is a different discussion.

FontAwesome: the current usage of SVGs already have negative side effects in some faction specific plugins, esp. if combined with "alternative text". But that is a different discussion too.
FA is widely used in ZasoItems. I am fine keeping FA as a separate plugin with the other ZasoItems.

@johnd0e johnd0e self-requested a review February 19, 2020 09:14
@modos189 modos189 added the plugin label May 2, 2020
…rsion into Multi-Project-Extension

� Conflicts:
�	plugins/draw-tools.js
MysticJay added a commit to MysticJay/ingress-intel-total-conversion that referenced this pull request Jul 16, 2020
Changing default behavour to merge. This is more intuitive as it matches windows' "paste".
furthermore the user has to actively disable merge to avoid accidential overwrite by paste.
(PR obeys changes in IITC-CE#312 and can be merged to master in any order)
@MysticJay MysticJay mentioned this pull request Jul 16, 2020
MysticJay added a commit to MysticJay/ingress-intel-total-conversion that referenced this pull request Jul 20, 2020
basic changes to keep compatibility with IITC-CE#312 and IITC-CE#375
MysticJay added a commit to MysticJay/ingress-intel-total-conversion that referenced this pull request Jul 20, 2020
Added all EDF related code from Draw Tools plus to Drawtools.
WIP-code from DTplus skipped
fixed indentation
OK to pull with IITC-CE#312 (MPE) and IITC-CE#375 (Merge) in any order
@modos189 modos189 merged commit 940ff66 into IITC-CE:master Dec 6, 2020
modos189 pushed a commit to MysticJay/ingress-intel-total-conversion that referenced this pull request Dec 28, 2020
basic changes to keep compatibility with IITC-CE#312 and IITC-CE#375
modos189 pushed a commit to MysticJay/ingress-intel-total-conversion that referenced this pull request Dec 28, 2020
Added all EDF related code from Draw Tools plus to Drawtools.
WIP-code from DTplus skipped
fixed indentation
OK to pull with IITC-CE#312 (MPE) and IITC-CE#375 (Merge) in any order
MysticJay added a commit to MysticJay/ingress-intel-total-conversion that referenced this pull request Apr 11, 2021
Added all EDF related code from Draw Tools plus to Drawtools.
WIP-code from DTplus skipped
fixed indentation
OK to pull with IITC-CE#312 (MPE) and IITC-CE#375 (Merge) in any order
MysticJay added a commit to MysticJay/ingress-intel-total-conversion that referenced this pull request Jul 13, 2021
Added all EDF related code from Draw Tools plus to Drawtools.
WIP-code from DTplus skipped
fixed indentation
OK to pull with IITC-CE#312 (MPE) and IITC-CE#375 (Merge) in any order
modos189 added a commit that referenced this pull request Jul 23, 2022
* Code for Empty Drawn Fields (EDF) added

Added all EDF related code from Draw Tools plus to Drawtools.
WIP-code from DTplus skipped
fixed indentation
OK to pull with #312 (MPE) and #375 (Merge) in any order

* Copy Dialog

Extend Copy dialog to allow copying polylines too

* CSSsetup removed

Unused Code removed.
Not related to EDF.

* Resolve Conflicts

manual conflict resolution.
code style : long lines

* Indentation

Adjusting Indentation

* Dialog Size

copy dialog too high

* Code Style

new code should not trigger eslint

* EDF namespace removed

removed edf sub-namespace and integrated to drawTools namespace

Co-Authored-By: ZasoGD <[email protected]>

* Inteactivity

interactive toggles now with visibility of filling

* DeleteStart-Stop

show  reactivate interactivity and filling when starting to delete Objects

* CSS fixes

DToptions dialog without special styles

* fixup

typo

Co-authored-by: ZasoGD <[email protected]>
Co-authored-by: Alexander Danilov <[email protected]>
xscreach pushed a commit to xscreach/ingress-intel-total-conversion that referenced this pull request Aug 10, 2022
* Code for Empty Drawn Fields (EDF) added

Added all EDF related code from Draw Tools plus to Drawtools.
WIP-code from DTplus skipped
fixed indentation
OK to pull with IITC-CE#312 (MPE) and IITC-CE#375 (Merge) in any order

* Copy Dialog

Extend Copy dialog to allow copying polylines too

* CSSsetup removed

Unused Code removed.
Not related to EDF.

* Resolve Conflicts

manual conflict resolution.
code style : long lines

* Indentation

Adjusting Indentation

* Dialog Size

copy dialog too high

* Code Style

new code should not trigger eslint

* EDF namespace removed

removed edf sub-namespace and integrated to drawTools namespace

Co-Authored-By: ZasoGD <[email protected]>

* Inteactivity

interactive toggles now with visibility of filling

* DeleteStart-Stop

show  reactivate interactivity and filling when starting to delete Objects

* CSS fixes

DToptions dialog without special styles

* fixup

typo

Co-authored-by: ZasoGD <[email protected]>
Co-authored-by: Alexander Danilov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants