Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unnamed/numeric attribute fix (revised) #198

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
+2,460 −37
Open

Unnamed/numeric attribute fix (revised) #198

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7151827
Merge pull request #2 from fusioneng/master
bfintal Feb 19, 2015
44001d0
Merge pull request #3 from fusioneng/master
bfintal Feb 23, 2015
85919fa
Merge pull request #4 from fusioneng/master
bfintal Feb 25, 2015
2b76387
Numeric attribute fix (revised)
bfintal Feb 25, 2015
75c6192
Removed quotes on unnamed attributes
bfintal Feb 26, 2015
2169cbb
Merge pull request #7 from fusioneng/master
bfintal Feb 27, 2015
5cf76c5
Preserve empty unnamed attributes
bfintal Feb 28, 2015
6933baa
Merge pull request #8 from fusioneng/master
bfintal Mar 1, 2015
020fdef
Merge pull request #9 from fusioneng/master
bfintal Mar 5, 2015
c15c6aa
Merge branch 'master' into numeric-attribute-fix-2
bfintal Mar 5, 2015
e32b259
Synced to master, but now not working
bfintal Apr 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 45 additions & 12 deletions js/build/shortcode-ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,15 @@ var Shortcode = Backbone.Model.extend({
if ( attr.get( 'attr' ) === 'content' ) {
content = attr.get( 'value' );
} else {
attrs.push( attr.get( 'attr' ) + '="' + attr.get( 'value' ) + '"' );

// Numeric attribute names
if ( ! isNaN( attr.get( 'attr' ) ) ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lots of double negatives here... We could check $.isNumeric( attr.get( 'attr' ) ) instead?

attrs.push( attr.get( 'value' ) );

// String attribute names
} else {
attrs.push( attr.get( 'attr' ) + '="' + attr.get( 'value' ) + '"' );
}
}

} );
Expand Down Expand Up @@ -356,6 +364,13 @@ var shortcodeViewConstructor = {
options.shortcode.attrs.named[ attr.get( 'attr') ]
);
}

if ( attr.get( 'attr') in options.shortcode.attrs.numeric ) {
attr.set(
'value',
options.shortcode.attrs.numeric[ attr.get( 'attr') ]
);
}

if ( attr.get( 'attr' ) === 'content' && ( 'content' in options.shortcode ) ) {
attr.set( 'value', options.shortcode.content );
Expand Down Expand Up @@ -430,19 +445,37 @@ var shortcodeViewConstructor = {

if (matches[2]) {

attributeMatches = matches[2].match(/(\S+?=".*?")/g) || [];
// Get all the attributes
attributeMatches = matches[2].match(/([^\s]+)/g) || [];

// convert attribute strings to object.
for (var i = 0; i < attributeMatches.length; i++) {
// Keep track of all the unnamed attributes
var unnamedIndex = 0;

var bitsRegEx = /(\S+?)="(.*?)"/g;
var bits = bitsRegEx.exec(attributeMatches[i]);

attr = currentShortcode.get('attrs').findWhere({
attr : bits[1]
});
if (attr) {
attr.set('value', bits[2]);
// convert attribute strings to object.
for (var i = 0; i < attributeMatches.length; i++) {

// Handler for named attributes
if (attributeMatches[i].match(/\S+?="(.*?)"/) !== null ) {

var bitsRegEx = /(\S+?)="(.*?)"/g;
var bits = bitsRegEx.exec(attributeMatches[i]);

attr = currentShortcode.get('attrs').findWhere({
attr : bits[1]
});
if (attr) {
attr.set('value', bits[2]);
}

// Handler for numeric/unnamed attributes
} else {

attr = currentShortcode.get('attrs').findWhere({
attr : (unnamedIndex++).toString()
});
if (attr) {
attr.set('value', attributeMatches[i].replace(/^"(.*)"$/, '$1'));
}
}

}
Expand Down
10 changes: 9 additions & 1 deletion js/models/shortcode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,15 @@ var Shortcode = Backbone.Model.extend({
if ( attr.get( 'attr' ) === 'content' ) {
content = attr.get( 'value' );
} else {
attrs.push( attr.get( 'attr' ) + '="' + attr.get( 'value' ) + '"' );

// Numeric attribute names
if ( ! isNaN( attr.get( 'attr' ) ) ) {
attrs.push( attr.get( 'value' ) );

// String attribute names
} else {
attrs.push( attr.get( 'attr' ) + '="' + attr.get( 'value' ) + '"' );
}
}

} );
Expand Down
47 changes: 36 additions & 11 deletions js/utils/shortcode-view-constructor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ var shortcodeViewConstructor = {
options.shortcode.attrs.named[ attr.get( 'attr') ]
);
}

if ( attr.get( 'attr') in options.shortcode.attrs.numeric ) {
attr.set(
'value',
options.shortcode.attrs.numeric[ attr.get( 'attr') ]
);
}

if ( attr.get( 'attr' ) === 'content' && ( 'content' in options.shortcode ) ) {
attr.set( 'value', options.shortcode.content );
Expand Down Expand Up @@ -100,19 +107,37 @@ var shortcodeViewConstructor = {

if (matches[2]) {

attributeMatches = matches[2].match(/(\S+?=".*?")/g) || [];
// Get all the attributes
attributeMatches = matches[2].match(/([^\s]+)/g) || [];

// convert attribute strings to object.
for (var i = 0; i < attributeMatches.length; i++) {

var bitsRegEx = /(\S+?)="(.*?)"/g;
var bits = bitsRegEx.exec(attributeMatches[i]);
// Keep track of all the unnamed attributes
var unnamedIndex = 0;

attr = currentShortcode.get('attrs').findWhere({
attr : bits[1]
});
if (attr) {
attr.set('value', bits[2]);
// convert attribute strings to object.
for (var i = 0; i < attributeMatches.length; i++) {

// Handler for named attributes
if (attributeMatches[i].match(/\S+?="(.*?)"/) !== null ) {

var bitsRegEx = /(\S+?)="(.*?)"/g;
var bits = bitsRegEx.exec(attributeMatches[i]);

attr = currentShortcode.get('attrs').findWhere({
attr : bits[1]
});
if (attr) {
attr.set('value', bits[2]);
}

// Handler for numeric/unnamed attributes
} else {

attr = currentShortcode.get('attrs').findWhere({
attr : (unnamedIndex++).toString()
});
if (attr) {
attr.set('value', attributeMatches[i].replace(/^"(.*)"$/, '$1'));
}
}

}
Expand Down