Fix double carets when using Chinese input method
This commit is contained in:
parent
d172aaad1b
commit
5558aad414
@ -20,10 +20,13 @@
|
|||||||
"bootstrap-tour": "~0.6.0",
|
"bootstrap-tour": "~0.6.0",
|
||||||
"ace": "#51b7cb67a63998c9c0b7d089a85c60e032a7cc17",
|
"ace": "#51b7cb67a63998c9c0b7d089a85c60e032a7cc17",
|
||||||
"pagedown-ace": "git@github.com:benweet/pagedown-ace.git#master",
|
"pagedown-ace": "git@github.com:benweet/pagedown-ace.git#master",
|
||||||
"pagedown-extra": "git@github.com:jmcmanus/pagedown-extra.git#585e324bbfbf256b09bb396478b537aa8c243bbc",
|
"pagedown-extra": "git@github.com:jmcmanus/pagedown-extra.git#e31cb17885ec5decc002d7fdf70535bde2e0ce0e",
|
||||||
"crel": "git@github.com:KoryNunn/crel.git#8dbda04b129fc0aec01a2a080d1cab26816e11c1",
|
"crel": "git@github.com:KoryNunn/crel.git#8dbda04b129fc0aec01a2a080d1cab26816e11c1",
|
||||||
"waitForImages": "git@github.com:alexanderdickson/waitForImages.git#~1.4.2",
|
"waitForImages": "git@github.com:alexanderdickson/waitForImages.git#~1.4.2",
|
||||||
"to-markdown": "git@github.com:benweet/to-markdown.git#jquery",
|
"to-markdown": "git@github.com:benweet/to-markdown.git#jquery",
|
||||||
"js-yaml": "~2.1.0"
|
"js-yaml": "~2.1.0"
|
||||||
|
},
|
||||||
|
"resolutions": {
|
||||||
|
"jquery": "2.0.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
CACHE MANIFEST
|
CACHE MANIFEST
|
||||||
#Date Thu Sep 19 2013 20:55:35
|
#Date Sat Sep 21 2013 11:59:13
|
||||||
|
|
||||||
CACHE:
|
CACHE:
|
||||||
index.html
|
index.html
|
||||||
|
751
res-min/main.js
751
res-min/main.js
File diff suppressed because it is too large
Load Diff
@ -1417,7 +1417,7 @@ th.hidden-lg,td.hidden-lg{display:table-cell !important}
|
|||||||
@media (max-width:767px){.hidden-lg.hidden-xs{display:none !important} tr.hidden-lg.hidden-xs{display:none !important} th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm{display:none !important} tr.hidden-lg.hidden-sm{display:none !important} th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md{display:none !important} tr.hidden-lg.hidden-md{display:none !important} th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important} tr.hidden-lg{display:none !important} th.hidden-lg,td.hidden-lg{display:none !important}}.visible-print{display:none !important}
|
@media (max-width:767px){.hidden-lg.hidden-xs{display:none !important} tr.hidden-lg.hidden-xs{display:none !important} th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm{display:none !important} tr.hidden-lg.hidden-sm{display:none !important} th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md{display:none !important} tr.hidden-lg.hidden-md{display:none !important} th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important} tr.hidden-lg{display:none !important} th.hidden-lg,td.hidden-lg{display:none !important}}.visible-print{display:none !important}
|
||||||
tr.visible-print{display:none !important}
|
tr.visible-print{display:none !important}
|
||||||
th.visible-print,td.visible-print{display:none !important}
|
th.visible-print,td.visible-print{display:none !important}
|
||||||
@media print{.visible-print{display:block !important} tr.visible-print{display:table-row !important} th.visible-print,td.visible-print{display:table-cell !important} .hidden-print{display:none !important} tr.hidden-print{display:none !important} th.hidden-print,td.hidden-print{display:none !important}}.tour-backdrop{position:absolute;z-index:1009;background:#000;opacity:0.8;top:0;left:0;width:100%}
|
@media print{.visible-print{display:block !important} tr.visible-print{display:table-row !important} th.visible-print,td.visible-print{display:table-cell !important} .hidden-print{display:none !important} tr.hidden-print{display:none !important} th.hidden-print,td.hidden-print{display:none !important}}.tour-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1009;background-color:#000;opacity:0.8}
|
||||||
.tour-step-backdrop{position:relative;z-index:1011}
|
.tour-step-backdrop{position:relative;z-index:1011}
|
||||||
.tour-step-background{position:absolute;z-index:1010;background:#fff;border-radius:6px}
|
.tour-step-background{position:absolute;z-index:1010;background:#fff;border-radius:6px}
|
||||||
.popover[class*="tour-"] .popover-navigation{padding:9px 14px}
|
.popover[class*="tour-"] .popover-navigation{padding:9px 14px}
|
||||||
|
@ -1417,7 +1417,7 @@ th.hidden-lg,td.hidden-lg{display:table-cell !important}
|
|||||||
@media (max-width:767px){.hidden-lg.hidden-xs{display:none !important} tr.hidden-lg.hidden-xs{display:none !important} th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm{display:none !important} tr.hidden-lg.hidden-sm{display:none !important} th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md{display:none !important} tr.hidden-lg.hidden-md{display:none !important} th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important} tr.hidden-lg{display:none !important} th.hidden-lg,td.hidden-lg{display:none !important}}.visible-print{display:none !important}
|
@media (max-width:767px){.hidden-lg.hidden-xs{display:none !important} tr.hidden-lg.hidden-xs{display:none !important} th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm{display:none !important} tr.hidden-lg.hidden-sm{display:none !important} th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md{display:none !important} tr.hidden-lg.hidden-md{display:none !important} th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important} tr.hidden-lg{display:none !important} th.hidden-lg,td.hidden-lg{display:none !important}}.visible-print{display:none !important}
|
||||||
tr.visible-print{display:none !important}
|
tr.visible-print{display:none !important}
|
||||||
th.visible-print,td.visible-print{display:none !important}
|
th.visible-print,td.visible-print{display:none !important}
|
||||||
@media print{.visible-print{display:block !important} tr.visible-print{display:table-row !important} th.visible-print,td.visible-print{display:table-cell !important} .hidden-print{display:none !important} tr.hidden-print{display:none !important} th.hidden-print,td.hidden-print{display:none !important}}.tour-backdrop{position:absolute;z-index:1009;background:#000;opacity:0.8;top:0;left:0;width:100%}
|
@media print{.visible-print{display:block !important} tr.visible-print{display:table-row !important} th.visible-print,td.visible-print{display:table-cell !important} .hidden-print{display:none !important} tr.hidden-print{display:none !important} th.hidden-print,td.hidden-print{display:none !important}}.tour-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1009;background-color:#000;opacity:0.8}
|
||||||
.tour-step-backdrop{position:relative;z-index:1011}
|
.tour-step-backdrop{position:relative;z-index:1011}
|
||||||
.tour-step-background{position:absolute;z-index:1010;background:#fff;border-radius:6px}
|
.tour-step-background{position:absolute;z-index:1010;background:#fff;border-radius:6px}
|
||||||
.popover[class*="tour-"] .popover-navigation{padding:9px 14px}
|
.popover[class*="tour-"] .popover-navigation{padding:9px 14px}
|
||||||
|
@ -1417,7 +1417,7 @@ th.hidden-lg,td.hidden-lg{display:table-cell !important}
|
|||||||
@media (max-width:767px){.hidden-lg.hidden-xs{display:none !important} tr.hidden-lg.hidden-xs{display:none !important} th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm{display:none !important} tr.hidden-lg.hidden-sm{display:none !important} th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md{display:none !important} tr.hidden-lg.hidden-md{display:none !important} th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important} tr.hidden-lg{display:none !important} th.hidden-lg,td.hidden-lg{display:none !important}}.visible-print{display:none !important}
|
@media (max-width:767px){.hidden-lg.hidden-xs{display:none !important} tr.hidden-lg.hidden-xs{display:none !important} th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm{display:none !important} tr.hidden-lg.hidden-sm{display:none !important} th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md{display:none !important} tr.hidden-lg.hidden-md{display:none !important} th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important} tr.hidden-lg{display:none !important} th.hidden-lg,td.hidden-lg{display:none !important}}.visible-print{display:none !important}
|
||||||
tr.visible-print{display:none !important}
|
tr.visible-print{display:none !important}
|
||||||
th.visible-print,td.visible-print{display:none !important}
|
th.visible-print,td.visible-print{display:none !important}
|
||||||
@media print{.visible-print{display:block !important} tr.visible-print{display:table-row !important} th.visible-print,td.visible-print{display:table-cell !important} .hidden-print{display:none !important} tr.hidden-print{display:none !important} th.hidden-print,td.hidden-print{display:none !important}}.tour-backdrop{position:absolute;z-index:1009;background:#000;opacity:0.8;top:0;left:0;width:100%}
|
@media print{.visible-print{display:block !important} tr.visible-print{display:table-row !important} th.visible-print,td.visible-print{display:table-cell !important} .hidden-print{display:none !important} tr.hidden-print{display:none !important} th.hidden-print,td.hidden-print{display:none !important}}.tour-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1009;background-color:#000;opacity:0.8}
|
||||||
.tour-step-backdrop{position:relative;z-index:1011}
|
.tour-step-backdrop{position:relative;z-index:1011}
|
||||||
.tour-step-background{position:absolute;z-index:1010;background:#fff;border-radius:6px}
|
.tour-step-background{position:absolute;z-index:1010;background:#fff;border-radius:6px}
|
||||||
.popover[class*="tour-"] .popover-navigation{padding:9px 14px}
|
.popover[class*="tour-"] .popover-navigation{padding:9px 14px}
|
||||||
|
@ -1417,7 +1417,7 @@ th.hidden-lg,td.hidden-lg{display:table-cell !important}
|
|||||||
@media (max-width:767px){.hidden-lg.hidden-xs{display:none !important} tr.hidden-lg.hidden-xs{display:none !important} th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm{display:none !important} tr.hidden-lg.hidden-sm{display:none !important} th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md{display:none !important} tr.hidden-lg.hidden-md{display:none !important} th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important} tr.hidden-lg{display:none !important} th.hidden-lg,td.hidden-lg{display:none !important}}.visible-print{display:none !important}
|
@media (max-width:767px){.hidden-lg.hidden-xs{display:none !important} tr.hidden-lg.hidden-xs{display:none !important} th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm{display:none !important} tr.hidden-lg.hidden-sm{display:none !important} th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md{display:none !important} tr.hidden-lg.hidden-md{display:none !important} th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important} tr.hidden-lg{display:none !important} th.hidden-lg,td.hidden-lg{display:none !important}}.visible-print{display:none !important}
|
||||||
tr.visible-print{display:none !important}
|
tr.visible-print{display:none !important}
|
||||||
th.visible-print,td.visible-print{display:none !important}
|
th.visible-print,td.visible-print{display:none !important}
|
||||||
@media print{.visible-print{display:block !important} tr.visible-print{display:table-row !important} th.visible-print,td.visible-print{display:table-cell !important} .hidden-print{display:none !important} tr.hidden-print{display:none !important} th.hidden-print,td.hidden-print{display:none !important}}.tour-backdrop{position:absolute;z-index:1009;background:#000;opacity:0.8;top:0;left:0;width:100%}
|
@media print{.visible-print{display:block !important} tr.visible-print{display:table-row !important} th.visible-print,td.visible-print{display:table-cell !important} .hidden-print{display:none !important} tr.hidden-print{display:none !important} th.hidden-print,td.hidden-print{display:none !important}}.tour-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1009;background-color:#000;opacity:0.8}
|
||||||
.tour-step-backdrop{position:relative;z-index:1011}
|
.tour-step-backdrop{position:relative;z-index:1011}
|
||||||
.tour-step-background{position:absolute;z-index:1010;background:#fff;border-radius:6px}
|
.tour-step-background{position:absolute;z-index:1010;background:#fff;border-radius:6px}
|
||||||
.popover[class*="tour-"] .popover-navigation{padding:9px 14px}
|
.popover[class*="tour-"] .popover-navigation{padding:9px 14px}
|
||||||
|
@ -941,15 +941,16 @@
|
|||||||
<input type="text" id="input-settings-editor-font-family"
|
<input type="text" id="input-settings-editor-font-family"
|
||||||
class="form-control col-lg-7"> <input type="text"
|
class="form-control col-lg-7"> <input type="text"
|
||||||
id="input-settings-editor-font-size"
|
id="input-settings-editor-font-size"
|
||||||
class="form-control col-lg-2"> px
|
class="form-control col-lg-2"> px <span
|
||||||
|
class="help-block"> Only monospaced fonts are
|
||||||
|
supported.</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-lg-4 control-label"
|
<label class="col-lg-4 control-label"
|
||||||
for="input-settings-max-width">Max width</label>
|
for="input-settings-max-width">Max width</label>
|
||||||
<div class="col-lg-8 form-inline">
|
<div class="col-lg-8 form-inline">
|
||||||
<input type="text"
|
<input type="text" id="input-settings-max-width"
|
||||||
id="input-settings-max-width"
|
|
||||||
class="form-control col-lg-3"> px
|
class="form-control col-lg-3"> px
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -1033,9 +1034,9 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<a href="#" class="btn btn-default"
|
<a href="#" class="btn btn-default" data-dismiss="modal">Cancel</a>
|
||||||
data-dismiss="modal">Cancel</a> <a href="#"
|
<a href="#" class="btn btn-primary action-apply-settings"
|
||||||
class="btn btn-primary action-apply-settings" data-dismiss="modal">OK</a>
|
data-dismiss="modal">OK</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -512,7 +512,7 @@ define([
|
|||||||
var syncIndex = createSyncIndex(id);
|
var syncIndex = createSyncIndex(id);
|
||||||
var fileDesc = fileMgr.getFileFromSyncIndex(syncIndex);
|
var fileDesc = fileMgr.getFileFromSyncIndex(syncIndex);
|
||||||
if(fileDesc !== undefined) {
|
if(fileDesc !== undefined) {
|
||||||
fileMgr.selectFile(fileDesc);
|
fileDesc !== fileMgr.currentFile && fileMgr.selectFile(fileDesc);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
importIds.push(id);
|
importIds.push(id);
|
||||||
|
@ -949,6 +949,10 @@ ul,ol {
|
|||||||
.ace-tm {
|
.ace-tm {
|
||||||
background-color: @input-bg;
|
background-color: @input-bg;
|
||||||
|
|
||||||
|
.ace_text-input {
|
||||||
|
box-sizing: initial;
|
||||||
|
}
|
||||||
|
|
||||||
.ace_marker-layer .ace_active-line {
|
.ace_marker-layer .ace_active-line {
|
||||||
background-color: @primary-bg-lighter;
|
background-color: @primary-bg-lighter;
|
||||||
}
|
}
|
||||||
@ -1002,6 +1006,7 @@ ul,ol {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#wmd-input {
|
#wmd-input {
|
||||||
|
border-radius: @input-border-radius;
|
||||||
color: @primary-color-light;
|
color: @primary-color-light;
|
||||||
.box-shadow(none);
|
.box-shadow(none);
|
||||||
resize: none;
|
resize: none;
|
||||||
|
Loading…
Reference in New Issue
Block a user