-
Notifications
You must be signed in to change notification settings - Fork 130
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
Added style to col subtract button to fix issue #756 #758
Changes from 5 commits
895574e
d3f03fb
45aeea1
cb4033c
d7e2a0a
653d6bc
f01c028
1b2184b
820db33
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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" | ||
); | ||
|
||
$(".wk-commands a.woofmark-command-insert").addClass("btn-light"); | ||
|
@@ -23347,7 +23347,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>'; | ||
builder += ' <a class="ple-table-size btn btn-outline-secondary">Add</a>'; | ||
builder += '</div>'; | ||
|
||
|
@@ -23358,13 +23358,15 @@ module.exports = function initTables(_module, wysiwyg) { | |
$("#tableRows").text( Number($("#tableRows").text()) + 1 ); | ||
}); | ||
$(document).on('click', '#decRows', function() { | ||
$("#tableRows").text( Number($("#tableRows").text()) - 1 ); | ||
const numOfRows = Number($("#tableRows").text()); | ||
if (numOfRows > 1) $("#tableRows").text( numOfRows - 1 ); | ||
}); | ||
$(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 ); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hi @NARUDESIGNS, this file still has those changes. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oops! My bad. Thank you @TildaDares |
||
}); | ||
|
||
$('.woofmark-command-table').attr('data-content', builder); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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>'; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Great working on spotting this! |
||
builder += ' <a class="ple-table-size btn btn-outline-secondary">Add</a>'; | ||
builder += '</div>'; | ||
|
||
|
@@ -61,13 +61,15 @@ module.exports = function initTables(_module, wysiwyg) { | |
$("#tableRows").text( Number($("#tableRows").text()) + 1 ); | ||
}); | ||
$(document).on('click', '#decRows', function() { | ||
$("#tableRows").text( Number($("#tableRows").text()) - 1 ); | ||
const numOfRows = Number($("#tableRows").text()); | ||
if (numOfRows > 1) $("#tableRows").text( numOfRows - 1 ); | ||
}); | ||
$(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 ); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hi @NARUDESIGNS, these changes are from another PR. Maybe you forgot to do a There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Hi, sorry I haven't used There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @NARUDESIGNS I mean these changes were made for PR #757. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh I get it now. I'm sorry for the messy details. I will fix it today and push again. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No worries! Part of the learning process! Let me see now that I merged #757 |
||
}); | ||
|
||
$('.woofmark-command-table').attr('data-content', builder); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@NARUDESIGNS What is this change for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@TildaDares the change keeps happening automatically every time I make changes to src/modules/PublicLab.RichTextModule.Table.js
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've left a comment that explains this in #757
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I'm just responding now. I followed your instruction in #757 and I've made all necessary changes as you required.
@TildaDares