Skip to content

Commit 97cbff1

Browse files
Jeremy15aJeremy Amador
Jeremy15a
and
Jeremy Amador
authored
update deprecated methods to be compatible with jq3 (#105)
Co-authored-by: Jeremy Amador <[email protected]>
1 parent 6931037 commit 97cbff1

28 files changed

+273
-288
lines changed

‎build/changelog/entries/legacy/0.21.3/2669.enhancement

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Added a new block implementation of Aloha Editor blocks, which
55
To use this block type, just wrap your tag content in a <div>
66
with the following attribute:
77

8-
data-aloha-block-type="EmptyBlock"
8+
data-alohaBlockType="EmptyBlock"

‎build/r.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2939,7 +2939,7 @@ define('rhino/file', function () {
29392939
//Java's version of copy file.
29402940
srcChannel = new java.io.FileInputStream(srcFileName).getChannel();
29412941
destChannel = new java.io.FileOutputStream(destFileName).getChannel();
2942-
destChannel.transferFrom(srcChannel, 0, srcChannel.size());
2942+
destChannel.transferFrom(srcChannel, 0, srcChannel.length);
29432943
srcChannel.close();
29442944
destChannel.close();
29452945

‎doc/guides/source/plugin_block.textile

+8-8
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ All block attributes that start with +aloha-block-+ are *internal* and can *only
9696

9797
h4. Block Types
9898

99-
One special block attribute is called +aloha-block-type+, which must be set to one of the block types registered at the @BlockManager@. It can be only set during construction time, and if it is not set, the @DefaultBlock@ is automatically chosen.
99+
One special block attribute is called +alohaBlockType+, which must be set to one of the block types registered at the @BlockManager@. It can be only set during construction time, and if it is not set, the @DefaultBlock@ is automatically chosen.
100100

101101
Depending on the block type, a different @Block@ class will be instantiated. Later, you will be introduced to writing your own block type.
102102

@@ -109,13 +109,13 @@ h4. Block Attribute Overriding Sources
109109

110110
When calling @.alohaBlock@ on an element, the following data is merged together:
111111

112-
* @{ aloha-block-type: 'DefaultBlock' }@
112+
* @{ alohaBlockType: 'DefaultBlock' }@
113113
* The block attributes specified in the @.alohaBlock(attr)@ function
114114
* All @data-@ attributes on the corresponding DOM node.
115115

116-
That is, if a DOM node that should be blockified has a @data-aloha-block-type@ property, this property is always used. Otherwise, the @aloha-block-type@ property from the @.alohaBlock()@ function is used (if given). If nothing is specified, the @DefaultBlock@ is used.
116+
That is, if a DOM node that should be blockified has a @data-alohaBlockType@ property, this property is always used. Otherwise, the @alohaBlockType@ property from the @.alohaBlock()@ function is used (if given). If nothing is specified, the @DefaultBlock@ is used.
117117

118-
The same is done for all block attributes, not only @aloha-block-type@.
118+
The same is done for all block attributes, not only @alohaBlockType@.
119119

120120
h4. Default Settings
121121

@@ -124,10 +124,10 @@ Block construction such as the following is very common:
124124
<javascript>
125125
Aloha.ready(function() {
126126
Aloha.jQuery('.foo').alohaBlock({
127-
'aloha-block-type': 'MySpecialBlock'
127+
'alohaBlockType': 'MySpecialBlock'
128128
});
129129
Aloha.jQuery('.bar').alohaBlock({
130-
'aloha-block-type': 'DebugBlock'
130+
'alohaBlockType': 'DebugBlock'
131131
});
132132
});
133133
</javascript>
@@ -137,10 +137,10 @@ To make such initialization code easier to write and more declarative, this can
137137
<javascript>
138138
Aloha.settings.plugins.block.defaults {
139139
'.foo': {
140-
'aloha-block-type': 'MySpecialBlock'
140+
'alohaBlockType': 'MySpecialBlock'
141141
},
142142
'.bar': {
143-
'aloha-block-type': 'DebugBlock'
143+
'alohaBlockType': 'DebugBlock'
144144
}
145145
}
146146
</javascript>

‎src/demo/block/dragdrop.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,31 @@
1616
'.default-block': {
1717
},
1818
'.columnBlock': {
19-
'aloha-block-type': 'ColumnBlock'
19+
'alohaBlockType': 'ColumnBlock'
2020
},
2121
'.uneditableColumnBlock': {
22-
'aloha-block-type': 'UneditableColumnBlock'
22+
'alohaBlockType': 'UneditableColumnBlock'
2323
},
2424
'.product-teaser': {
25-
'aloha-block-type': 'ProductTeaserBlock'
25+
'alohaBlockType': 'ProductTeaserBlock'
2626
},
2727
'.company': {
28-
'aloha-block-type': 'CompanyBlock'
28+
'alohaBlockType': 'CompanyBlock'
2929
},
3030
'.imageBlock': {
31-
'aloha-block-type': 'ImageBlock'
31+
'alohaBlockType': 'ImageBlock'
3232
},
3333
'.editableImageBlock': {
34-
'aloha-block-type': 'EditableImageBlock'
34+
'alohaBlockType': 'EditableImageBlock'
3535
},
3636
'.news-block': {
37-
'aloha-block-type': 'NewsBlock'
37+
'alohaBlockType': 'NewsBlock'
3838
},
3939
'.sortable-news-block': {
40-
'aloha-block-type': 'SortableNewsBlock'
40+
'alohaBlockType': 'SortableNewsBlock'
4141
},
4242
'.editable-product-teaser': {
43-
'aloha-block-type': 'EditableProductTeaserBlock'
43+
'alohaBlockType': 'EditableProductTeaserBlock'
4444
}
4545
},
4646
dragdrop: "1",

‎src/demo/block/index.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,31 @@
1616
'.default-block': {
1717
},
1818
'.columnBlock': {
19-
'aloha-block-type': 'ColumnBlock'
19+
'alohaBlockType': 'ColumnBlock'
2020
},
2121
'.uneditableColumnBlock': {
22-
'aloha-block-type': 'UneditableColumnBlock'
22+
'alohaBlockType': 'UneditableColumnBlock'
2323
},
2424
'.product-teaser': {
25-
'aloha-block-type': 'ProductTeaserBlock'
25+
'alohaBlockType': 'ProductTeaserBlock'
2626
},
2727
'.company': {
28-
'aloha-block-type': 'CompanyBlock'
28+
'alohaBlockType': 'CompanyBlock'
2929
},
3030
'.imageBlock': {
31-
'aloha-block-type': 'ImageBlock'
31+
'alohaBlockType': 'ImageBlock'
3232
},
3333
'.editableImageBlock': {
34-
'aloha-block-type': 'EditableImageBlock'
34+
'alohaBlockType': 'EditableImageBlock'
3535
},
3636
'.news-block': {
37-
'aloha-block-type': 'NewsBlock'
37+
'alohaBlockType': 'NewsBlock'
3838
},
3939
'.sortable-news-block': {
40-
'aloha-block-type': 'SortableNewsBlock'
40+
'alohaBlockType': 'SortableNewsBlock'
4141
},
4242
'.editable-product-teaser': {
43-
'aloha-block-type': 'EditableProductTeaserBlock'
43+
'alohaBlockType': 'EditableProductTeaserBlock'
4444
}
4545
}
4646
}

‎src/demo/modules/block.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,31 @@
1818
'.default-block': {
1919
},
2020
'.columnBlock': {
21-
'aloha-block-type': 'ColumnBlock'
21+
'alohaBlockType': 'ColumnBlock'
2222
},
2323
'.uneditableColumnBlock': {
24-
'aloha-block-type': 'UneditableColumnBlock'
24+
'alohaBlockType': 'UneditableColumnBlock'
2525
},
2626
'.product-teaser': {
27-
'aloha-block-type': 'ProductTeaserBlock'
27+
'alohaBlockType': 'ProductTeaserBlock'
2828
},
2929
'.company': {
30-
'aloha-block-type': 'CompanyBlock'
30+
'alohaBlockType': 'CompanyBlock'
3131
},
3232
'.imageBlock': {
33-
'aloha-block-type': 'ImageBlock'
33+
'alohaBlockType': 'ImageBlock'
3434
},
3535
'.editableImageBlock': {
36-
'aloha-block-type': 'EditableImageBlock'
36+
'alohaBlockType': 'EditableImageBlock'
3737
},
3838
'.news-block': {
39-
'aloha-block-type': 'NewsBlock'
39+
'alohaBlockType': 'NewsBlock'
4040
},
4141
'.sortable-news-block': {
42-
'aloha-block-type': 'SortableNewsBlock'
42+
'alohaBlockType': 'SortableNewsBlock'
4343
},
4444
'.editable-product-teaser': {
45-
'aloha-block-type': 'EditableProductTeaserBlock'
45+
'alohaBlockType': 'EditableProductTeaserBlock'
4646
}
4747
}
4848
}

‎src/lib/aloha/jquery.aloha.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ define([
5959

6060
if (this[0].nodeType !== 3) {
6161
// we are not in a text node, just insert the element at the corresponding position
62-
offSize = this.children().size();
62+
offSize = this.children().length;
6363
if (offset > offSize) {
6464
offset = offSize;
6565
}
@@ -385,7 +385,7 @@ define([
385385
|| $el.innerWidth() < el.scrollWidth;
386386
}
387387

388-
jQuery.expr[':'].hasScroll = hasScroll;
388+
jQuery.expr.pseudos.hasScroll = hasScroll;
389389

390390
/*
391391
* jQuery Hotkeys Plugin

0 commit comments

Comments
 (0)