Added style to col subtract button to fix issue #756 #758

NARUDESIGNS · 2021-11-13T22:25:30Z

The column subtract button in the table popup had no style due to misspelt class name. This PR solves the problem and properly adds style to the button just like the other buttons.
@TildaDares @jywarren Please help review and feedback, thank you very much!

This reverts commit 895574e.

… changes

gitpod-io · 2021-11-13T22:25:32Z

TildaDares · 2021-11-15T07:09:52Z

src/modules/PublicLab.RichTextModule.Table.js

  });
  $(document).on('click', '#incCols', function() {
    $("#tableCols").text( Number($("#tableCols").text()) + 1 );
  });
  $(document).on('click', '#decCols', function() {
-    $("#tableCols").text( Number($("#tableCols").text()) - 1 );
+    const numOfCols = Number($("#tableCols").text());
+    if (numOfCols > 1) $("#tableCols").text( numOfCols - 1 );


Hi @NARUDESIGNS, these changes are from another PR. Maybe you forgot to do a git stash before switching to another branch.

Hi @NARUDESIGNS, these changes are from another PR. Maybe you forgot to do a git stash before switching to another branch.

Hi, sorry I haven't used git stash before but I will look it up and make changes. But before I go on to do that, I need you to help me clarify. Do you mean that I have already made these changes in a different PR previously? If yes, please point me to it.
Thank you!

@NARUDESIGNS I mean these changes were made for PR #757.

You can also open this branch up, and just overwrite the file with a saved copy of the unmodified file, so that this PR will show only those changes which address it's purpose. Thank you!!! That will help keep each fix in its own PR and separate commits. Thanks!

Oh I get it now. I'm sorry for the messy details. I will fix it today and push again.
Thank you and happy new month 🥳

Once again, I sincerely apologise for the back on forth on a minimal change like this. I have removed changes that were meant for PR #757 as @TildaDares mentioned and the current commit now carries only the change required for this PR.
Please let me know if this works or if you need me to do a git reset --hard instead.
cc @jywarren

No worries! Part of the learning process! Let me see now that I merged #757

TildaDares · 2021-11-15T07:12:50Z

src/modules/PublicLab.RichTextModule.Table.js

@@ -50,7 +50,7 @@ module.exports = function initTables(_module, wysiwyg) {
  var builder = '<div class="form-inline form-group ple-table-popover" style="width:400px;">';
  builder += '<a id="decRows" class="btn btn-sm btn-outline-secondary"><i class="fa fa-minus"></i></a> <span id="tableRows">4</span> <a id="incRows" class="btn btn-sm btn-outline-secondary"><i class="fa fa-plus"></i></a>';
  builder += ' x ';
-  builder += '<a id="decCols" class="btn btn-sm btn-outline-secondaryt"><i class="fa fa-minus"></i></a> <span id="tableCols">3</span> <a id="incCols" class="btn btn-sm btn-outline-secondary"><i class="fa fa-plus"></i></a>';
+  builder += '<a id="decCols" class="btn btn-sm btn-outline-secondary"><i class="fa fa-minus"></i></a> <span id="tableCols">3</span> <a id="incCols" class="btn btn-sm btn-outline-secondary"><i class="fa fa-plus"></i></a>';


Great working on spotting this!

TildaDares · 2021-11-15T07:13:27Z

dist/PublicLab.Editor.js

@@ -22475,7 +22475,7 @@ module.exports = function(textarea, _editor, _module) {
    );
    $(".wk-commands, .wk-switchboard").addClass("btn-group");
    $(".wk-commands button, .wk-switchboard button").addClass(
-        "btn btn-light"
+        "btn btn-outline-secondary"


@NARUDESIGNS What is this change for?

@TildaDares the change keeps happening automatically every time I make changes to src/modules/PublicLab.RichTextModule.Table.js

I've left a comment that explains this in #757

Sorry, I'm just responding now. I followed your instruction in #757 and I've made all necessary changes as you required.
@TildaDares

TildaDares · 2021-12-06T07:18:02Z

dist/PublicLab.Editor.js

  });
  $(document).on('click', '#incCols', function() {
    $("#tableCols").text( Number($("#tableCols").text()) + 1 );
  });
  $(document).on('click', '#decCols', function() {
-    $("#tableCols").text( Number($("#tableCols").text()) - 1 );
+    const numOfCols = Number($("#tableCols").text());
+    if (numOfCols > 1) $("#tableCols").text( numOfCols - 1 );


Hi @NARUDESIGNS, this file still has those changes.

Oops! My bad.
I should push the dist/PublicLab.Editor.js file as well.
I think those changes are fine in my local env.

Thank you @TildaDares

TildaDares

Thank you @NARUDESIGNS. Amazing work!!

jywarren · 2021-12-07T15:19:05Z

Resolved the conflicts (it did it automatically) and approved the test run, so lets see! 🤞

jywarren · 2021-12-07T15:19:27Z

This should be fine as it's a CSS change. But occasionally tests depend on CSS classes, so good to check!

NARUDESIGNS · 2021-12-07T17:24:11Z

This should be fine as it's a CSS change. But occasionally tests depend on CSS classes, so good to check!

Tests bother me a lot and I think it's because I know it's tied to most of my task list and so if it doesn't get resolved on time then my tasks will not get started soon. Although some of the tasks are CSS changes, unlike the ones that involve clicks and button events.

jywarren · 2021-12-07T19:06:03Z

Looks good, nice to see some initial PRs merged, huh?

jywarren · 2021-12-07T19:06:25Z

Don't worry, you'll figure the tests out and it'll feel great!

NARUDESIGNS · 2021-12-07T19:47:30Z

Looks good, nice to see some initial PRs merged, huh?

Yh lol. Seeing your PR get merged and hopefully, deployed to production feels good 😊😊😊

NARUDESIGNS added 5 commits November 11, 2021 15:37

fixed row and column subtract buttons

895574e

Revert "fixed row and column subtract buttons"

d3f03fb

This reverts commit 895574e.

fixed rows and cols subtract buttons and reverted formtter (prettier)…

45aeea1

… changes

used variable in decCols to avoid repetition

cb4033c

added style to col subtract button for issue publiclab#756

d7e2a0a

TildaDares requested changes Nov 15, 2021

View reviewed changes

TildaDares reviewed Nov 15, 2021

View reviewed changes

undo changes after running grunt build

653d6bc

NARUDESIGNS mentioned this pull request Nov 17, 2021

fixed row and column subtract button values for issue #755 #757

Merged

NARUDESIGNS mentioned this pull request Nov 30, 2021

Column subtract button in table popover has no style #756

Closed

reversed changes and fixed ONLY col button style

f01c028

TildaDares requested changes Dec 6, 2021

View reviewed changes

Ran grunt command to update dist/Puliclab.Editor.js file

1b2184b

TildaDares approved these changes Dec 6, 2021

View reviewed changes

Merge branch 'main' into add-style-to-col-subtract-button

820db33

jywarren merged commit f8e1edb into publiclab:main Dec 7, 2021

NARUDESIGNS mentioned this pull request Jan 29, 2022

[Planning] Refine the Public Lab Rich Editor #760

Open

31 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added style to col subtract button to fix issue #756 #758

Added style to col subtract button to fix issue #756 #758

NARUDESIGNS commented Nov 13, 2021

gitpod-io bot commented Nov 13, 2021

TildaDares Nov 15, 2021

NARUDESIGNS Nov 15, 2021 •

edited

Loading

TildaDares Nov 15, 2021

jywarren Nov 30, 2021

NARUDESIGNS Dec 1, 2021

NARUDESIGNS Dec 4, 2021

jywarren Dec 7, 2021

TildaDares Nov 15, 2021

TildaDares Nov 15, 2021

NARUDESIGNS Nov 15, 2021

TildaDares Nov 15, 2021

NARUDESIGNS Nov 30, 2021

TildaDares Dec 6, 2021

NARUDESIGNS Dec 6, 2021 •

edited

Loading

TildaDares left a comment

jywarren commented Dec 7, 2021

jywarren commented Dec 7, 2021

NARUDESIGNS commented Dec 7, 2021

jywarren commented Dec 7, 2021

jywarren commented Dec 7, 2021

NARUDESIGNS commented Dec 7, 2021

Added style to col subtract button to fix issue #756 #758

Added style to col subtract button to fix issue #756 #758

Conversation

NARUDESIGNS commented Nov 13, 2021

gitpod-io bot commented Nov 13, 2021

Choose a reason for hiding this comment

NARUDESIGNS Nov 15, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NARUDESIGNS Dec 6, 2021 • edited Loading

Choose a reason for hiding this comment

TildaDares left a comment

Choose a reason for hiding this comment

jywarren commented Dec 7, 2021

jywarren commented Dec 7, 2021

NARUDESIGNS commented Dec 7, 2021

jywarren commented Dec 7, 2021

jywarren commented Dec 7, 2021

NARUDESIGNS commented Dec 7, 2021

NARUDESIGNS Nov 15, 2021 •

edited

Loading

NARUDESIGNS Dec 6, 2021 •

edited

Loading