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

disable buttons in html view #96

Open
wants to merge 106 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
87c66d1
new video editing features added
sabareeshkk Jul 14, 2017
9cab778
video editing close tag is done
sabareeshkk Jul 17, 2017
13fe7ab
new adobe plugin integrated successfully
sabareeshkk Jul 17, 2017
927ebd7
added justify and height width to image
sabareeshkk Jul 20, 2017
8bd647d
added justify and height width to image
sabareeshkk Jul 20, 2017
1532947
new commit to the repo with gitignore
sabareeshkk Jul 20, 2017
559d3f8
demos removed from the
sabareeshkk Jul 20, 2017
67ef12b
font-size added to the plugin
sabareeshkk Jul 21, 2017
b4d680a
font-family feature is added to the editor
sabareeshkk Jul 22, 2017
4f92ce3
readme md has updated with compatibality links
sabareeshkk Jul 22, 2017
9df63f1
undo change bug fixed take care font-size
sabareeshkk Jul 22, 2017
46a2018
added todo in contributes.md
sabareeshkk Jul 24, 2017
f345db6
button activation code goes like a magic
sabareeshkk Jul 24, 2017
23518f1
added image with close button-image modal height and width removed
sabareeshkk Jul 25, 2017
703a9f2
image slide template integration
sabareeshkk Jul 25, 2017
d370c1e
new commit multiple image upload is in progress
sabareeshkk Jul 26, 2017
a0180fc
new none button working as expected
sabareeshkk Jul 27, 2017
7741ec7
anchor tag highlight will work now
sabareeshkk Jul 27, 2017
f3ad624
anchor tag highlight enabled
sabareeshkk Jul 27, 2017
cce1b9f
new highlight justify also corrected
sabareeshkk Jul 27, 2017
49ac3e2
clear button made more stylish
sabareeshkk Jul 27, 2017
fd081e1
added hex code color apply to redactor code
sabareeshkk Jul 28, 2017
893deea
bug fixes are completed highlight bugs are fixed
sabareeshkk Jul 31, 2017
814c1a8
new image edit and resize updated and minor bug fixes
sabareeshkk Jul 31, 2017
8502f3b
new link functionality removed from image popup
sabareeshkk Jul 31, 2017
06439da
justify bug fixed
sabareeshkk Jul 31, 2017
d218c3b
justify selection error fixed
sabareeshkk Jul 31, 2017
26c74b0
insert link modal chnaged
sabareeshkk Aug 1, 2017
73219b8
font-size bug fixed
sabareeshkk Aug 1, 2017
1f50733
removed todo from readme
sabareeshkk Aug 1, 2017
f8c29d4
new font-family selection is placed to dropdown
sabareeshkk Aug 1, 2017
b05d7a2
new font-size dropdown is created
sabareeshkk Aug 1, 2017
8df481d
new chnages
sabareeshkk Aug 1, 2017
18e5166
new create gallery function id applyed
sabareeshkk Aug 2, 2017
5807069
minheight 500px
sabareeshkk Aug 3, 2017
985ffc3
ul lis selection problem with font-size has been fixed
sabareeshkk Aug 3, 2017
46a2006
color picker input focus removed
sabareeshkk Aug 3, 2017
23fcfda
new color highlight progress
sabareeshkk Aug 4, 2017
c00b4b6
colorpicker highlight added
sabareeshkk Aug 7, 2017
cc12e7a
pre tag on enter functionality changed
sabareeshkk Aug 7, 2017
da06c55
pre tag enter condition is removed
sabareeshkk Aug 7, 2017
f81c979
enter on p tag fixed by commentuing syncode ...only shift enter workd
sabareeshkk Aug 7, 2017
63e959c
redme
sabareeshkk Aug 9, 2017
9f80e6a
anchor tag unlink function is fixed
sabareeshkk Aug 9, 2017
61da9d4
webpack installed
sabareeshkk Aug 9, 2017
d87007c
year changed
sabareeshkk Aug 9, 2017
d72ede7
image url validation
Vdeepali Aug 9, 2017
d138fc8
Merge branch 'Vdeepali-master'
sabareeshkk Aug 10, 2017
8aaff8b
new merge chnages
sabareeshkk Aug 10, 2017
53826cc
anchor tag selection is with target_blank and bugs fixed
sabareeshkk Aug 10, 2017
d2d321b
link dropdown changed
sabareeshkk Aug 10, 2017
2c50f83
toolbar button activation
sabareeshkk Aug 10, 2017
ea00074
unwanted code removed
sabareeshkk Aug 11, 2017
1829736
disable buttons in html code view
Vdeepali Aug 11, 2017
f091b0d
disable buttons in html view
Vdeepali Aug 11, 2017
fd6166b
update validation with rejex
Vdeepali Aug 12, 2017
6ddc6e1
image buttons added
sabareeshkk Aug 12, 2017
a8bf89f
new merge changes commited the image validation changed to regex
sabareeshkk Aug 12, 2017
88f9702
some bug fixed
sabareeshkk Aug 16, 2017
a885ef1
new observe changes
sabareeshkk Aug 16, 2017
59906e6
image edit buttons show oin click done
sabareeshkk Aug 16, 2017
4c4ed4a
new image resize buttons test code added
sabareeshkk Aug 16, 2017
6cbfb54
new image resize is added
sabareeshkk Aug 16, 2017
aa195f9
added some chnages to the image editing effects
sabareeshkk Aug 17, 2017
0d5af50
image deletion and editing
Vdeepali Aug 17, 2017
313bd6b
new remove br functionality added thats all
sabareeshkk Aug 17, 2017
cf974ab
conflict resolved
sabareeshkk Aug 17, 2017
e4a2be5
Merge branch 'newdeepali-master'
sabareeshkk Aug 17, 2017
bb08b95
li tab and shift tab working
sabareeshkk Aug 17, 2017
98d4669
restore selection while clicking on default buttons fixed
sabareeshkk Aug 18, 2017
6e54bb6
empty style attribute removed from clearing color
sabareeshkk Aug 18, 2017
60d3746
confirm dialog box added
Vdeepali Aug 18, 2017
f88fc19
confirm dialog box added
Vdeepali Aug 18, 2017
379af85
new commit
Vdeepali Aug 18, 2017
903db00
resolved
Vdeepali Aug 18, 2017
01e9547
Merge branch 'newdeepali-master'
sabareeshkk Aug 18, 2017
d97c73c
bugs fixed
Vdeepali Aug 18, 2017
13e330d
new changes are updated
sabareeshkk Aug 18, 2017
c4cb95e
bugs fixed
Vdeepali Aug 18, 2017
177689a
bug fix
Vdeepali Aug 18, 2017
96385e4
new bug fix
Vdeepali Aug 18, 2017
79b7ca6
Merge branch 'newdeepali-master'
sabareeshkk Aug 18, 2017
eb9e989
image caption added
sabareeshkk Aug 18, 2017
708f464
black button highlight added
sabareeshkk Aug 18, 2017
fd2eb91
modal close bug fixed
sabareeshkk Aug 18, 2017
88cc908
commented some modal close code
sabareeshkk Aug 18, 2017
b863899
insert title modal heading changed
sabareeshkk Aug 21, 2017
7539fa8
empty tab press in li bug fixed
sabareeshkk Aug 21, 2017
d153bc5
new caption bug is fixed
sabareeshkk Aug 21, 2017
c6a7b2c
image resize bug fixed
sabareeshkk Aug 21, 2017
6dd1eba
remove color from entire block bug is fixed
sabareeshkk Aug 21, 2017
6351d5c
new li ul while adding image bug fixed
sabareeshkk Aug 21, 2017
b7ad481
image resize bug fixed
sabareeshkk Aug 21, 2017
b7b98ed
new resize animation added
sabareeshkk Aug 22, 2017
72de36c
new chnage sto image edit added
sabareeshkk Aug 23, 2017
549cc95
new border color and width chnaged
sabareeshkk Aug 23, 2017
666ef88
border radius changed
sabareeshkk Aug 24, 2017
89a485c
image bugs with caption resize fixed
sabareeshkk Aug 26, 2017
6f34135
added forcus to caption
sabareeshkk Aug 26, 2017
6f62160
new commit resize image
sabareeshkk Aug 28, 2017
c3a5f67
new image alignment issue fixed
sabareeshkk Aug 28, 2017
f630a5d
new image resize bug fixed with scroll
sabareeshkk Aug 28, 2017
7c076d1
image resize shrink issue fixed
sabareeshkk Aug 29, 2017
e397886
editor click disable image editing enabled
sabareeshkk Aug 29, 2017
9a3c127
new commit applyed draggable is false in images
sabareeshkk Aug 29, 2017
8f5f4cc
new alignment in image integrated
sabareeshkk Aug 29, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
9 changes: 9 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,12 @@ I love pull-requests. However, this repo is just a mirror of [redactor-js offici
Thus, no pull-requests will be accepted and there's very low chance original authors will look at the issues.

Sorry about that.

# problems
* options tag doesnt support any style except firefox so the dropdown showing font-family not work.
* custom embed need api to fetch data of the url(then only we can render)


# Ideas
* getCurrentNode() -- function gives you the caret placed element.
* jquery closest to find the closest tags.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
redactor-js
<!-- redactor-js
===========

# Repo not maintained. Proceed with caution or refer to http://imperavi.com/redactor/
Expand Down Expand Up @@ -35,4 +35,7 @@ If you found and issue, please submit it here: http://imperavi.com/support/
## License
Starting with version 7.6.2 redactor-js is licensed under [Creative Commons Attribution-NonCommercial 3.0 license](http://creativecommons.org/licenses/by-nc/3.0/)

For commercial use please buy license here: http://redactorjs.com/ or use earlier version.
For commercial use please buy license here: http://redactorjs.com/ or use earlier version. -->

## List of contenteditable Browser Inconsistencies
![List](https://github.com/guardian/scribe/blob/master/BROWSERINCONSISTENCIES.md)
164 changes: 164 additions & 0 deletions css/new.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
.button {
background-color: ForestGreen;
border-radius: 5px;
color: white;
padding: .5em;
text-decoration: none;
text-align: center;
}

.button:focus,
.button:hover {
background-color: DarkGreen;
}




.custom-file-input {
color: transparent;
width: 124px;
height: 26px;
}
.custom-file-input::-webkit-file-upload-button {
visibility: hidden;
}
.custom-file-input::before {
content: 'Select some files';
color: black;
display: inline-block;
background: -webkit-linear-gradient(top, #f9f9f9, #e3e3e3);
border: 1px solid #999;
border-radius: 3px;
padding: 5px 8px;
outline: none;
white-space: nowrap;
/* -webkit-user-select: none; */
cursor: pointer;
text-shadow: 1px 1px #fff;
font-weight: 700;
font-size: 10pt;
}
.custom-file-input:hover::before {
border-color: black;
}
.custom-file-input:active {
outline: 0;
}
.custom-file-input:active::before {
background: -webkit-linear-gradient(top, #e3e3e3, #f9f9f9);
}


/*applyed color highlight */
.redactor_color_act {
border: solid #9e9e9e !important;
border-radius: 11px !important;
}

/*
disable unlink */
.unlink-disable {
pointer-events: none;
background: darkgray;
}


/* image editing styles */
.caption {
/* text-align: center; */
padding: 14px;
font-size: 18px;
line-height: 1em;
box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.2), 0 1px 1px 0 rgba(0, 0, 0, 0.19);
display: none;
}

.img-border {
position: relative;
display: inline-table;
margin: 0px 0px 0px 0px;
}

.btn-class {
position: absolute;
top: 10px;
right: 2px;
display: inline-block;;
opacity: 0;
visibility: hidden;
-webkit-transition: opacity 1s ease-in, visibility 1s ease-in;
transition: opacity 700ms ease-in, visibility 700ms ease-in;
}

ul.btn-class li {
display: inline-block;
padding: 11px;
user-select: none;
-moz-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
}

.span-cls {
padding: 10px;
line-height: 15px;
-moz-border-radius: 10px;
border-radius: 19px;
background-color: black;
text-align: center;
font-size: 1em;
}

.drop {
position: absolute;
width: 100%;
height: 100%;
opacity: 0;
background: white;
z-index: -1;
visibility: hidden;
-webkit-transition: opacity 1s ease-in, visibility 1s ease-in;
transition: opacity 700ms ease-in, visibility 700ms ease-in;
}



.show-border {
border: 4.5px solid cadetblue;
z-index: 90;
}

.show-drop {
opacity: 0.5;
visibility: visible;
z-index: 90;

}

.show-btn {
display: inline-block;
opacity: 1;
visibility: visible;
z-index: 90;
}

/* .img-border:hover .drop {
opacity: 0.5;
visibility: visible;
z-index: 0;
}
.img-border:hover .btn-class {
display: inline-block;
opacity: 1;
visibility: visible;
} */
.ui-wrapper .ui-resizable-se {
border: 3px solid #e08294;


}
.img-border img {
width: 100%;
height: 100%;
}
32 changes: 31 additions & 1 deletion css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,34 @@ body {
-----------------------------------------------------------------------------*/
.list li {
margin: 10px 0;
}
}

/*
hover effects
*/
.close {
position: sticky;
right: 32px;
top: 32px;
width: 32px;
height: 32px;
opacity: 1;
color:red
}
.close:hover {
opacity: 1;
}
.close:before, .close:after {
position: absolute;
left: 15px;
content: ' ';
height: 33px;
width: 2px;
background-color: rgba(241, 43, 36, 0.64);
}
.close:before {
transform: rotate(45deg);
}
.close:after {
transform: rotate(-45deg);
}
3 changes: 2 additions & 1 deletion demo/images_upload.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
<script type="text/javascript" src="../lib/jquery-1.9.0.min.js"></script>

<!-- Redactor is here -->
<script type="text/javascript" src="http://feather.aviary.com/imaging/v3/editor.js"></script>
<link rel="stylesheet" href="../redactor/redactor.css" />
<script src="../redactor/redactor.min.js"></script>
<script src="../redactor/redactor.js"></script>

<script type="text/javascript">
$(document).ready(
Expand Down
31 changes: 21 additions & 10 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,46 +4,57 @@
<title>Redactor</title>

<meta charset="utf-8">

<link rel="stylesheet" type="text/css" href="css/style.css" />
<!-- https://www.youtube.com/watch?v=JGwWNGJdvx8 -->
<link rel="stylesheet" type="text/css" href="css/style.css" />
<link rel="stylesheet" href="css/new.css">
<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">

<script src="lib/font-awesome.js"></script>
<script type="text/javascript" src="lib/jquery-1.9.0.min.js"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>



<!-- Redactor is here -->
<link rel="stylesheet" href="redactor/redactor.css" />
<script src="redactor/redactor.min.js"></script>

<link rel="stylesheet" href="redactor/redactor.css" />
<script type="text/javascript" src="lib/editor.js"></script>
<script src="redactor/redactor.js"></script>

<script type="text/javascript">
$(document).ready(
function()
{
$('#redactor').redactor();
}
);
</script>
</script>

<!-- <script src="redactor/plugin.js"></script> -->

</head>
<body>
<div id="page">

<textarea id="redactor" name="content">
<h2>Hello and Welcome</h2>
<p>Lorem ipsum <a href="http://test.com" title="dolor">dolor</a> sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p>Lorem ipsum dolro sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing <b>elit, sed do eiusmod tempor incididunt</b> ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
</textarea>

<br>
<h3>See other demos</h3>
<ul class="list">
<li><a href="demo/images_upload.html">Images upload</a></li>
<!-- <h3>See other demos</h3> -->
<!-- <ul class="list">
<li><a href="demo/images_json.html">Images JSON</a></li>
<li><a href="demo/files_upload.html">Files upload</a></li>
<li><a href="demo/all_uploads.html">All in one uploads</a></li>
<li><a href="demo/autosave.html">Autosave utility</a></li>
<li><a href="demo/fixed.html">Fixed toolbar</a></li>
<li><a href="demo/toolbar.html">Custom toolbar</a></li>
<li><a href="demo/post.html">Post form</a></li>
</ul>
</ul> -->
<!-- <li><a href="demo/images_upload.html">Images upload</a></li> -->


</div>
</body>
Expand Down
4 changes: 4 additions & 0 deletions lib/editor.js

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions lib/font-awesome.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions lib/jquery-1.9.1.min.js

Large diffs are not rendered by default.

Loading