Skip to content

Commit

Permalink
Merge pull request #6 from yakovlevga/mobile-fixes
Browse files Browse the repository at this point in the history
Fixed tools button visibility for mobile clients and safari
  • Loading branch information
yakovlevga authored Nov 3, 2017
2 parents 12097cb + 5066c48 commit 08e69a1
Show file tree
Hide file tree
Showing 9 changed files with 172 additions and 175 deletions.
1 change: 0 additions & 1 deletion build/css/jquery.brickyeditor.css
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@
right: 0;
z-index: 101;
background: rgba(238, 238, 238, 0.5);
overflow: hidden;
-webkit-transition: all .15s ease-in 0s;
-moz-transition: all .15s ease-in 0s;
transition: all .15s ease-in 0s; }
Expand Down
2 changes: 1 addition & 1 deletion build/css/jquery.brickyeditor.min.css

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

168 changes: 84 additions & 84 deletions build/js/jquery.brickyeditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -682,90 +682,6 @@ var BrickyEditor;
})(Fields = BrickyEditor.Fields || (BrickyEditor.Fields = {}));
})(BrickyEditor || (BrickyEditor = {}));
var BrickyEditor;
(function (BrickyEditor) {
var Services;
(function (Services) {
var EmbedService = (function () {
function EmbedService() {
}
EmbedService.getEmbedAsync = function (url) {
var task = $.Deferred();
var url = "https://noembed.com/embed?url=" + url;
$.ajax({
url: url,
type: "get",
dataType: "jsonp"
})
.done(function (json) {
task.resolve(json);
})
.fail(function (err) {
task.reject(err);
});
return task;
};
EmbedService.processEmbed = function (provider) {
switch (provider) {
case EmbedService.Instagram:
if (instgrm) {
instgrm.Embeds.process();
}
break;
default:
break;
}
};
EmbedService.Instagram = 'Instagram';
return EmbedService;
}());
Services.EmbedService = EmbedService;
})(Services = BrickyEditor.Services || (BrickyEditor.Services = {}));
})(BrickyEditor || (BrickyEditor = {}));
var BrickyEditor;
(function (BrickyEditor) {
var Services;
(function (Services) {
var TemplateService = (function () {
function TemplateService() {
}
TemplateService.loadTemplatesAsync = function (editor) {
var _this = this;
var result = $.Deferred();
$.get(editor.options.templatesUrl)
.done(function (data) {
_this.templates = [];
var $style = $(data).filter('style');
if ($style && $style.length > 0) {
editor.$editor.prepend($style);
}
var $templates = $(data).filter('.bre-template');
$templates.each(function (idx, t) {
var template = new BrickyEditor.Template(t);
_this.templates.push(template);
});
result.resolve(_this.templates);
})
.fail(function (err) {
console.log('Templates file not found.');
result.fail(err);
});
return result;
};
TemplateService.getTemplate = function (templateName) {
for (var i = 0; i < this.templates.length; i++) {
var template = this.templates[i];
if (template.name.toLowerCase() === templateName.toLowerCase()) {
return template;
}
}
return null;
};
return TemplateService;
}());
Services.TemplateService = TemplateService;
})(Services = BrickyEditor.Services || (BrickyEditor.Services = {}));
})(BrickyEditor || (BrickyEditor = {}));
var BrickyEditor;
(function (BrickyEditor) {
var Prompt;
(function (Prompt) {
Expand Down Expand Up @@ -946,6 +862,90 @@ var BrickyEditor;
})(Prompt = BrickyEditor.Prompt || (BrickyEditor.Prompt = {}));
})(BrickyEditor || (BrickyEditor = {}));
var BrickyEditor;
(function (BrickyEditor) {
var Services;
(function (Services) {
var EmbedService = (function () {
function EmbedService() {
}
EmbedService.getEmbedAsync = function (url) {
var task = $.Deferred();
var url = "https://noembed.com/embed?url=" + url;
$.ajax({
url: url,
type: "get",
dataType: "jsonp"
})
.done(function (json) {
task.resolve(json);
})
.fail(function (err) {
task.reject(err);
});
return task;
};
EmbedService.processEmbed = function (provider) {
switch (provider) {
case EmbedService.Instagram:
if (instgrm) {
instgrm.Embeds.process();
}
break;
default:
break;
}
};
EmbedService.Instagram = 'Instagram';
return EmbedService;
}());
Services.EmbedService = EmbedService;
})(Services = BrickyEditor.Services || (BrickyEditor.Services = {}));
})(BrickyEditor || (BrickyEditor = {}));
var BrickyEditor;
(function (BrickyEditor) {
var Services;
(function (Services) {
var TemplateService = (function () {
function TemplateService() {
}
TemplateService.loadTemplatesAsync = function (editor) {
var _this = this;
var result = $.Deferred();
$.get(editor.options.templatesUrl)
.done(function (data) {
_this.templates = [];
var $style = $(data).filter('style');
if ($style && $style.length > 0) {
editor.$editor.prepend($style);
}
var $templates = $(data).filter('.bre-template');
$templates.each(function (idx, t) {
var template = new BrickyEditor.Template(t);
_this.templates.push(template);
});
result.resolve(_this.templates);
})
.fail(function (err) {
console.log('Templates file not found.');
result.fail(err);
});
return result;
};
TemplateService.getTemplate = function (templateName) {
for (var i = 0; i < this.templates.length; i++) {
var template = this.templates[i];
if (template.name.toLowerCase() === templateName.toLowerCase()) {
return template;
}
}
return null;
};
return TemplateService;
}());
Services.TemplateService = TemplateService;
})(Services = BrickyEditor.Services || (BrickyEditor.Services = {}));
})(BrickyEditor || (BrickyEditor = {}));
var BrickyEditor;
(function (BrickyEditor) {
var HtmlTools = (function () {
function HtmlTools(editor) {
Expand Down
2 changes: 1 addition & 1 deletion build/js/jquery.brickyeditor.min.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/jquery.brickyeditor.css
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@
right: 0;
z-index: 101;
background: rgba(238, 238, 238, 0.5);
overflow: hidden;
-webkit-transition: all .15s ease-in 0s;
-moz-transition: all .15s ease-in 0s;
transition: all .15s ease-in 0s; }
Expand Down
Loading

0 comments on commit 08e69a1

Please sign in to comment.