scrivito_editors 1.6.0.rc1 → 1.6.0.rc2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b1e64036fba4d9337ff09359bca23128bd2331ce
4
- data.tar.gz: ad8cb2a6a261240c62a490899fd0e6b84de406cd
3
+ metadata.gz: d928f09d54c370ac80ab2e6cd078a09ecc6bcbb8
4
+ data.tar.gz: 80d1b7f14740c62259b1cf969507845495a07644
5
5
  SHA512:
6
- metadata.gz: cd8bbbfc314996b164ead0662a4f6680124709d236260b49cfa19aea2a1dfa9b60c4244e9870c9058918ce793ff71fefe4fb1a78cf4269c2b23b545f81e81ab5
7
- data.tar.gz: 747e1b0e15718226cb645d9c779ac1bff7321803a942e0ca86913c4d46b4c4698b811b43f2f5fc7853bb506f3697f463cffcb89ee76d78cd15c94261f578f48b
6
+ metadata.gz: ec51652bd1f4de3f6a134beacb22a7753b5545dfb269fe8236f16b538ccef0e5da1143cf326b4d20daf791a0b70ada3f589541af2b1fc723633f5ae8718149d6
7
+ data.tar.gz: bd8ca4aace4ad52ba831a7814b47b0a9b5b6f5e4bf4ef5cd636187b7bb37d4ac5a1b80f8214baeffadbcf92568ed69d5ee208db5391fcf703cddd57d6e640952
data/README.md CHANGED
@@ -20,7 +20,7 @@ Please visit our Documentation to get the
20
20
 
21
21
 
22
22
  ## License
23
- Copyright (c) 2009 - 2014 Infopark AG (http://www.infopark.com)
23
+ Copyright (c) 2009 - 2016 Infopark AG (http://www.infopark.com)
24
24
 
25
25
  This software can be used and modified under the LGPL-3.0. Please refer to
26
26
  http://www.gnu.org/licenses/lgpl-3.0.html for the license text.
@@ -16,4 +16,8 @@
16
16
  }
17
17
  };
18
18
 
19
+ scrivito.editors._showButtonContainerProgress = function(element) {
20
+ return element.parent(".scrivito-editor-button-container").addClass("scrivito_element_overlay");
21
+ };
22
+
19
23
  }).call(this);
@@ -52,10 +52,10 @@
52
52
  };
53
53
 
54
54
  setup_image_kit_container = function(element, dialog) {
55
- var container, image;
56
- container = $(".image_kit_start");
57
- image = new Image();
58
55
  return element.scrivito('content').noCacheUrl().then(function(no_cache_url) {
56
+ var container, image;
57
+ container = $(".image_kit_start");
58
+ image = new Image();
59
59
  image.crossOrigin = "Anonymous";
60
60
  image.src = no_cache_url;
61
61
  image.onerror = function() {
@@ -79,6 +79,7 @@
79
79
 
80
80
  save_edited_image = function(element, kit) {
81
81
  return kit.render("blob", "image/jpeg").then(function(blob) {
82
+ scrivito.editors._showButtonContainerProgress(element);
82
83
  return element.scrivito("save", scrivito.upload_binary({
83
84
  blob: blob,
84
85
  filename: element.scrivito("content").filename
@@ -1,5 +1,5 @@
1
1
  (function() {
2
- var DOUBLE_CLICK_MS, _deprecationLogged, activate, cleanUp, cmsFieldAndPastedContent, finishEditing, getCurrentContent, isNewlineAllowed, onBlur, onFocus, onInput, onKey, prepareForEditing, save;
2
+ var DOUBLE_CLICK_MS, activate, cleanUp, cmsFieldAndPastedContent, finishEditing, getCurrentContent, isNewlineAllowed, onBlur, onFocus, onInput, onKey, prepareForEditing, save;
3
3
 
4
4
  onKey = function(event) {
5
5
  var cmsField, key;
@@ -80,16 +80,7 @@
80
80
  }
81
81
  };
82
82
 
83
- _deprecationLogged = false;
84
-
85
83
  isNewlineAllowed = function(cmsField) {
86
- if (cmsField.data('editor') === 'text') {
87
- if (!_deprecationLogged) {
88
- console.warn('Scrivito editors: data-editor="text" is deprecated, please use {data: {scrivito_editors_multiline: true}}, editor: "string" instead.');
89
- _deprecationLogged = true;
90
- }
91
- return true;
92
- }
93
84
  if (cmsField.data('scrivitoEditorsMultiline') === true) {
94
85
  return true;
95
86
  }
@@ -6,6 +6,9 @@
6
6
  activate: function(element) {
7
7
  var field;
8
8
  field = $(element);
9
+ if (!field.is("[tabindex]")) {
10
+ field.attr("tabindex", 0);
11
+ }
9
12
  return field.tagEditor({
10
13
  initialTags: field.scrivito('content'),
11
14
  autocomplete: {
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: scrivito_editors
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.0.rc1
4
+ version: 1.6.0.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scrivito
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-10-12 00:00:00.000000000 Z
11
+ date: 2016-11-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jquery-ui-rails
@@ -44,28 +44,28 @@ dependencies:
44
44
  requirements:
45
45
  - - '='
46
46
  - !ruby/object:Gem::Version
47
- version: 1.6.0.rc1
47
+ version: 1.6.0.rc2
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - '='
53
53
  - !ruby/object:Gem::Version
54
- version: 1.6.0.rc1
54
+ version: 1.6.0.rc2
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: scrivito_sdk
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 1.6.0.rc1
61
+ version: 1.6.0.rc2
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - '='
67
67
  - !ruby/object:Gem::Version
68
- version: 1.6.0.rc1
68
+ version: 1.6.0.rc2
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: coffee-rails
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -168,8 +168,8 @@ files:
168
168
  - app/assets/javascripts/scrivito_editors/default_editor.js
169
169
  - app/assets/javascripts/scrivito_editors/enum_editor.js
170
170
  - app/assets/javascripts/scrivito_editors/filter_context.js
171
+ - app/assets/javascripts/scrivito_editors/helpers/button_container.js
171
172
  - app/assets/javascripts/scrivito_editors/helpers/imgly_assets.js.erb
172
- - app/assets/javascripts/scrivito_editors/helpers/setup_button_container.js
173
173
  - app/assets/javascripts/scrivito_editors/html_editor.js
174
174
  - app/assets/javascripts/scrivito_editors/image_editor.js
175
175
  - app/assets/javascripts/scrivito_editors/link_editor.js