Fixed IE9 compatibility
This commit is contained in:
commit
0636ad1c44
@ -28,7 +28,7 @@ define([], function() {
|
||||
constants.SSH_PROXY_URL = "https://stackedit-ssh-proxy.herokuapp.com/";
|
||||
constants.HTMLTOPDF_URL = "https://stackedit-htmltopdf.herokuapp.com/";
|
||||
|
||||
// Site dependent
|
||||
// Site dependent
|
||||
constants.BASE_URL = "http://localhost/";
|
||||
constants.GOOGLE_CLIENT_ID = '241271498917-lev37kef013q85avc91am1gccg5g8lrb.apps.googleusercontent.com';
|
||||
constants.GITHUB_CLIENT_ID = 'e47fef6055344579799d';
|
||||
|
@ -179,8 +179,6 @@ define([
|
||||
var selection = rangy.getSelection();
|
||||
selection.removeAllRanges();
|
||||
selection.addRange(range, this.selectionStart > this.selectionEnd);
|
||||
selection.detach();
|
||||
range.detach();
|
||||
};
|
||||
this.setSelectionStartEnd = function(start, end) {
|
||||
if(start === undefined) {
|
||||
@ -232,9 +230,7 @@ define([
|
||||
selectionEnd = offset + (range + '').length;
|
||||
}
|
||||
}
|
||||
selectionRange.detach();
|
||||
}
|
||||
selection.detach();
|
||||
self.setSelectionStartEnd(selectionStart, selectionEnd);
|
||||
}
|
||||
undoMgr.saveSelectionState();
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -117,7 +117,7 @@ define([
|
||||
};
|
||||
|
||||
DomObject.prototype.createToggler = function(backdrop) {
|
||||
var backdropElt;
|
||||
var $backdropElt;
|
||||
var pushedEvents = 0;
|
||||
this.toggle = function(show) {
|
||||
if(show === this.isOpen) {
|
||||
@ -127,7 +127,7 @@ define([
|
||||
if(this.isOpen) {
|
||||
this.$elt.addClass('panel-open').trigger('show.layout.toggle');
|
||||
if(backdrop) {
|
||||
$(backdropElt = utils.createBackdrop(wrapperL1.elt)).click(_.bind(function() {
|
||||
$backdropElt = $(utils.createBackdrop(wrapperL1.elt)).on('click.backdrop', _.bind(function() {
|
||||
this.toggle(false);
|
||||
}, this));
|
||||
this.$elt.addClass('bring-to-front');
|
||||
@ -140,8 +140,11 @@ define([
|
||||
}
|
||||
else {
|
||||
this.$elt.trigger('hide.layout.toggle');
|
||||
backdropElt && backdropElt.removeBackdrop();
|
||||
backdropElt = undefined;
|
||||
if($backdropElt) {
|
||||
$backdropElt.off('click.backdrop');
|
||||
$backdropElt[0].removeBackdrop();
|
||||
$backdropElt = undefined;
|
||||
}
|
||||
transitionEndCallbacks.push(_.bind(function() {
|
||||
if(--pushedEvents === 0) {
|
||||
!this.isOpen && this.$elt.removeClass('panel-open bring-to-front').trigger('hidden.layout.toggle');
|
||||
|
@ -91,8 +91,7 @@ define([
|
||||
var syncIndex = createSyncIndex(doc.id);
|
||||
var fileDesc = fileMgr.getFileFromSyncIndex(syncIndex);
|
||||
if(fileDesc !== undefined) {
|
||||
eventMgr.onError('"' + fileDesc.title + '" was already imported.');
|
||||
return;
|
||||
return eventMgr.onError('"' + fileDesc.title + '" was already imported.');
|
||||
}
|
||||
importIds.push(doc.id);
|
||||
});
|
||||
@ -109,16 +108,14 @@ define([
|
||||
var fileDesc = fileMgr.getFileFromSyncIndex(syncIndex);
|
||||
if(fileDesc !== undefined) {
|
||||
eventMgr.onError('File ID is already synchronized with "' + fileDesc.title + '".');
|
||||
callback(true);
|
||||
return;
|
||||
return callback(true);
|
||||
}
|
||||
}
|
||||
var parentId = utils.getInputTextValue('#input-sync-export-' + providerId + '-parentid');
|
||||
var data = gdriveProvider.serializeContent(content, discussionListJSON);
|
||||
googleHelper.upload(fileId, parentId, title, data, undefined, undefined, accountId, function(error, result) {
|
||||
if(error) {
|
||||
callback(error);
|
||||
return;
|
||||
return callback(error);
|
||||
}
|
||||
var syncAttributes = createSyncAttributes(result.id, result.etag, content, title, discussionListJSON);
|
||||
callback(undefined, syncAttributes);
|
||||
@ -128,7 +125,7 @@ define([
|
||||
gdriveProvider.syncUp = function(content, contentCRC, title, titleCRC, discussionList, discussionListCRC, syncAttributes, callback) {
|
||||
if(
|
||||
(syncAttributes.contentCRC == contentCRC) && // Content CRC hasn't changed
|
||||
(syncAttributes.titleCRC == titleCRC) && // Content CRC hasn't changed
|
||||
(syncAttributes.titleCRC == titleCRC) && // Title CRC hasn't changed
|
||||
(syncAttributes.discussionListCRC == discussionListCRC) // Discussion list CRC hasn't changed
|
||||
) {
|
||||
return callback(undefined, false);
|
||||
@ -144,8 +141,7 @@ define([
|
||||
var data = gdriveProvider.serializeContent(content, discussionList);
|
||||
googleHelper.upload(syncAttributes.id, undefined, title, data, undefined, syncAttributes.etag, accountId, function(error, result) {
|
||||
if(error) {
|
||||
callback(error, true);
|
||||
return;
|
||||
return callback(error, true);
|
||||
}
|
||||
syncAttributes.etag = result.etag;
|
||||
// Remove this deprecated flag if any
|
||||
@ -167,8 +163,7 @@ define([
|
||||
var lastChangeId = parseInt(storage[accountId + ".gdrive.lastChangeId"], 10);
|
||||
googleHelper.checkChanges(lastChangeId, accountId, function(error, changes, newChangeId) {
|
||||
if(error) {
|
||||
callback(error);
|
||||
return;
|
||||
return callback(error);
|
||||
}
|
||||
var interestingChanges = [];
|
||||
_.each(changes, function(change) {
|
||||
|
@ -1336,7 +1336,7 @@ div.dropdown-menu, {
|
||||
color: @link-hover-color;
|
||||
}
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
margin: 0.8em 0;
|
||||
margin: 1em 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -349,6 +349,36 @@ define([
|
||||
].join(""));
|
||||
};
|
||||
|
||||
var $windowElt = $(window);
|
||||
utils.iframe = function(url, width, height) {
|
||||
var $backdropElt = $(utils.createBackdrop());
|
||||
var result = crel('iframe', {
|
||||
src: url,
|
||||
frameborder: 0,
|
||||
class: 'modal-content modal-iframe'
|
||||
});
|
||||
document.body.appendChild(result);
|
||||
function placeIframe() {
|
||||
var actualWidth = window.innerWidth - 20;
|
||||
actualWidth > width && (actualWidth = width);
|
||||
var actualHeight = window.innerHeight - 50;
|
||||
actualHeight > height && (actualHeight = height);
|
||||
result.setAttribute('width', actualWidth);
|
||||
result.setAttribute('height', actualHeight);
|
||||
}
|
||||
placeIframe();
|
||||
$windowElt.on('resize.iframe', placeIframe);
|
||||
function removeIframe() {
|
||||
$backdropElt.off('click.backdrop');
|
||||
$backdropElt[0].removeBackdrop();
|
||||
$windowElt.off('resize.iframe');
|
||||
result.parentNode.removeChild(result);
|
||||
}
|
||||
result.removeIframe = removeIframe;
|
||||
$backdropElt.on('click.backdrop', removeIframe);
|
||||
return result;
|
||||
};
|
||||
|
||||
// Shows a dialog to force the user to click a button before opening oauth popup
|
||||
var redirectCallbackConfirm;
|
||||
var redirectCallbackCancel;
|
||||
|
Loading…
Reference in New Issue
Block a user