conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
var matchTextWithWord = require( "./stringProcessing/matchTextWithWord.js" );
var keywordCount = matchTextWithWord( this.config.text, this.config.keyword );
=======
var keywordMatches = this.preProcessor.__store.cleanTextSomeTags.match( this.keywordRegex );
var keywordCount = 0;
if ( keywordMatches !== null ) {
keywordCount = keywordMatches.length;
}
this.__store.keywordCount = keywordCount;
>>>>>>>
var matchTextWithWord = require( "stringProcessing/matchTextWithWord.js" );
var keywordCount = matchTextWithWord( this.config.text, this.config.keyword );
<<<<<<<
var checkStringForStopwords = require( "./analyses/checkStringForStopwords.js" );
var matches = checkStringForStopwords( this.config.keyword );
/* Matchestext is used for scoring, we should move this to the scoring */
=======
var keyword = this.config.keyword;
var stopWord, stopWordCount = 0;
>>>>>>>
var checkStringForStopwords = require( "analyses/checkStringForStopwords.js" );
var matches = checkStringForStopwords( this.config.keyword );
/* Matchestext is used for scoring, we should move this to the scoring */
<<<<<<<
count: matches.length,
=======
count: stopWordCount,
>>>>>>>
count: matches.length,
<<<<<<<
var countImages = require( "./analyses/getImageStatistics.js" );
return [ { test: "imageCount", result: countImages( this.config.text, this.config.keyword ) } ];
=======
var imageCount = { total: 0, alt: 0, noAlt: 0, altKeyword: 0, altNaKeyword: 0 };
//matches everything in the <img>-tag, case insensitive and global
var imageMatches = this.preProcessor.__store.originalText.match( /<img(?:[^>]+)?>/ig );
if ( imageMatches !== null ) {
imageCount.total = imageMatches.length;
for ( var i = 0; i < imageMatches.length; i++ ) {
//matches everything in the alt attribute, case insensitive and global.
var alttag = imageMatches[ i ].match( /alt=([\'\"])(.*?)\1/ig );
if ( this.imageAlttag( alttag ) ) {
if ( this.config.keyword !== "" ) {
if ( this.imageAlttagKeyword( alttag ) ) {
imageCount.altKeyword++;
} else {
//this counts all alt-tags w/o the keyword when a keyword is set.
imageCount.alt++;
}
} else {
imageCount.altNaKeyword++;
}
} else {
imageCount.noAlt++;
}
}
}
return [ { test: "imageCount", result: imageCount } ];
};
/**
* checks if the alttag contains any text.
* @param image
* @returns {boolean}
*/
YoastSEO.Analyzer.prototype.imageAlttag = function( image ) {
var hasAlttag = false;
if ( image !== null ) {
var alt = image[ 0 ].split( "=" )[ 1 ];
//Checks if the alttag of the given image isn't empty after whitespaces are removed.
if ( alt !== null && this.stringHelper.stripSpaces( alt.replace( /[\'\"]*/g, "" ) ) !== "" ) {
hasAlttag = true;
}
}
return hasAlttag;
};
/**
* checks if the alttag matches the keyword
* @param image
* @returns {boolean}
*/
YoastSEO.Analyzer.prototype.imageAlttagKeyword = function( image ) {
var hasKeyword = false;
if ( image !== null ) {
if ( this.preProcessor.replaceDiacritics( image[ 0 ] ).match( this.keywordRegex ) !== null ) {
hasKeyword = true;
}
}
return hasKeyword;
>>>>>>>
var countImages = require( "analyses/getImageStatistics.js" );
return [ { test: "imageCount", result: countImages( this.config.text, this.config.keyword ) } ];
<<<<<<<
var findKeywordInPageTitle = require ( "./analyses/findKeywordInPageTitle.js" );
var result = [ { test: "pageTitleKeyword", result: { position: -1, matches: 0 } } ];
if ( typeof this.config.pageTitle !== "undefined" && typeof this.config.keyword !== "undefined" ) {
result[0].result = findKeywordInPageTitle( this.config.pageTitle, this.config.keyword );
=======
var result = [ { test: "pageTitleKeyword", result: { matches: 0, position: 0 } } ];
if ( typeof this.config.pageTitle !== "undefined" ) {
result[ 0 ].result.matches = this.stringHelper.countMatches(
this.config.pageTitle,
this.stringHelper.getWordBoundaryRegex( this.config.keyword )
);
result[ 0 ].result.position = this.config.pageTitle.toLocaleLowerCase().indexOf( this.config.keyword.toLocaleLowerCase() );
>>>>>>>
var findKeywordInPageTitle = require( "analyses/findKeywordInPageTitle.js" );
var result = [ { test: "pageTitleKeyword", result: { position: -1, matches: 0 } } ];
if ( typeof this.config.pageTitle !== "undefined" && typeof this.config.keyword !== "undefined" ) {
result[0].result = findKeywordInPageTitle( this.config.pageTitle, this.config.keyword );
<<<<<<<
if ( typeof this.config.meta !== "undefined" && typeof this.config.keyword !== "undefined" &&
this.config.meta !== "" && this.config.keyword !== "" ) {
result[ 0 ].result = wordMatch( this.config.meta, this.config.keyword );
=======
if ( typeof this.config.meta !== "undefined" && this.config.meta.length > 0 && this.config.keyword !== "" ) {
result[ 0 ].result = this.stringHelper.countMatches(
this.config.meta, this.stringHelper.getWordBoundaryRegex( this.config.keyword )
);
>>>>>>>
if ( typeof this.config.meta !== "undefined" && typeof this.config.keyword !== "undefined" &&
this.config.meta !== "" && this.config.keyword !== "" ) {
result[ 0 ].result = wordMatch( this.config.meta, this.config.keyword );
<<<<<<<
;/* global YoastSEO: true */
=======
/* global YoastSEO: true */
YoastSEO = ( "undefined" === typeof YoastSEO ) ? {} : YoastSEO;
>>>>>>>
/* global YoastSEO: true */
<<<<<<<
module.exports = YoastSEO.AnalyzeScorer;
;/* jshint browser: true */
=======
/* jshint browser: true */
>>>>>>>
module.exports = YoastSEO.AnalyzeScorer;
/* jshint browser: true */ |
<<<<<<<
it('that when converting an integer to a decimal, if an error occurs, returns a '
+ 'BigNumber NaN instance if returnNaNOnError is set to true', () => {
expect(
(
cur
.integerToDecimal(bigNumber('123'), 'howdy', { returnNaNOnError: true })
).isNaN()
).to.equal(true);
expect(
(
cur
.integerToDecimal('pluto factory', 2, { returnNaNOnError: true })
).isNaN()
).to.equal(true);
});
it('correctly converts an amount as a number from a decimal to an integer', () => {
expect(
cur
.decimalToInteger(1.23, 2)
.toString()
).to.equal('123');
expect(
cur
.decimalToInteger(1.23, 8)
.toString()
).to.equal('123000000');
expect(
cur
.decimalToInteger(1.23, 18)
.toString()
).to.equal('1230000000000000000');
});
=======
expect(
cur
.integerToDecimal(1.23, 18)
.toString()
).to.equal('1.23e-18');
});
>>>>>>>
it('that when converting an integer to a decimal, if an error occurs, returns a '
+ 'BigNumber NaN instance if returnNaNOnError is set to true', () => {
expect(
(
cur
.integerToDecimal(bigNumber('123'), 'howdy', { returnNaNOnError: true })
).isNaN()
).to.equal(true);
expect(
(
cur
.integerToDecimal('pluto factory', 2, { returnNaNOnError: true })
).isNaN()
).to.equal(true);
});
it('correctly converts an amount as a number from a decimal to an integer', () => {
expect(
cur
.decimalToInteger(1.23, 2)
.toString()
).to.equal('123');
expect(
cur
.decimalToInteger(1.23, 8)
.toString()
).to.equal('123000000');
expect(
cur
.integerToDecimal(1.23, 18)
.toString()
).to.equal('1.23e-18');
}); |
<<<<<<<
import { forEach } from "lodash-es";
import { filter } from "lodash-es";
import { memoize } from "lodash-es";
=======
var forEach = require( "lodash/forEach" );
var filter = require( "lodash/filter" );
var flattenDeep = require( "lodash/flattenDeep" );
let regexFromDoubleArray = null;
let regexFromDoubleArrayCacheKey = "";
/**
* Memoizes the createRegexFromDoubleArray with the twoPartTransitionWords.
*
* @param {Array} twoPartTransitionWords The array containing two-part transition words.
*
* @returns {RegExp} The RegExp to match text with a double array.
*/
function getRegexFromDoubleArray( twoPartTransitionWords ) {
const cacheKey = flattenDeep( twoPartTransitionWords ).join( "" );
if ( regexFromDoubleArrayCacheKey !== cacheKey || regexFromDoubleArray === null ) {
regexFromDoubleArrayCacheKey = cacheKey;
regexFromDoubleArray = createRegexFromDoubleArray( twoPartTransitionWords );
}
return regexFromDoubleArray;
}
>>>>>>>
import { forEach } from "lodash-es";
import { filter } from "lodash-es";
import { flattenDeep } from "lodash-es";
let regexFromDoubleArray = null;
let regexFromDoubleArrayCacheKey = "";
/**
* Memoizes the createRegexFromDoubleArray with the twoPartTransitionWords.
*
* @param {Array} twoPartTransitionWords The array containing two-part transition words.
*
* @returns {RegExp} The RegExp to match text with a double array.
*/
function getRegexFromDoubleArray( twoPartTransitionWords ) {
const cacheKey = flattenDeep( twoPartTransitionWords ).join( "" );
if ( regexFromDoubleArrayCacheKey !== cacheKey || regexFromDoubleArray === null ) {
regexFromDoubleArrayCacheKey = cacheKey;
regexFromDoubleArray = createRegexFromDoubleArray( twoPartTransitionWords );
}
return regexFromDoubleArray;
} |
<<<<<<<
export {
default as Collapsible,
CollapsibleStateless,
StyledIconsButton,
StyledContainer,
StyledContainerTopLevel,
wrapInHeading,
} from "./Collapsible";
=======
export { default as ArticleList } from "./ArticleList";
export { default as Card, FullHeightCard } from "./Card";
export { default as CardBanner } from "./CardBanner";
export { default as CourseDetails } from "./CourseDetails";
>>>>>>>
export {
default as Collapsible,
CollapsibleStateless,
StyledIconsButton,
StyledContainer,
StyledContainerTopLevel,
wrapInHeading,
} from "./Collapsible";
export { default as ArticleList } from "./ArticleList";
export { default as Card, FullHeightCard } from "./Card";
export { default as CardBanner } from "./CardBanner";
export { default as CourseDetails } from "./CourseDetails";
<<<<<<<
=======
export { default as Checkbox } from "./Checkbox";
>>>>>>>
export { default as Checkbox } from "./Checkbox"; |
<<<<<<<
import SingleH1Assessment from "./assessments/seo/SingleH1Assessment";
=======
import { createAnchorOpeningTag } from "./helpers/shortlinker";
/**
* Returns the text length assessment to use, based on whether recalibration has been
* activated or not.
*
* @param {boolean} useRecalibration If the recalibration assessment should be used or not.
* @returns {Object} The text length assessment to use.
*/
export const getTextLengthAssessment = function( useRecalibration ) {
// Export so it can be used in tests.
if ( useRecalibration ) {
return new TextLengthAssessment( {
recommendedMinimum: 250,
slightlyBelowMinimum: 200,
belowMinimum: 100,
veryFarBelowMinimum: 50,
urlTitle: createAnchorOpeningTag( "https://yoa.st/34j" ),
urlCallToAction: createAnchorOpeningTag( "https://yoa.st/34k" ),
} );
}
return taxonomyTextLengthAssessment;
};
>>>>>>>
import SingleH1Assessment from "./assessments/seo/SingleH1Assessment";
import { createAnchorOpeningTag } from "./helpers/shortlinker";
/**
* Returns the text length assessment to use, based on whether recalibration has been
* activated or not.
*
* @param {boolean} useRecalibration If the recalibration assessment should be used or not.
* @returns {Object} The text length assessment to use.
*/
export const getTextLengthAssessment = function( useRecalibration ) {
// Export so it can be used in tests.
if ( useRecalibration ) {
return new TextLengthAssessment( {
recommendedMinimum: 250,
slightlyBelowMinimum: 200,
belowMinimum: 100,
veryFarBelowMinimum: 50,
urlTitle: createAnchorOpeningTag( "https://yoa.st/34j" ),
urlCallToAction: createAnchorOpeningTag( "https://yoa.st/34k" ),
} );
}
return taxonomyTextLengthAssessment;
};
<<<<<<<
if ( process.env.YOAST_RECALIBRATION === "enabled" ) {
this._assessments = [
new IntroductionKeywordAssessment(),
new KeyphraseLengthAssessment(),
new KeywordDensityAssessment(),
new MetaDescriptionKeywordAssessment(),
new MetaDescriptionLengthAssessment(),
taxonomyTextLengthAssessment,
new TitleKeywordAssessment(),
new PageTitleWidthAssessment(),
new UrlKeywordAssessment(),
new FunctionWordsInKeyphrase(),
new SingleH1Assessment(),
];
} else {
this._assessments = [
new IntroductionKeywordAssessment(),
new KeyphraseLengthAssessment(),
new KeywordDensityAssessment(),
new MetaDescriptionKeywordAssessment(),
new MetaDescriptionLengthAssessment(),
taxonomyTextLengthAssessment,
new TitleKeywordAssessment(),
new PageTitleWidthAssessment(),
new UrlKeywordAssessment(),
new UrlLengthAssessment(),
urlStopWordsAssessment,
new FunctionWordsInKeyphrase(),
];
}
=======
// Get the text length boundaries (they are different for recalibration).
const textLengthAssessment = getTextLengthAssessment( process.env.YOAST_RECALIBRATION === "enabled" );
this._assessments = [
new IntroductionKeywordAssessment(),
new KeyphraseLengthAssessment(),
new KeywordDensityAssessment(),
new MetaDescriptionKeywordAssessment(),
new MetaDescriptionLengthAssessment(),
textLengthAssessment,
new TitleKeywordAssessment(),
new PageTitleWidthAssessment(),
new UrlKeywordAssessment(),
new UrlLengthAssessment(),
urlStopWordsAssessment,
new FunctionWordsInKeyphrase(),
];
>>>>>>>
// Get the text length boundaries (they are different for recalibration).
const textLengthAssessment = getTextLengthAssessment( process.env.YOAST_RECALIBRATION === "enabled" );
if ( process.env.YOAST_RECALIBRATION === "enabled" ) {
this._assessments = [
new IntroductionKeywordAssessment(),
new KeyphraseLengthAssessment(),
new KeywordDensityAssessment(),
new MetaDescriptionKeywordAssessment(),
new MetaDescriptionLengthAssessment(),
textLengthAssessment,
new TitleKeywordAssessment(),
new PageTitleWidthAssessment(),
new UrlKeywordAssessment(),
new FunctionWordsInKeyphrase(),
new SingleH1Assessment(),
];
} else {
this._assessments = [
new IntroductionKeywordAssessment(),
new KeyphraseLengthAssessment(),
new KeywordDensityAssessment(),
new MetaDescriptionKeywordAssessment(),
new MetaDescriptionLengthAssessment(),
textLengthAssessment,
new TitleKeywordAssessment(),
new PageTitleWidthAssessment(),
new UrlKeywordAssessment(),
new UrlLengthAssessment(),
urlStopWordsAssessment,
new FunctionWordsInKeyphrase(),
];
} |
<<<<<<<
[ "absurder", "absurd" ],
// A word whose -t ending should be stemmed.
[ "grondt", "grond" ],
// A word whose -te ending needs to be stemmed.
[ "zwikte", "zwik" ],
// A word whose -ten ending needs to be stemmed.
[ "zwikten", "zwik" ],
// A word whose -de ending needs to be stemmed.
[ "vlienderde", "vliender" ],
[ "bedaarde", "bedaar" ],
[ "bobsleede", "bobslee" ],
// A word whose -den ending needs to be stemmed.
[ "bidden", "bid" ],
// A word with stem ending -d and receives either verb or plural suffix -en. Only -en needs to be stemmed.
[ "hoofden", "hoofd" ],
[ "noden", "nood" ],
// A word which ends in non-verb past suffix -de. -e ending needs to be stemmed.
[ "poularde", "poulard" ],
[ "orde", "ord" ],
];
=======
[ "absurder", "absurd" ],
// A noun with diminutive suffix -je.
[ "plaatje", "plaat" ],
// A noun with diminutive suffix -je.
[ "momentje", "moment" ],
// A noun with diminutive suffix -tje.
[ "citroentje", "citroen" ],
// A noun with diminutive suffix -tje.
[ "actietje", "actie" ],
// A noun with diminutive suffix -je. Input: exception list.
[ "patiëntje", "patiënt" ],
// A noun with diminutive suffix -tje. Input: exception list.
[ "aspergetje", "asperge" ],
// A noun with diminutive suffix -etje. Input: exception list.
[ "taxietje", "taxi" ],
// A noun with diminutive suffix -tje in which undergoes vowel doubling before adding the suffix -tje. Input: exception list.
[ "dynamootje", "dynamo" ],
// A noun with plural suffix -en. Input: exception list.
[ "residuen", "residu" ],
// A noun with plural suffix -eren. Input: exception list.
[ "volkeren", "volk" ],
// A noun with plural suffix -s. Input: exception list.
[ "zoos", "zoo" ],
// A word that does not need to undergo vowel doubling after suffix -en deletion.
[ "dommeriken", "dommerik" ],
[ "vaten", "vat" ],
];
>>>>>>>
[ "absurder", "absurd" ],
// A word whose -t ending should be stemmed.
[ "grondt", "grond" ],
// A word whose -te ending needs to be stemmed.
[ "zwikte", "zwik" ],
// A word whose -ten ending needs to be stemmed.
[ "zwikten", "zwik" ],
// A word whose -de ending needs to be stemmed.
[ "vlienderde", "vliender" ],
[ "bedaarde", "bedaar" ],
[ "bobsleede", "bobslee" ],
// A word whose -den ending needs to be stemmed.
[ "bidden", "bid" ],
// A word with stem ending -d and receives either verb or plural suffix -en. Only -en needs to be stemmed.
[ "hoofden", "hoofd" ],
[ "noden", "nood" ],
// A word which ends in non-verb past suffix -de. -e ending needs to be stemmed.
[ "poularde", "poulard" ],
[ "orde", "ord" ],
// A noun with diminutive suffix -je.
[ "plaatje", "plaat" ],
// A noun with diminutive suffix -je.
[ "momentje", "moment" ],
// A noun with diminutive suffix -tje.
[ "citroentje", "citroen" ],
// A noun with diminutive suffix -tje.
[ "actietje", "actie" ],
// A noun with diminutive suffix -je. Input: exception list.
[ "patiëntje", "patiënt" ],
// A noun with diminutive suffix -tje. Input: exception list.
[ "aspergetje", "asperge" ],
// A noun with diminutive suffix -etje. Input: exception list.
[ "taxietje", "taxi" ],
// A noun with diminutive suffix -tje in which undergoes vowel doubling before adding the suffix -tje. Input: exception list.
[ "dynamootje", "dynamo" ],
// A noun with plural suffix -en. Input: exception list.
[ "residuen", "residu" ],
// A noun with plural suffix -eren. Input: exception list.
[ "volkeren", "volk" ],
// A noun with plural suffix -s. Input: exception list.
[ "zoos", "zoo" ],
// A word that does not need to undergo vowel doubling after suffix -en deletion.
[ "dommeriken", "dommerik" ],
[ "vaten", "vat" ],
]; |
<<<<<<<
[ "absurder", "absurd" ],
// A word that does not need to undergo vowel doubling after suffix -en deletion.
[ "dommeriken", "dommerik" ],
];
=======
[ "absurder", "absurd" ],
// A noun with diminutive suffix -je.
[ "plaatje", "plaat" ],
// A noun with diminutive suffix -je.
[ "momentje", "moment" ],
// A noun with diminutive suffix -tje.
[ "citroentje", "citroen" ],
// A noun with diminutive suffix -tje.
[ "actietje", "actie" ],
// A noun with diminutive suffix -je. Input: exception list.
[ "patiëntje", "patiënt" ],
// A noun with diminutive suffix -tje. Input: exception list.
[ "aspergetje", "asperge" ],
// A noun with diminutive suffix -etje. Input: exception list.
[ "taxietje", "taxi" ],
// A noun with diminutive suffix -tje in which undergoes vowel doubling before adding the suffix -tje. Input: exception list.
[ "dynamootje", "dynamo" ],
// A noun with plural suffix -en. Input: exception list.
[ "residuen", "residu" ],
// A noun with plural suffix -eren. Input: exception list.
[ "volkeren", "volk" ],
// A noun with plural suffix -s. Input: exception list.
[ "zoos", "zoo" ],
];
>>>>>>>
[ "absurder", "absurd" ],
// A noun with diminutive suffix -je.
[ "plaatje", "plaat" ],
// A noun with diminutive suffix -je.
[ "momentje", "moment" ],
// A noun with diminutive suffix -tje.
[ "citroentje", "citroen" ],
// A noun with diminutive suffix -tje.
[ "actietje", "actie" ],
// A noun with diminutive suffix -je. Input: exception list.
[ "patiëntje", "patiënt" ],
// A noun with diminutive suffix -tje. Input: exception list.
[ "aspergetje", "asperge" ],
// A noun with diminutive suffix -etje. Input: exception list.
[ "taxietje", "taxi" ],
// A noun with diminutive suffix -tje in which undergoes vowel doubling before adding the suffix -tje. Input: exception list.
[ "dynamootje", "dynamo" ],
// A noun with plural suffix -en. Input: exception list.
[ "residuen", "residu" ],
// A noun with plural suffix -eren. Input: exception list.
[ "volkeren", "volk" ],
// A noun with plural suffix -s. Input: exception list.
[ "zoos", "zoo" ],
// A word that does not need to undergo vowel doubling after suffix -en deletion.
[ "dommeriken", "dommerik" ],
]; |
<<<<<<<
this.assessor.assess( this.paper );
// Pass the assessor result through to the formatter
=======
this.pageAnalyzer.runQueue();
// Set the assessor
if ( isUndefined( this.assessor ) ) {
this.assessor = new Assessor( this.i18n );
}
this.assessor.assess( this.paper );
>>>>>>>
this.pageAnalyzer.runQueue();
// Pass the assessor result through to the formatter |
<<<<<<<
// Italian papers
import italianPaper1 from "./it/italianPaper1";
import italianPaper2 from "./it/italianPaper2";
import italianPaper3 from "./it/italianPaper3";
=======
// Spanish papers
import spanishPaper1 from "./es/spanishPaper1";
import spanishPaper2 from "./es/spanishPaper2";
import spanishPaper3 from "./es/spanishPaper3";
>>>>>>>
// Italian papers
import italianPaper1 from "./it/italianPaper1";
import italianPaper2 from "./it/italianPaper2";
import italianPaper3 from "./it/italianPaper3";
// Spanish papers
import spanishPaper1 from "./es/spanishPaper1";
import spanishPaper2 from "./es/spanishPaper2";
import spanishPaper3 from "./es/spanishPaper3";
<<<<<<<
italianPaper1,
italianPaper2,
italianPaper3,
=======
spanishPaper1,
spanishPaper2,
spanishPaper3,
>>>>>>>
italianPaper1,
italianPaper2,
italianPaper3,
spanishPaper1,
spanishPaper2,
spanishPaper3, |
<<<<<<<
// Indonesian papers
import indonesianPaper1 from "./id/indonesianPaper1";
import indonesianPaper2 from "./id/indonesianPaper2";
import indonesianPaper3 from "./id/indonesianPaper3";
=======
// Dutch papers
import dutchPaper1 from "./nl/dutchPaper1";
import dutchPaper2 from "./nl/dutchPaper2";
import dutchPaper3 from "./nl/dutchPaper3";
>>>>>>>
// Dutch papers
import dutchPaper1 from "./nl/dutchPaper1";
import dutchPaper2 from "./nl/dutchPaper2";
import dutchPaper3 from "./nl/dutchPaper3";
// Indonesian papers
import indonesianPaper1 from "./id/indonesianPaper1";
import indonesianPaper2 from "./id/indonesianPaper2";
import indonesianPaper3 from "./id/indonesianPaper3";
<<<<<<<
indonesianPaper1,
indonesianPaper2,
indonesianPaper3,
=======
dutchPaper1,
dutchPaper2,
dutchPaper3,
>>>>>>>
dutchPaper1,
dutchPaper2,
dutchPaper3,
indonesianPaper1,
indonesianPaper2,
indonesianPaper3, |
<<<<<<<
import { createComponentWithIntl } from "@yoast/helpers";
import SearchResultDetail from "../SearchResultDetail.js";
=======
import { createComponentWithIntl } from "@yoast/components";
import SearchResultDetail from "../src/SearchResultDetail";
>>>>>>>
import { createComponentWithIntl } from "@yoast/helpers";
import SearchResultDetail from "../src/SearchResultDetail"; |
<<<<<<<
export { default as questionCircle } from "./question-circle.svg";
export { default as times } from "./times.svg";
=======
export { default as questionCircle } from "./question-circle.svg";
export { default as eye } from "./eye.svg";
>>>>>>>
export { default as questionCircle } from "./question-circle.svg";
export { default as times } from "./times.svg";
export { default as eye } from "./eye.svg"; |
<<<<<<<
import SendConfirmBox from './SpendConfirmBox';
=======
import FeeChange from '../../components/FeeChange';
import SendConfirmBox from './SendConfirmBox';
>>>>>>>
import SendConfirmBox from './SpendConfirmBox';
import FeeChange from '../../components/FeeChange';
<<<<<<<
this.sendConfirmBox = this.createChild(SendConfirmBox, {
initialState: { ...sendConfirmBoxState || {} },
});
this.listenTo(this.sendConfirmBox, 'clickSend', this.onClickConfirmSend);
this.getCachedEl('.js-sendConfirmContainer').html(this.sendConfirmBox.render().el);
=======
this.sendConfirmBox = this.createChild(SendConfirmBox, { fee });
this.listenTo(this.sendConfirmBox, 'clickSend', () => this.onClickConfirmSend());
this.listenTo(this.sendConfirmBox, 'clickCancel', () => this.onClickSendConfirmCancel());
this.$sendConfirm.html(this.sendConfirmBox.render().el);
if (this.feeChange) this.feeChange.remove();
this.feeChange = this.createChild(FeeChange);
this.$('.js-feeChangeContainer').html(this.feeChange.render().el);
>>>>>>>
this.sendConfirmBox = this.createChild(SendConfirmBox, {
initialState: { ...sendConfirmBoxState || {} },
});
this.listenTo(this.sendConfirmBox, 'clickSend', this.onClickConfirmSend);
this.getCachedEl('.js-sendConfirmContainer').html(this.sendConfirmBox.render().el);
if (this.feeChange) this.feeChange.remove();
this.feeChange = this.createChild(FeeChange);
this.$('.js-feeChangeContainer').html(this.feeChange.render().el); |
<<<<<<<
import { YoastButton, SvgIcon } from "yoast-components";
import { colors, breakpoints } from "@yoast/style-guide";
=======
import { YoastButton, SvgIcon, YoastLinkButton } from "@yoast/components";
import { makeOutboundLink } from "@yoast/helpers";
import { colors, breakpoints } from "@yoast/components/style-guide";
>>>>>>>
import { YoastButton, SvgIcon, YoastLinkButton } from "@yoast/components";
import { makeOutboundLink } from "@yoast/helpers";
import { colors, breakpoints } from "@yoast/style-guide"; |
<<<<<<<
label.textContent = text;
label.for = type+"Input";
=======
label.innerText = text;
label.htmlFor = type+"Input";
>>>>>>>
label.textContent = text;
label.htmlFor = type+"Input"; |
<<<<<<<
let aboutModal;
let editListingModal;
=======
let editListindModal;
let debugLogModal;
>>>>>>>
let aboutModal;
let editListindModal;
let debugLogModal; |
<<<<<<<
});
app.loadingModal.close();
app.pageNav.navigable = true;
Backbone.history.start();
=======
}).fail(() => {
app.loadingModal.close();
new SimpleMessageModal()
.render()
.open('Unable to obtain the server configuration.', 'Is your server running?');
});
>>>>>>>
}).fail(() => {
app.loadingModal.close();
new SimpleMessageModal()
.render()
.open('Unable to obtain the server configuration.', 'Is your server running?');
});
app.loadingModal.close();
app.pageNav.navigable = true;
Backbone.history.start(); |
<<<<<<<
dataFR = require( "../../../../packages/yoastseo/premium-configuration/data/morphologyData-fr-v5.json" );
// eslint-disable-next-line global-require
dataRU = require( "../../../../packages/yoastseo/premium-configuration/data/morphologyData-ru-v6.json" );
=======
dataFR = require( "../../../../packages/yoastseo/premium-configuration/data/morphologyData-fr-v6.json" );
>>>>>>>
dataFR = require( "../../../../packages/yoastseo/premium-configuration/data/morphologyData-fr-v6.json" );
// eslint-disable-next-line global-require
dataRU = require( "../../../../packages/yoastseo/premium-configuration/data/morphologyData-ru-v6.json" ); |
<<<<<<<
<div>{(this.state.isLoading) ? "Saving.." : ""}</div>
=======
<ProgressIndicator totalSteps={this.stepCount} currentStepNumber={this.getCurrentStepNumber()} />
<Step ref='step' currentStep={this.state.currentStepId} components={this.props.components} title={step.title} fields={step.fields} />
>>>>>>>
<ProgressIndicator totalSteps={this.stepCount} currentStepNumber={this.getCurrentStepNumber()} />
<Step ref='step' currentStep={this.state.currentStepId} components={this.props.components} title={step.title} fields={step.fields} />
<<<<<<<
<ProgressIndicator {...this.getProgress()} />
<Step ref='step' currentStep={this.state.currentStepId} components={this.props.components}
title={step.title} fields={step.fields}/>
=======
>>>>>>> |
<<<<<<<
FEEDBACK_LOOP: {
id: 253269,
name: 'Feedback Loop',
icon: 'spell_holy_dispelmagic',
},
=======
// Dot spell for Carafe of Searing Light
REFRESHING_AGONY_DOT: {
id: 253284,
name: 'Refreshing Agony',
icon: 'ability_priest_flashoflight',
},
// Mana return spell for Carafe of Searing Light
REFRESHING_AGONY_MANA: {
id: 255981,
name: 'Refreshing Agonyt',
icon: 'ability_priest_flashoflight',
},
>>>>>>>
FEEDBACK_LOOP: {
id: 253269,
name: 'Feedback Loop',
icon: 'spell_holy_dispelmagic',
},
// Dot spell for Carafe of Searing Light
REFRESHING_AGONY_DOT: {
id: 253284,
name: 'Refreshing Agony',
icon: 'ability_priest_flashoflight',
},
// Mana return spell for Carafe of Searing Light
REFRESHING_AGONY_MANA: {
id: 255981,
name: 'Refreshing Agonyt',
icon: 'ability_priest_flashoflight',
}, |
<<<<<<<
import de from "../../premium-configuration/data/morphologyData-de-v4.json";
import nl from "../../premium-configuration/data/morphologyData-nl-v4.json";
import es from "../../premium-configuration/data/morphologyData-es-v4.json";
import ru from "../../premium-configuration/data/morphologyData-ru-v6.json";
=======
import de from "../../premium-configuration/data/morphologyData-de-v5.json";
import nl from "../../premium-configuration/data/morphologyData-nl-v5.json";
import es from "../../premium-configuration/data/morphologyData-es-v5.json";
import fr from "../../premium-configuration/data/morphologyData-fr-v5.json";
>>>>>>>
import de from "../../premium-configuration/data/morphologyData-de-v5.json";
import nl from "../../premium-configuration/data/morphologyData-nl-v5.json";
import es from "../../premium-configuration/data/morphologyData-es-v5.json";
import fr from "../../premium-configuration/data/morphologyData-fr-v5.json";
import ru from "../../premium-configuration/data/morphologyData-ru-v6.json";
<<<<<<<
ru,
=======
fr,
>>>>>>>
fr,
ru, |
<<<<<<<
/* eslint-disable complexity */
/**
=======
/**
>>>>>>>
/**
<<<<<<<
const { icon, className, color, size, iconViewBox } = this.props;
let path;
/* eslint-disable max-len */
switch ( icon ) {
case "angle-down":
path = "M1395 736q0 13-10 23l-466 466q-10 10-23 10t-23-10l-466-466q-10-10-10-23t10-23l50-50q10-10 23-10t23 10l393 393 393-393q10-10 23-10t23 10l50 50q10 10 10 23z";
break;
case "angle-left":
path = "M1203 544q0 13-10 23l-393 393 393 393q10 10 10 23t-10 23l-50 50q-10 10-23 10t-23-10l-466-466q-10-10-10-23t10-23l466-466q10-10 23-10t23 10l50 50q10 10 10 23z";
break;
case "angle-right":
path = "M1171 960q0 13-10 23l-466 466q-10 10-23 10t-23-10l-50-50q-10-10-10-23t10-23l393-393-393-393q-10-10-10-23t10-23l50-50q10-10 23-10t23 10l466 466q10 10 10 23z";
break;
case "angle-up":
path = "M1395 1184q0 13-10 23l-50 50q-10 10-23 10t-23-10l-393-393-393 393q-10 10-23 10t-23-10l-50-50q-10-10-10-23t10-23l466-466q10-10 23-10t23 10l466 466q10 10 10 23z";
break;
case "arrow-down":
path = "M896 1791L120.91 448.5L1671.09 448.5z";
break;
case "arrow-left":
path = "M1343.5 1671.09L1 896L1343.5 120.91z";
break;
case "arrow-right":
path = "M1791 896L448.5 1671.09L448.5 120.91z";
break;
case "arrow-up":
path = "M1671.09 1343.5L120.91 1343.5L896 1z";
break;
case "circle":
path = "M1664 896q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z";
break;
case "desktop":
path = "M1728 992v-832q0-13-9.5-22.5t-22.5-9.5h-1600q-13 0-22.5 9.5t-9.5 22.5v832q0 13 9.5 22.5t22.5 9.5h1600q13 0 22.5-9.5t9.5-22.5zm128-832v1088q0 66-47 113t-113 47h-544q0 37 16 77.5t32 71 16 43.5q0 26-19 45t-45 19h-512q-26 0-45-19t-19-45q0-14 16-44t32-70 16-78h-544q-66 0-113-47t-47-113v-1088q0-66 47-113t113-47h1600q66 0 113 47t47 113z";
break;
case "edit":
path = "M491 1536l91-91-235-235-91 91v107h128v128h107zm523-928q0-22-22-22-10 0-17 7l-542 542q-7 7-7 17 0 22 22 22 10 0 17-7l542-542q7-7 7-17zm-54-192l416 416-832 832h-416v-416zm683 96q0 53-37 90l-166 166-416-416 166-165q36-38 90-38 53 0 91 38l235 234q37 39 37 91z";
break;
case "eye":
path = "M1664 960q-152-236-381-353 61 104 61 225 0 185-131.5 316.5t-316.5 131.5-316.5-131.5-131.5-316.5q0-121 61-225-229 117-381 353 133 205 333.5 326.5t434.5 121.5 434.5-121.5 333.5-326.5zm-720-384q0-20-14-34t-34-14q-125 0-214.5 89.5t-89.5 214.5q0 20 14 34t34 14 34-14 14-34q0-86 61-147t147-61q20 0 34-14t14-34zm848 384q0 34-20 69-140 230-376.5 368.5t-499.5 138.5-499.5-139-376.5-368q-20-35-20-69t20-69q140-229 376.5-368t499.5-139 499.5 139 376.5 368q20 35 20 69z";
break;
case "file-text":
path = "M1596 380q28 28 48 76t20 88v1152q0 40-28 68t-68 28h-1344q-40 0-68-28t-28-68v-1600q0-40 28-68t68-28h896q40 0 88 20t76 48zm-444-244v376h376q-10-29-22-41l-313-313q-12-12-41-22zm384 1528v-1024h-416q-40 0-68-28t-28-68v-416h-768v1536h1280zm-1024-864q0-14 9-23t23-9h704q14 0 23 9t9 23v64q0 14-9 23t-23 9h-704q-14 0-23-9t-9-23v-64zm736 224q14 0 23 9t9 23v64q0 14-9 23t-23 9h-704q-14 0-23-9t-9-23v-64q0-14 9-23t23-9h704zm0 256q14 0 23 9t9 23v64q0 14-9 23t-23 9h-704q-14 0-23-9t-9-23v-64q0-14 9-23t23-9h704z";
break;
case "gear":
path = "M1800 800h-218q-26 -107 -81 -193l154 -154l-210 -210l-154 154q-88 -55 -191 -79v-218h-300v218q-103 24 -191 79l-154 -154l-212 212l154 154q-55 88 -79 191h-218v297h217q23 101 80 194l-154 154l210 210l154 -154q85 54 193 81v218h300v-218q103 -24 191 -79 l154 154l212 -212l-154 -154q57 -93 80 -194h217v-297zM950 650q124 0 212 88t88 212t-88 212t-212 88t-212 -88t-88 -212t88 -212t212 -88z";
break;
case "key":
path = "M832 512q0-80-56-136t-136-56-136 56-56 136q0 42 19 83-41-19-83-19-80 0-136 56t-56 136 56 136 136 56 136-56 56-136q0-42-19-83 41 19 83 19 80 0 136-56t56-136zm851 704q0 17-49 66t-66 49q-9 0-28.5-16t-36.5-33-38.5-40-24.5-26l-96 96 220 220q28 28 28 68 0 42-39 81t-81 39q-40 0-68-28l-671-671q-176 131-365 131-163 0-265.5-102.5t-102.5-265.5q0-160 95-313t248-248 313-95q163 0 265.5 102.5t102.5 265.5q0 189-131 365l355 355 96-96q-3-3-26-24.5t-40-38.5-33-36.5-16-28.5q0-17 49-66t66-49q13 0 23 10 6 6 46 44.5t82 79.5 86.5 86 73 78 28.5 41z";
break;
case "list":
path = "M384 1408q0 80-56 136t-136 56-136-56-56-136 56-136 136-56 136 56 56 136zm0-512q0 80-56 136t-136 56-136-56-56-136 56-136 136-56 136 56 56 136zm1408 416v192q0 13-9.5 22.5t-22.5 9.5h-1216q-13 0-22.5-9.5t-9.5-22.5v-192q0-13 9.5-22.5t22.5-9.5h1216q13 0 22.5 9.5t9.5 22.5zm-1408-928q0 80-56 136t-136 56-136-56-56-136 56-136 136-56 136 56 56 136zm1408 416v192q0 13-9.5 22.5t-22.5 9.5h-1216q-13 0-22.5-9.5t-9.5-22.5v-192q0-13 9.5-22.5t22.5-9.5h1216q13 0 22.5 9.5t9.5 22.5zm0-512v192q0 13-9.5 22.5t-22.5 9.5h-1216q-13 0-22.5-9.5t-9.5-22.5v-192q0-13 9.5-22.5t22.5-9.5h1216q13 0 22.5 9.5t9.5 22.5z";
break;
case "mobile":
path = "M976 1408q0-33-23.5-56.5t-56.5-23.5-56.5 23.5-23.5 56.5 23.5 56.5 56.5 23.5 56.5-23.5 23.5-56.5zm208-160v-704q0-13-9.5-22.5t-22.5-9.5h-512q-13 0-22.5 9.5t-9.5 22.5v704q0 13 9.5 22.5t22.5 9.5h512q13 0 22.5-9.5t9.5-22.5zm-192-848q0-16-16-16h-160q-16 0-16 16t16 16h160q16 0 16-16zm288-16v1024q0 52-38 90t-90 38h-512q-52 0-90-38t-38-90v-1024q0-52 38-90t90-38h512q52 0 90 38t38 90z";
break;
case "plus":
path = "M1600 736v192q0 40-28 68t-68 28h-416v416q0 40-28 68t-68 28h-192q-40 0-68-28t-28-68v-416h-416q-40 0-68-28t-28-68v-192q0-40 28-68t68-28h416v-416q0-40 28-68t68-28h192q40 0 68 28t28 68v416h416q40 0 68 28t28 68z";
break;
case "plus-circle":
path = "M1344 960v-128q0-26-19-45t-45-19h-256v-256q0-26-19-45t-45-19h-128q-26 0-45 19t-19 45v256h-256q-26 0-45 19t-19 45v128q0 26 19 45t45 19h256v256q0 26 19 45t45 19h128q26 0 45-19t19-45v-256h256q26 0 45-19t19-45zm320-64q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z";
break;
case "question-circle":
path = "M1024 1376v-192q0-14-9-23t-23-9h-192q-14 0-23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23-9t9-23zm256-672q0-88-55.5-163t-138.5-116-170-41q-243 0-371 213-15 24 8 42l132 100q7 6 19 6 16 0 25-12 53-68 86-92 34-24 86-24 48 0 85.5 26t37.5 59q0 38-20 61t-68 45q-63 28-115.5 86.5t-52.5 125.5v36q0 14 9 23t23 9h192q14 0 23-9t9-23q0-19 21.5-49.5t54.5-49.5q32-18 49-28.5t46-35 44.5-48 28-60.5 12.5-81zm384 192q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z";
break;
case "search":
path = "M1216 832q0-185-131.5-316.5t-316.5-131.5-316.5 131.5-131.5 316.5 131.5 316.5 316.5 131.5 316.5-131.5 131.5-316.5zm512 832q0 52-38 90t-90 38q-54 0-90-38l-343-342q-179 124-399 124-143 0-273.5-55.5t-225-150-150-225-55.5-273.5 55.5-273.5 150-225 225-150 273.5-55.5 273.5 55.5 225 150 150 225 55.5 273.5q0 220-124 399l343 343q37 37 37 90z";
break;
case "seo-score-bad":
path = "M248 8C111 8 0 119 0 256s111 248 248 248s248-111 248-248S385 8 248 8z M328 176c17.7 0 32 14.3 32 32 s-14.3 32-32 32s-32-14.3-32-32S310.3 176 328 176z M168 176c17.7 0 32 14.3 32 32s-14.3 32-32 32s-32-14.3-32-32S150.3 176 168 176 z M338.2 394.2C315.8 367.4 282.9 352 248 352s-67.8 15.4-90.2 42.2c-13.5 16.3-38.1-4.2-24.6-20.5C161.7 339.6 203.6 320 248 320 s86.3 19.6 114.7 53.8C376.3 390 351.7 410.5 338.2 394.2L338.2 394.2z";
break;
case "seo-score-good":
path = "M248 8C111 8 0 119 0 256s111 248 248 248s248-111 248-248S385 8 248 8z M328 176c17.7 0 32 14.3 32 32 s-14.3 32-32 32s-32-14.3-32-32S310.3 176 328 176z M168 176c17.7 0 32 14.3 32 32s-14.3 32-32 32s-32-14.3-32-32S150.3 176 168 176 z M362.8 346.2C334.3 380.4 292.5 400 248 400s-86.3-19.6-114.8-53.8c-13.6-16.3 11-36.7 24.6-20.5c22.4 26.9 55.2 42.2 90.2 42.2 s67.8-15.4 90.2-42.2C351.6 309.5 376.3 329.9 362.8 346.2L362.8 346.2z";
break;
case "seo-score-none":
path = "M248 8C111 8 0 119 0 256s111 248 248 248s248-111 248-248S385 8 248 8z";
break;
case "seo-score-ok":
path = "M248 8C111 8 0 119 0 256s111 248 248 248s248-111 248-248S385 8 248 8z M168 176c17.7 0 32 14.3 32 32 s-14.3 32-32 32s-32-14.3-32-32S150.3 176 168 176z M344 368H152c-21.2 0-21.2-32 0-32h192C365.2 336 365.2 368 344 368z M328 240 c-17.7 0-32-14.3-32-32s14.3-32 32-32s32 14.3 32 32S345.7 240 328 240z";
break;
case "times":
path = "M1490 1322q0 40-28 68l-136 136q-28 28-68 28t-68-28l-294-294-294 294q-28 28-68 28t-68-28l-136-136q-28-28-28-68t28-68l294-294-294-294q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 294 294-294q28-28 68-28t68 28l136 136q28 28 28 68t-28 68l-294 294 294 294q28 28 28 68z";
break;
}
/* eslint-enable max-len */
=======
const { icon, className, color, size } = this.props;
let path = icons[ icon ];
>>>>>>>
const { icon, className, color, size, iconViewBox } = this.props;
let path = icons[ icon ]; |
<<<<<<<
var matchKeywordInSubheadings = require( "./researches/matchKeywordInSubheadings.js" );
=======
var getKeywordDensity = require( "./researches/getKeywordDensity.js" );
>>>>>>>
var matchKeywordInSubheadings = require( "./researches/matchKeywordInSubheadings.js" );
var getKeywordDensity = require( "./researches/getKeywordDensity.js" );
<<<<<<<
"matchKeywordInSubheadings": matchKeywordInSubheadings,
=======
"getKeywordDensity": getKeywordDensity,
>>>>>>>
"matchKeywordInSubheadings": matchKeywordInSubheadings,
"getKeywordDensity": getKeywordDensity, |
<<<<<<<
export { default as SynonymsInput } from "./SynonymsInput";
=======
export { default as WordList } from "./WordList";
>>>>>>>
export { default as SynonymsInput } from "./SynonymsInput";
export { default as WordList } from "./WordList"; |
<<<<<<<
if (fileIsDependency(currentFile)) {
sourceMap = acquireSourceMapForDependency(currentFile);
}
let content;
if (sourceMap) {
needsSourceMap = true;
content = Convert.removeMapFileComments(currentFile.contents);
}
else {
content = currentFile.contents;
=======
if (sourceMapEnabled) {
if (fileIsDependency(currentFile)) {
sourceMap = acquireSourceMapForDependency(currentFile);
}
if (sourceMap) {
needsSourceMap = true;
}
>>>>>>>
let content = currentFile.contents;
if (sourceMapEnabled) {
if (fileIsDependency(currentFile)) {
sourceMap = acquireSourceMapForDependency(currentFile);
}
if (sourceMap) {
needsSourceMap = true;
content = Convert.removeMapFileComments(currentFile.contents);
} |
<<<<<<<
export { default as eye } from "./eye.svg";
export { default as circle } from "./circle.svg";
=======
export { default as times } from "./times.svg";
export { default as eye } from "./eye.svg";
>>>>>>>
export { default as times } from "./times.svg";
export { default as eye } from "./eye.svg";
export { default as circle } from "./circle.svg"; |
<<<<<<<
var YoastSEO_args = {
=======
var args = {
//source to use as feeder for the analyzer and snippetPreview
>>>>>>>
var YoastSEO_args = {
//source to use as feeder for the analyzer and snippetPreview |
<<<<<<<
expect( assessment.getText() ).toEqual ( "0% of the sentences contain more than 20 words, which is less than or equal to the recommended maximum of 25%." );
=======
expect( assessment.getText() ).toEqual ( "0% of the sentences contain more than 20 words, which is less than the recommended maximum of 25%." );
expect( assessment.hasMarks() ).toBe( false );
>>>>>>>
expect( assessment.getText() ).toEqual ( "0% of the sentences contain more than 20 words, which is less than or equal to the recommended maximum of 25%." );
expect( assessment.hasMarks() ).toBe( false );
<<<<<<<
expect( assessment.getText() ).toEqual ( "25% of the sentences contain more than 20 words, which is less than or equal to the recommended maximum of 25%." );
=======
expect( assessment.getText() ).toEqual ( "25% of the sentences contain more than 20 words, which is less than the recommended maximum of 25%." );
expect( assessment.hasMarks() ).toBe( true );
>>>>>>>
expect( assessment.getText() ).toEqual ( "25% of the sentences contain more than 20 words, which is less than or equal to the recommended maximum of 25%." );
expect( assessment.hasMarks() ).toBe( true ); |
<<<<<<<
import { SvgIcon, getRtlStyle, HelpText } from "@yoast/components";
=======
import HelpText from "yoast-components/composites/Plugin/Shared/components/HelpText";
import { SvgIcon } from "@yoast/components";
import { getDirectionalStyle } from "@yoast/helpers";
>>>>>>>
import { SvgIcon, HelpText } from "@yoast/components";
import { getDirectionalStyle } from "@yoast/helpers"; |
<<<<<<<
const matchTextWithArray = require( "../stringProcessing/matchTextWithArray.js" );
const buildKeywordForms = require( "./buildKeywordForms.js" );
const map = require( "lodash/map" );
const toLower = require( "lodash/toLower" );
=======
const wordMatch = require( "../stringProcessing/matchTextWithWord.js" );
const normalizeQuotes = require( "../stringProcessing/quotes.js" ).normalize;
const escapeRegExp = require( "lodash/escapeRegExp" );
>>>>>>>
const matchTextWithArray = require( "../stringProcessing/matchTextWithArray.js" );
const normalizeQuotes = require( "../stringProcessing/quotes.js" ).normalize;
const buildKeywordForms = require( "./buildKeywordForms.js" );
const map = require( "lodash/map" );
const toLower = require( "lodash/toLower" );
<<<<<<<
const title = paper.getTitle();
const keywordForms = buildKeywordForms( paper );
let result = { matches: 0, position: -1 };
result.matches = matchTextWithArray( title, keywordForms ).length;
let positions = [];
const titleLowerCase = title.toLocaleLowerCase();
const keywordFormsLowerCase = map( keywordForms, function( form ) {
return toLower( form );
} );
keywordFormsLowerCase.forEach( function( form ) {
const keywordFormIndex = titleLowerCase.indexOf( form );
if ( keywordFormIndex > -1 ) {
positions = positions.concat( keywordFormIndex );
}
} );
result.position = Math.min( ... positions );
=======
/*
* NormalizeQuotes also is used in wordMatch, but in order to find the index of the keyword, it's
* necessary to repeat it here.
*/
const title = normalizeQuotes( paper.getTitle() );
const keyword = escapeRegExp( normalizeQuotes( paper.getKeyword() ).toLocaleLowerCase() );
const locale = paper.getLocale();
const result = { matches: 0, position: -1 };
result.matches = wordMatch( title, keyword, locale );
result.position = title.toLocaleLowerCase().indexOf( keyword );
>>>>>>>
const title = normalizeQuotes( paper.getTitle() );
const keywordForms = buildKeywordForms( paper );
let result = { matches: 0, position: -1 };
result.matches = matchTextWithArray( title, keywordForms ).length;
let positions = [];
const titleLowerCase = title.toLocaleLowerCase();
const keywordFormsLowerCase = map( keywordForms, function( form ) {
return toLower( form );
} );
keywordFormsLowerCase.forEach( function( form ) {
const keywordFormIndex = titleLowerCase.indexOf( form );
if ( keywordFormIndex > -1 ) {
positions = positions.concat( keywordFormIndex );
}
} );
result.position = Math.min( ... positions ); |
<<<<<<<
import sv from "../../premium-configuration/data/morphologyData-sv-v9.json";
=======
import pl from "../../premium-configuration/data/morphologyData-pl-v9.json";
import ar from "../../premium-configuration/data/morphologyData-ar-v9.json";
>>>>>>>
import pl from "../../premium-configuration/data/morphologyData-pl-v9.json";
import ar from "../../premium-configuration/data/morphologyData-ar-v9.json";
import sv from "../../premium-configuration/data/morphologyData-sv-v9.json";
<<<<<<<
sv,
=======
pl,
ar,
>>>>>>>
pl,
ar,
sv, |
<<<<<<<
var stripSpaces = require( "./stripSpaces.js" );
var filter = require( "lodash/filter" );
=======
var forEach = require( "lodash/forEach" );
>>>>>>>
var stripSpaces = require( "./stripSpaces.js" );
var filter = require( "lodash/filter" );
var forEach = require( "lodash/forEach" );
<<<<<<<
sentences.map( function( sentence ) {
sentence = stripSpaces( sentence );
sentencesWordCount.push( wordCount( sentence ) );
} );
=======
>>>>>>> |
<<<<<<<
it( "returns 1 when a transition word is found in a sentence (Hebrew)", function() {
// Transition word: בגלל.
mockPaper = new Paper( "ביטלנו את הטיול בגלל הגשם.", { locale: "he_IL" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 1 );
} );
it( "returns 1 when a two-part transition word is found in a sentence (Hebrew)", function() {
// Transition word: או, או.
mockPaper = new Paper( " או חברותא או מיתותא.", { locale: "he_IL" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 1 );
} );
it( "returns 0 when no transition words are present in a sentence (Hebrew)", function() {
mockPaper = new Paper( "האם קנתה אורז.", { locale: "he_IL" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 0 );
} );
=======
it( "returns 1 when a (single) transition word is found in a sentence (Arabic)", function() {
// Transition word: كذلك.
mockPaper = new Paper( "يمكننا الذهاب إلى الجامعة، ويمكننا كذلك المذاكرة في المكتبة هناك.", { locale: "ar" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 1 );
} );
it( "returns 1 when a (multiple) transition word is found in a sentence (Arabic)", function() {
// Transition word: إلى الأبد.
mockPaper = new Paper( "سأحبك إلى الأبد.", { locale: "ar" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 1 );
} );
it( "returns 1 when a two-part transition word is found in a sentence (Arabic)", function() {
// Transition word: أو ,إما.
mockPaper = new Paper( "يمكننا الحصول إما على الخبز أو الأرز.", { locale: "ar" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 1 );
} );
it( "returns 0 when no transition words are present in a sentence (Arabic)", function() {
mockPaper = new Paper( "اشترت الأم الأرز.", { locale: "ar" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 0 );
} );
>>>>>>>
it( "returns 1 when a transition word is found in a sentence (Hebrew)", function() {
// Transition word: בגלל.
mockPaper = new Paper( "ביטלנו את הטיול בגלל הגשם.", { locale: "he_IL" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 1 );
} );
it( "returns 1 when a two-part transition word is found in a sentence (Hebrew)", function() {
// Transition word: או, או.
mockPaper = new Paper( " או חברותא או מיתותא.", { locale: "he_IL" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 1 );
} );
it( "returns 0 when no transition words are present in a sentence (Hebrew)", function() {
mockPaper = new Paper( "האם קנתה אורז.", { locale: "he_IL" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 0 );
} );
it( "returns 1 when a (single) transition word is found in a sentence (Arabic)", function() {
// Transition word: كذلك.
mockPaper = new Paper( "يمكننا الذهاب إلى الجامعة، ويمكننا كذلك المذاكرة في المكتبة هناك.", { locale: "ar" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 1 );
} );
it( "returns 1 when a (multiple) transition word is found in a sentence (Arabic)", function() {
// Transition word: إلى الأبد.
mockPaper = new Paper( "سأحبك إلى الأبد.", { locale: "ar" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 1 );
} );
it( "returns 1 when a two-part transition word is found in a sentence (Arabic)", function() {
// Transition word: أو ,إما.
mockPaper = new Paper( "يمكننا الحصول إما على الخبز أو الأرز.", { locale: "ar" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 1 );
} );
it( "returns 0 when no transition words are present in a sentence (Arabic)", function() {
mockPaper = new Paper( "اشترت الأم الأرز.", { locale: "ar" } );
result = transitionWordsResearch( mockPaper );
expect( result.totalSentences ).toBe( 1 );
expect( result.transitionWordSentences ).toBe( 0 );
} ); |
<<<<<<<
let mockParticiple = new SpanishParticiple( "sentido", "fue un sentido monumental y grandilocuente.", {
auxiliaries: [ "fue" ],
type: "irregular",
language: "es",
} );
expect( mockParticiple.directPrecedenceException( mockParticiple._sentencePart, mockParticiple._participle, "es" ) ).toBe( true );
expect( mockParticiple.precedenceException( mockParticiple._sentencePart, mockParticiple._participle, "es" ) ).toBe( false );
=======
const mockParticiple = new SpanishParticiple( "sentido", "fue un sentido monumental y grandilocuente.", { auxiliaries: [ "fue" ], type: "irregular", language: "es" } );
expect( mockParticiple.directPrecedenceException( mockParticiple._sentencePart, 7, "es" ) ).toBe( true );
expect( mockParticiple.precedenceException( mockParticiple._sentencePart, 7, "es" ) ).toBe( false );
>>>>>>>
const mockParticiple = new SpanishParticiple( "sentido", "fue un sentido monumental y grandilocuente.", {
auxiliaries: [ "fue" ],
type: "irregular",
language: "es",
} );
expect( mockParticiple.directPrecedenceException( mockParticiple._sentencePart, mockParticiple._participle, "es" ) ).toBe( true );
expect( mockParticiple.precedenceException( mockParticiple._sentencePart, mockParticiple._participle, "es" ) ).toBe( false );
<<<<<<<
let mockParticiple = new SpanishParticiple( "armados", "eran casi en su totalidad exsamuráis y estaban armados", {
auxiliaries: [ "eran" ],
type: "irregular",
language: "es",
} );
expect( mockParticiple.directPrecedenceException( mockParticiple._sentencePart, mockParticiple._participle, "es" ) ).toBe( false );
expect( mockParticiple.precedenceException( mockParticiple._sentencePart, mockParticiple._participle, "es" ) ).toBe( true );
=======
const mockParticiple = new SpanishParticiple( "armados", "eran casi en su totalidad exsamuráis y estaban armados", { auxiliaries: [ "eran" ], type: "irregular", language: "es" } );
expect( mockParticiple.directPrecedenceException( mockParticiple._sentencePart, 47, "es" ) ).toBe( false );
expect( mockParticiple.precedenceException( mockParticiple._sentencePart, 47, "es" ) ).toBe( true );
>>>>>>>
const mockParticiple = new SpanishParticiple( "armados", "eran casi en su totalidad exsamuráis y estaban armados", {
auxiliaries: [ "eran" ],
type: "irregular",
language: "es",
} );
expect( mockParticiple.directPrecedenceException( mockParticiple._sentencePart, mockParticiple._participle, "es" ) ).toBe( false );
expect( mockParticiple.precedenceException( mockParticiple._sentencePart, mockParticiple._participle, "es" ) ).toBe( true );
<<<<<<<
let mockParticiple = new SpanishParticiple( "esperado", "son famosos estaban en un programa de televisión muy esperado.", {
auxiliaries: [ "son" ],
type: "irregular",
language: "es",
} );
expect( mockParticiple.directPrecedenceException( mockParticiple._sentencePart, mockParticiple._participle, "es" ) ).toBe( false );
expect( mockParticiple.precedenceException( mockParticiple._sentencePart, mockParticiple._participle, "es" ) ).toBe( true );
=======
const mockParticiple = new SpanishParticiple( "esperado", "son famosos estaban en un programa de televisión muy esperado.", { auxiliaries: [ "son" ], type: "irregular", language: "es" } );
expect( mockParticiple.directPrecedenceException( mockParticiple._sentencePart, 53, "es" ) ).toBe( false );
expect( mockParticiple.precedenceException( mockParticiple._sentencePart, 53, "es" ) ).toBe( true );
>>>>>>>
const mockParticiple = new SpanishParticiple( "esperado", "son famosos estaban en un programa de televisión muy esperado.", {
auxiliaries: [ "son" ],
type: "irregular",
language: "es",
} );
expect( mockParticiple.directPrecedenceException( mockParticiple._sentencePart, mockParticiple._participle, "es" ) ).toBe( false );
expect( mockParticiple.precedenceException( mockParticiple._sentencePart, mockParticiple._participle, "es" ) ).toBe( true );
<<<<<<<
let mockParticiple = new SpanishParticiple( "escrito", "fue escrito por mi amiga.", {
auxiliaries: [ "fue" ],
type: "regular",
language: "es",
} );
=======
const mockParticiple = new SpanishParticiple( "escrito", "fue escrito por mi amiga.", { auxiliaries: [ "fue" ], type: "regular", language: "es" } );
>>>>>>>
const mockParticiple = new SpanishParticiple( "escrito", "fue escrito por mi amiga.", {
auxiliaries: [ "fue" ],
type: "regular",
language: "es",
} ); |
<<<<<<<
['@babel/plugin-proposal-decorators', { legacy: true }],
['@babel/plugin-proposal-class-properties', { loose: true }],
'@babel/plugin-transform-modules-commonjs'
=======
['@babel/plugin-transform-modules-commonjs', {loose: true}]
>>>>>>>
['@babel/plugin-proposal-decorators', { legacy: true }],
['@babel/plugin-proposal-class-properties', { loose: true }],
['@babel/plugin-transform-modules-commonjs', {loose: true}] |
<<<<<<<
/**
* Requests the analyses results from the worker.
*
* @returns {void}
*/
analyze() {
const { actions, paper } = this.props;
=======
analyze( paper = this.props.paper ) {
>>>>>>>
/**
* Requests the analyses results from the worker.
*
* @returns {void}
*/
analyze( paper = this.props.paper ) {
<<<<<<<
/**
* Renders a form input for a paper attribute.
*
* @param {string} id The id.
* @param {string} placeholder The placeholder.
* @param {string} label The label.
* @param {ReactComponent} Component The component.
* @param {string} defaultValue The default value.
*
* @returns {ReactElement} The form input for a paper attribute.
*/
=======
analyzeSpam() {
for ( let i = 0; i < 10; i++ ) {
testPapers.forEach( ( { paper: paper } ) => {
this.analyze( {
text: paper._text,
...paper._attributes,
} );
} );
}
}
>>>>>>>
analyzeSpam() {
for ( let i = 0; i < 10; i++ ) {
testPapers.forEach( ( { paper: paper } ) => {
this.analyze( {
text: paper._text,
...paper._attributes,
} );
} );
}
}
/**
* Renders a form input for a paper attribute.
*
* @param {string} id The id.
* @param {string} placeholder The placeholder.
* @param {string} label The label.
* @param {ReactComponent} Component The component.
* @param {string} defaultValue The default value.
*
* @returns {ReactElement} The form input for a paper attribute.
*/ |
<<<<<<<
import arabicDetermineStem from "../morphology/arabic/stem";
=======
import polishDetermineStem from "../morphology/polish/stem";
>>>>>>>
import polishDetermineStem from "../morphology/polish/stem";
import arabicDetermineStem from "../morphology/arabic/stem";
<<<<<<<
ar: arabicDetermineStem,
=======
pl: polishDetermineStem,
>>>>>>>
pl: polishDetermineStem,
ar: arabicDetermineStem, |
<<<<<<<
// Polish papers
import polishPaper1 from "./pl/polishPaper1";
import polishPaper2 from "./pl/polishPaper2";
import polishPaper3 from "./pl/polishPaper3";
=======
// Russian papers
import russianPaper1 from "./ru/russianPaper1";
import russianPaper2 from "./ru/russianPaper2";
import russianPaper3 from "./ru/russianPaper3";
>>>>>>>
// Polish papers
import polishPaper1 from "./pl/polishPaper1";
import polishPaper2 from "./pl/polishPaper2";
import polishPaper3 from "./pl/polishPaper3";
// Russian papers
import russianPaper1 from "./ru/russianPaper1";
import russianPaper2 from "./ru/russianPaper2";
import russianPaper3 from "./ru/russianPaper3";
<<<<<<<
polishPaper1,
polishPaper2,
polishPaper3,
=======
russianPaper1,
russianPaper2,
russianPaper3,
>>>>>>>
polishPaper1,
polishPaper2,
polishPaper3,
russianPaper1,
russianPaper2,
russianPaper3, |
<<<<<<<
function makeDirectories(dirpath, cb) {
var isDir = _f.isDir(dirpath);
var withCwd = dirpath.split(process.cwd());
var parts = (withCwd.length > 1)
? withCwd[1].split('/')
: withCwd[0].split('/');
var dir = path.join( process.cwd(), parts.shift() );
if (parts.length) {
parts.forEach(function(part, index){
dir = path.join(dir, part);
createDir(dir, index)
});
} else {
createDir(dir, 0);
}
function createDir(dir, index) {
if (!_f.isDir(dir)) {
fs.mkdir(dir, function(err){
if (err) {
cb(err, null);
console.error(err);
}
else if ( !parts[index + 1] ){
cb(null);
}
else {
index++;
}
});
} else if ( !parts[index + 1] ){
cb(null);
}
}
}
=======
function parseList (listString){
if(listString)
return listString.split(/[ ,]+/);
}
>>>>>>>
function makeDirectories(dirpath, cb) {
var isDir = _f.isDir(dirpath);
var withCwd = dirpath.split(process.cwd());
var parts = (withCwd.length > 1)
? withCwd[1].split('/')
: withCwd[0].split('/');
var dir = path.join( process.cwd(), parts.shift() );
if (parts.length) {
parts.forEach(function(part, index){
dir = path.join(dir, part);
createDir(dir, index)
});
} else {
createDir(dir, 0);
}
function createDir(dir, index) {
if (!_f.isDir(dir)) {
fs.mkdir(dir, function(err){
if (err) {
cb(err, null);
console.error(err);
}
else if ( !parts[index + 1] ){
cb(null);
}
else {
index++;
}
});
} else if ( !parts[index + 1] ){
cb(null);
}
}
}
function parseList (listString){
if(listString)
return listString.split(/[ ,]+/);
}
<<<<<<<
ucFirst : ucFirst
,toCamelCase : toCamelCase
,makeDirectories : makeDirectories
=======
ucFirst: ucFirst,
toCamelCase: toCamelCase,
parseList: parseList
>>>>>>>
ucFirst : ucFirst
,toCamelCase : toCamelCase
,makeDirectories : makeDirectories
,parseList: parseList |
<<<<<<<
import { convertToRaw } from "draft-js";
import Editor from "draft-js-plugins-editor";
import createMentionPlugin from "draft-js-mention-plugin";
import createSingleLinePlugin from "draft-js-single-line-plugin";
import flow from "lodash/flow";
import debounce from "lodash/debounce";
import isEmpty from "lodash/isEmpty";
import filter from "lodash/filter";
import includes from "lodash/includes";
=======
>>>>>>>
<<<<<<<
// Internal dependencies.
import {
replacementVariablesShape,
recommendedReplacementVariablesShape,
} from "../constants";
import {
serializeEditor,
unserializeEditor,
replaceReplacementVariables,
} from "../serialization";
=======
import ReplacementVariableEditorStandalone from "./ReplacementVariableEditorStandalone";
>>>>>>>
import ReplacementVariableEditorStandalone from "./ReplacementVariableEditorStandalone";
<<<<<<<
* @param {Object} props The props to instantiate this
* editor with.
* @param {string} props.content The content to instantiate this
* editor with.
* @param {Object[]} props.replacementVariables The replacement variables
* that should be available
* in the editor.
* @param {Object[]} props.recommendedReplacementVariables The recommended replacement
* variables that should be
* available in the editor.
* @param {string} props.ariaLabelledBy The ID of the field this is
* labelled by.
* @param {Function} props.onChange Called when the content inside
* is edited.
* @param {Function} props.onFocus Called when this editor is
* focused.
* @param {Function} props.onBlur Called when this editor is
* unfocused.
*
* @returns {void}
=======
* @param {Object} props The component props.
>>>>>>>
* @param {Object} props The component props.
<<<<<<<
}
/**
* Handlers changes to the underlying Draft.js editor.
*
* @param {EditorState} editorState The Draft.js state.
*
* @returns {Promise} A promise for when the state is set.
*/
onChange( editorState ) {
return new Promise( ( resolve ) => {
editorState = replaceReplacementVariables( editorState, this.props.replacementVariables );
this.setState( {
editorState,
}, () => {
this.serializeContent( editorState );
resolve();
} );
} );
}
/**
* Filters replacement variables values based on the search term typed by the user.
*
* @param {string} searchValue The search value typed after the mentionTrigger by the user.
* @param {Object[]} replacementVariables The replacement variables to filter.
*
* @returns {Object[]} A filtered set of replacement variables to show as suggestions to the user.
*/
replacementVariablesFilter( searchValue, replacementVariables ) {
const value = searchValue.toLowerCase();
return replacementVariables.filter( function( suggestion ) {
return ! value || suggestion.name.toLowerCase().indexOf( value ) === 0;
} );
}
/**
* Determines the current replacement variables to be used.
*
* When the search value is empty and there are recommended replacement variables:
* Try to use the recommended replacement variables.
* Otherwise use the normal replacement variables.
*
* @returns {Object[]} The replacement variables to show as suggestions to the user.
*/
determineCurrentReplacementVariables() {
const { recommendedReplacementVariables } = this.props;
const { replacementVariables, searchValue } = this.state;
const useRecommended = searchValue === "" && ! isEmpty( recommendedReplacementVariables );
if ( useRecommended ) {
const recommended = filter(
replacementVariables,
replaceVar => includes( recommendedReplacementVariables, replaceVar.name ),
);
// Ensure there are replacement variables we recommend before using them.
if ( recommended.length !== 0 ) {
return recommended;
}
}
return replacementVariables;
}
/**
* Handles a search change in the mentions plugin.
*
* @param {string} value The search value.
*
* @returns {void}
*/
onSearchChange( { value } ) {
this.setState( {
searchValue: value,
replacementVariables: this.replacementVariablesFilter( value, this.props.replacementVariables ),
} );
=======
>>>>>>>
<<<<<<<
const { MentionSuggestions } = this.mentionsPlugin;
const {
onFocus,
onBlur,
ariaLabelledBy,
descriptionEditorFieldPlaceholder,
} = this.props;
const { editorState } = this.state;
const currentReplacementVariables = this.determineCurrentReplacementVariables();
=======
const {
label,
onChange,
content,
onFocus,
isActive,
isHovered,
replacementVariables,
styleForMobile,
editorRef,
placeholder,
} = this.props;
const InputContainer = this.InputContainer;
>>>>>>>
const {
label,
onChange,
content,
onFocus,
isActive,
isHovered,
replacementVariables,
recommendedReplacementVariables,
styleForMobile,
editorRef,
placeholder,
} = this.props;
const InputContainer = this.InputContainer;
<<<<<<<
<Editor
editorState={ editorState }
onChange={ this.onChange }
onFocus={ onFocus }
onBlur={ onBlur }
plugins={ [ this.mentionsPlugin, this.singleLinePlugin ] }
ref={ this.setEditorRef }
stripPastedStyles={ true }
ariaLabelledBy={ ariaLabelledBy }
placeholder={ descriptionEditorFieldPlaceholder }
/>
<MentionSuggestions
onSearchChange={ this.onSearchChange }
suggestions={ currentReplacementVariables }
onAddMention={ this.onAddMention }
/>
=======
<SimulatedLabel
id={ this.uniqueId }
onClick={ onFocus } >
{ label }
</SimulatedLabel>
<TriggerReplacementVariableSuggestionsButton
onClick={ () => this.triggerReplacementVariableSuggestions() }
isSmallerThanMobileWidth={ styleForMobile }
>
<SvgIcon icon="plus-circle" />
{ __( "Insert snippet variable", "yoast-components" ) }
</TriggerReplacementVariableSuggestionsButton>
<InputContainer
onClick={ onFocus }
isActive={ isActive }
isHovered={ isHovered }>
<ReplacementVariableEditorStandalone
placeholder={ placeholder }
content={ content }
onChange={ onChange }
onFocus={ onFocus }
replacementVariables={ replacementVariables }
ref={ ref => {
this.ref = ref;
editorRef( ref );
} }
ariaLabelledBy={ this.uniqueId }
/>
</InputContainer>
>>>>>>>
<SimulatedLabel
id={ this.uniqueId }
onClick={ onFocus } >
{ label }
</SimulatedLabel>
<TriggerReplacementVariableSuggestionsButton
onClick={ () => this.triggerReplacementVariableSuggestions() }
isSmallerThanMobileWidth={ styleForMobile }
>
<SvgIcon icon="plus-circle" />
{ __( "Insert snippet variable", "yoast-components" ) }
</TriggerReplacementVariableSuggestionsButton>
<InputContainer
onClick={ onFocus }
isActive={ isActive }
isHovered={ isHovered }>
<ReplacementVariableEditorStandalone
placeholder={ placeholder }
content={ content }
onChange={ onChange }
onFocus={ onFocus }
replacementVariables={ replacementVariables }
recommendedReplacementVariables={ recommendedReplacementVariables }
ref={ ref => {
this.ref = ref;
editorRef( ref );
} }
ariaLabelledBy={ this.uniqueId }
/>
</InputContainer>
<<<<<<<
replacementVariables: replacementVariablesShape,
recommendedReplacementVariables: recommendedReplacementVariablesShape,
ariaLabelledBy: PropTypes.string.isRequired,
=======
>>>>>>> |
<<<<<<<
import ar from "../../premium-configuration/data/morphologyData-ar-v9.json";
=======
import pl from "../../premium-configuration/data/morphologyData-pl-v9.json";
>>>>>>>
import pl from "../../premium-configuration/data/morphologyData-pl-v9.json";
import ar from "../../premium-configuration/data/morphologyData-ar-v9.json";
<<<<<<<
ar,
=======
pl,
>>>>>>>
pl,
ar, |
<<<<<<<
import getWordBoundaries from "./wordBoundaries";
import * as strings from "./strings";
=======
import join from "./join";
>>>>>>>
import getWordBoundaries from "./wordBoundaries";
import * as strings from "./strings";
import join from "./join";
<<<<<<<
getWordBoundaries,
strings,
=======
join,
>>>>>>>
getWordBoundaries,
strings,
join, |
<<<<<<<
/* global YoastSEO: true */
YoastSEO = ( "undefined" === typeof YoastSEO ) ? {} : YoastSEO;
var isUndefined = require( "lodash/lang/isUndefined" );
var forEach = require( "lodash/collection/forEach" );
var reduce = require( "lodash/collection/reduce" );
=======
>>>>>>>
var isUndefined = require( "lodash/lang/isUndefined" );
var forEach = require( "lodash/collection/forEach" );
var reduce = require( "lodash/collection/reduce" );
<<<<<<<
YoastSEO.Pluggable.prototype._pollLoadingPlugins = function( pollTime ) {
pollTime = isUndefined( pollTime ) ? 0 : pollTime;
=======
Pluggable.prototype._pollLoadingPlugins = function( pollTime ) {
pollTime = pollTime === undefined ? 0 : pollTime;
>>>>>>>
Pluggable.prototype._pollLoadingPlugins = function( pollTime ) {
pollTime = isUndefined( pollTime ) ? 0 : pollTime;
<<<<<<<
YoastSEO.Pluggable.prototype._allReady = function() {
return reduce( this.plugins, function( allReady, plugin ) {
return allReady && plugin.status === "ready";
}, true );
=======
Pluggable.prototype._allReady = function() {
for ( var plugin in this.plugins ) {
if ( this.plugins[plugin].status !== "ready" ) {
return false;
}
}
return true;
>>>>>>>
Pluggable.prototype._allReady = function() {
return reduce( this.plugins, function( allReady, plugin ) {
return allReady && plugin.status === "ready";
}, true );
<<<<<<<
YoastSEO.Pluggable.prototype._pollTimeExceeded = function() {
forEach ( this.plugins, function( plugin, pluginName ) {
if ( !isUndefined( plugin.options ) && plugin.options.status !== "ready" ) {
console.error( "Error: Plugin " + pluginName + ". did not finish loading in time." );
delete this.plugins[pluginName];
=======
Pluggable.prototype._pollTimeExceeded = function() {
for ( var plugin in this.plugins ) {
if ( this.plugins[plugin].options !== undefined && this.plugins[plugin].options.status !== "ready" ) {
console.error( "Error: Plugin " + plugin + ". did not finish loading in time." );
delete this.plugins[plugin];
>>>>>>>
Pluggable.prototype._pollTimeExceeded = function() {
forEach ( this.plugins, function( plugin, pluginName ) {
if ( !isUndefined( plugin.options ) && plugin.options.status !== "ready" ) {
console.error( "Error: Plugin " + pluginName + ". did not finish loading in time." );
delete this.plugins[pluginName];
<<<<<<<
YoastSEO.Pluggable.prototype._stripIllegalModifications = function( callChain ) {
forEach ( callChain, function( callableObject, index ) {
if ( this._validateOrigin( callableObject.origin ) === false ) {
delete callChain[index];
=======
Pluggable.prototype._stripIllegalModifications = function( callChain ) {
for ( var callableObject in callChain ) {
if ( this._validateOrigin( callChain[callableObject].origin ) === false ) {
delete callChain[callableObject];
>>>>>>>
Pluggable.prototype._stripIllegalModifications = function( callChain ) {
forEach ( callChain, function( callableObject, index ) {
if ( this._validateOrigin( callableObject.origin ) === false ) {
delete callChain[index];
<<<<<<<
YoastSEO.Pluggable.prototype._validateUniqueness = function( pluginName ) {
if ( !isUndefined( this.plugins[pluginName] ) ) {
=======
Pluggable.prototype._validateUniqueness = function( pluginName ) {
if ( this.plugins[pluginName] !== undefined ) {
>>>>>>>
Pluggable.prototype._validateUniqueness = function( pluginName ) {
if ( !isUndefined( this.plugins[pluginName] ) ) { |
<<<<<<<
var stringToRegex = require( "../js/stringProcessing/stringToRegex.js" );
var stripHTMLTags = require( "../js/stringProcessing/stripHTMLTags.js" );
var sanitizeString = require( "../js/stringProcessing/sanitizeString.js" );
=======
var stripSpaces = require( "../js/stringProcessing/stripSpaces.js" );
>>>>>>>
var stringToRegex = require( "../js/stringProcessing/stringToRegex.js" );
var stripHTMLTags = require( "../js/stringProcessing/stripHTMLTags.js" );
var sanitizeString = require( "../js/stringProcessing/sanitizeString.js" );
var stripSpaces = require( "../js/stringProcessing/stripSpaces.js" );
<<<<<<<
var keywordRegex = stringToRegex( dashedKeyword );
=======
var keywordRegex = YoastSEO.getStringHelper().getWordBoundaryRegex( dashedKeyword, "\\-" );
>>>>>>>
var keywordRegex = stringToRegex( dashedKeyword, "\\-" ); |
<<<<<<<
* @param {Object} props The props for the editor
* fields.
* @param {Object[]} props.replacementVariables The replacement variables
* for this editor.
* @param {Object[]} props.recommendedReplacementVariables The recommended replacement
* variables for this editor.
* @param {Object} props.data The initial editor data.
* @param {string} props.data.title The initial title.
* @param {string} props.data.slug The initial slug.
* @param {string} props.data.description The initial description.
* @param {Function} props.onChange Called when the data
* changes.
* @param {Function} props.onFocus Called when a field is
* focused.
* @param {Object} props.titleLengthProgress The values for the title
* length assessment.
* @param {Object} props.descriptionLengthProgress The values for the
* description length
* assessment.
* @param {string} props.activeField The field that is
* currently active.
* @param {string} props.hoveredField The field that is
* currently hovered.
*
=======
* @param {Object} props The props for the editor
* fields.
* @param {Object} props.replacementVariables The replacement variables
* for this editor.
* @param {Object} props.data The initial editor data.
* @param {string} props.data.title The initial title.
* @param {string} props.data.slug The initial slug.
* @param {string} props.data.description The initial description.
* @param {Function} props.onChange Called when the data
* changes.
* @param {Function} props.onFocus Called when a field is
* focused.
* @param {Object} props.titleLengthProgress The values for the title
* length assessment.
* @param {Object} props.descriptionLengthProgress The values for the
* description length
* assessment.
* @param {string} props.activeField The field that is
* currently active.
* @param {string} props.hoveredField The field that is
* currently hovered.
>>>>>>>
* @param {Object} props The props for the editor
* fields.
* @param {Object[]} props.replacementVariables The replacement variables
* for this editor.
* @param {Object[]} props.recommendedReplacementVariables The recommended replacement
* variables for this editor.
* @param {Object} props.data The initial editor data.
* @param {string} props.data.title The initial title.
* @param {string} props.data.slug The initial slug.
* @param {string} props.data.description The initial description.
* @param {Function} props.onChange Called when the data
* changes.
* @param {Function} props.onFocus Called when a field is
* focused.
* @param {Object} props.titleLengthProgress The values for the title
* length assessment.
* @param {Object} props.descriptionLengthProgress The values for the
* description length
* assessment.
* @param {string} props.activeField The field that is
* currently active.
* @param {string} props.hoveredField The field that is
* currently hovered. |
<<<<<<<
import "./index.css";
import App from "./App";
=======
// Internal dependencies.
import './index.css';
import App from './App';
>>>>>>>
// Internal dependencies.
import "./index.css";
import App from "./App"; |
<<<<<<<
var passiveVoice = require( "./researches/passiveVoice.js" );
=======
var getSentenceBeginnings = require( "./researches/getSentenceBeginnings.js" );
>>>>>>>
var passiveVoice = require( "./researches/passiveVoice.js" );
var getSentenceBeginnings = require( "./researches/getSentenceBeginnings.js" );
<<<<<<<
"sentenceVariation": sentenceVariation,
"passiveVoice": passiveVoice
=======
"sentenceVariation": sentenceVariation,
"getSentenceBeginnings": getSentenceBeginnings
>>>>>>>
"sentenceVariation": sentenceVariation,
"passiveVoice": passiveVoice,
"getSentenceBeginnings": getSentenceBeginnings |
<<<<<<<
<FacebookPreview
siteName="yosat.com"
title="YoastCon Workshops"
src="https://yoast.com/app/uploads/2015/06/How_to_choose_keywords_FI.png"
/>
=======
<FacebookPreview
siteName="yoast.com"
description="Description to go along with a landscape image."
src="https://yoast.com/app/uploads/2015/06/How_to_choose_keywords_FI.png"
/>
>>>>>>>
<FacebookPreview
siteName="yoast.com"
title="YoastCon Workshops"
description="Description to go along with a landscape image."
src="https://yoast.com/app/uploads/2015/06/How_to_choose_keywords_FI.png"
/>
<<<<<<<
<FacebookPreview
siteName="yoast.com"
title="YoastCon Workshops"
src="https://yoast.com/app/uploads/2015/09/Author_Joost_x2.png"
/>
=======
<FacebookPreview
siteName="yoast.com"
description="Description to go along with a portrait image."
src="https://yoast.com/app/uploads/2015/09/Author_Joost_x2.png"
/>
>>>>>>>
<FacebookPreview
siteName="yoast.com"
title="YoastCon Workshops"
description="Description to go along with a portrait image."
src="https://yoast.com/app/uploads/2015/09/Author_Joost_x2.png"
/>
<<<<<<<
<FacebookPreview
siteName="yoast.com"
title="YoastCon Workshops"
src="https://yoast.com/app/uploads/2018/09/avatar_user_1_1537774226.png"
/>
=======
<FacebookPreview
siteName="yoast.com"
description="Description to go along with a square image."
src="https://yoast.com/app/uploads/2018/09/avatar_user_1_1537774226.png"
/>
>>>>>>>
<FacebookPreview
siteName="yoast.com"
title="YoastCon Workshops"
description="Description to go along with a square image."
src="https://yoast.com/app/uploads/2018/09/avatar_user_1_1537774226.png"
/>
<<<<<<<
<FacebookPreview
siteName="yoast.com"
title="YoastCon Workshops"
src="https://yoast.com/app/uploads/2018/11/Logo_TYPO3-250x105.png"
/>
=======
<FacebookPreview
siteName="yoast.com"
description="Description to go along with too small an image."
src="https://yoast.com/app/uploads/2018/11/Logo_TYPO3-250x105.png"
/>
>>>>>>>
<FacebookPreview
siteName="yoast.com"
title="YoastCon Workshops"
description="Description to go along with too small an image."
src="https://yoast.com/app/uploads/2018/11/Logo_TYPO3-250x105.png"
/>
<<<<<<<
<FacebookPreview
siteName="yoast.com"
title="YoastCon Workshops"
src="thisisnoimage"
/>
=======
<FacebookPreview
siteName="yoast.com"
description="Description to go along with a faulty image."
src="thisisnoimage"
/>
>>>>>>>
<FacebookPreview
siteName="yoast.com"
title="YoastCon Workshops"
description="Description to go along with a faulty image."
src="thisisnoimage"
/> |
<<<<<<<
// Yoast dependencies.
import { SvgIcon, Button, ScreenReaderText } from "@yoast/components";
import { colors } from "@yoast/components/style-guide";
=======
/* Yoast dependencies */
import { SvgIcon, ScreenReaderText } from "@yoast/components";
import { colors } from "@yoast/style-guide";
import { Button } from "yoast-components/composites/Plugin/Shared/components/Button";
>>>>>>>
// Yoast dependencies.
import { SvgIcon, Button, ScreenReaderText } from "@yoast/components";
import { colors } from "@yoast/style-guide"; |
<<<<<<<
metaDesc = this.refObj.pluggable._applyModifications( "data_meta_desc", metaDesc );
// If no meta has been set, generate one.
if ( isEmpty( metaDesc ) ) {
metaDesc = this.getMetaText();
}
if ( !isEmpty( this.opts.metaDescriptionDate ) ) {
=======
if ( !isEmpty( this.opts.metaDescriptionDate ) && !isEmpty( metaDesc ) ) {
>>>>>>>
metaDesc = this.refObj.pluggable._applyModifications( "data_meta_desc", metaDesc );
// If no meta has been set, generate one.
if ( isEmpty( metaDesc ) ) {
metaDesc = this.getMetaText();
}
if ( !isEmpty( this.opts.metaDescriptionDate ) && !isEmpty( metaDesc ) ) {
<<<<<<<
title: getAnalyzerTitle.call( this ),
url: getAnalyzerUrl.call( this ),
metaDesc: getAnalyzerMetaDesc.call( this )
=======
title: this.data.title,
url: this.data.urlPath,
metaDesc: getMetaDesc.call( this )
>>>>>>>
title: getAnalyzerTitle.call( this ),
url: this.data.urlPath,
metaDesc: getAnalyzerMetaDesc.call( this ) |
<<<<<<<
const reject = require( "lodash/reject" );
const isEmpty = require( "lodash/isEmpty" );
=======
import { escapeRegExp } from "lodash-es";
import { reject } from "lodash-es";
import { isEmpty } from "lodash-es";
>>>>>>>
import { reject } from "lodash-es";
import { isEmpty } from "lodash-es"; |
<<<<<<<
import PropTypes from "prop-types";
import "./buttons.css";
=======
import Button, { sharedButtonPropTypes, sharedButtonDefaultProps } from "./Button";
import { __ } from "@wordpress/i18n";
>>>>>>>
import PropTypes from "prop-types";
import "./buttons.css";
import { __ } from "@wordpress/i18n"; |
<<<<<<<
let sentencePart = this.getSentencePart();
const participle = this.getParticiple();
let language = this.getLanguage();
=======
const sentencePart = this.getSentencePart();
const participleIndex = sentencePart.indexOf( this.getParticiple() );
const language = this.getLanguage();
>>>>>>>
const sentencePart = this.getSentencePart();
const participle = this.getParticiple();
const language = this.getLanguage(); |
<<<<<<<
=======
this.optionalAttributes = this.parseOptionalAttributes();
>>>>>>>
this.optionalAttributes = this.parseOptionalAttributes();
<<<<<<<
<Textarea name={this.props.name}
id={this.props.name}
onChange={this.props.onChange}
optionalAttributes={this.optionalAttributes.field}
hasFocus={this.props.hasFocus}
value={this.props.value}
/>
=======
<div>
<Textarea name={this.props.name}
id={this.props.name}
onChange={this.props.onChange}
optionalAttributes={this.optionalAttributes.field}
value={this.props.value}
/>
<Explanation text={this.props.properties.explanation}/>
</div>
>>>>>>>
<div>
<Textarea name={this.props.name}
id={this.props.name}
onChange={this.props.onChange}
optionalAttributes={this.optionalAttributes.field}
hasFocus={this.props.hasFocus}
value={this.props.value}
/>
<Explanation text={this.props.properties.explanation}/>
</div>
<<<<<<<
return (
<Input name={this.props.name}
id={this.props.name}
type="text"
onChange={this.props.onChange}
value={this.props.value}
hasFocus={this.props.hasFocus}
optionalAttributes={this.optionalAttributes.field}
/>
);
=======
return (
<div>
<Input name={this.props.name}
id={this.props.name}
type="text"
onChange={this.props.onChange}
value={this.props.value}
optionalAttributes={this.optionalAttributes.field}/>
<Explanation text={this.props.properties.explanation}/>
</div>
);
>>>>>>>
return (
<div>
<Input name={this.props.name}
id={this.props.name}
type="text"
onChange={this.props.onChange}
value={this.props.value}
hasFocus={this.props.hasFocus}
optionalAttributes={this.optionalAttributes.field}/>
<Explanation text={this.props.properties.explanation}/>
</div>
); |
<<<<<<<
// Dutch papers
import dutchPaper1 from "./nl/dutchPaper1";
import dutchPaper2 from "./nl/dutchPaper2";
import dutchPaper3 from "./nl/dutchPaper3";
=======
// Catalan papers
import catalanPaper1 from "./ca/catalanPaper1";
import catalanPaper2 from "./ca/catalanPaper2";
import catalanPaper3 from "./ca/catalanPaper3";
>>>>>>>
// Catalan papers
import catalanPaper1 from "./ca/catalanPaper1";
import catalanPaper2 from "./ca/catalanPaper2";
import catalanPaper3 from "./ca/catalanPaper3";
// Dutch papers
import dutchPaper1 from "./nl/dutchPaper1";
import dutchPaper2 from "./nl/dutchPaper2";
import dutchPaper3 from "./nl/dutchPaper3";
<<<<<<<
dutchPaper1,
dutchPaper2,
dutchPaper3,
=======
catalanPaper1,
catalanPaper2,
catalanPaper3,
>>>>>>>
catalanPaper1,
catalanPaper2,
catalanPaper3,
dutchPaper1,
dutchPaper2,
dutchPaper3, |
<<<<<<<
=======
* Returns the metaDescription, includes the date if it is set.
*
* @returns {string}
*/
var getMetaDesc = function() {
var metaDesc = this.data.metaDesc;
if ( !isEmpty( this.opts.metaDescriptionDate ) && !isEmpty( metaDesc ) ) {
metaDesc = this.opts.metaDescriptionDate + " - " + this.data.metaDesc;
}
return metaDesc;
};
/**
>>>>>>> |
<<<<<<<
var findKeywordInPageTitle = require( "./researches/findKeywordInPageTitle.js" );
var getKeywordDensity = require( "./analyses/getKeywordDensity.js" );
var countImages = require( "./analyses/getImageStatistics.js" );
var countLinks = require( "./researches/getLinkStatistics.js" );
=======
var findKeywordInPageTitle = require( "./analyses/findKeywordInPageTitle.js" );
var getKeywordDensity = require( "./researches/getKeywordDensity.js" );
var countLinks = require( "./analyses/getLinkStatistics.js" );
>>>>>>>
var findKeywordInPageTitle = require( "./researches/findKeywordInPageTitle.js" );
var getKeywordDensity = require( "./researches/getKeywordDensity.js" );
var countLinks = require( "./researches/getLinkStatistics.js" ); |
<<<<<<<
let otherAuxiliariesInfinitive = [ "avoir", "aller", "venir", "devoir", "pouvoir", "sembler", "paraître", "paraitre", "mettre", "finir",
"d'avoir", "d'aller", "n'avoir", "l'avoir" ];
=======
const otherAuxiliariesInfinitive = [
"avoir", "aller", "venir", "devoir", "pouvoir", "sembler", "paraître", "paraitre", "mettre", "finir",
"d'avoir", "d'aller", "n'avoir",
];
>>>>>>>
const otherAuxiliariesInfinitive = [ "avoir", "aller", "venir", "devoir", "pouvoir", "sembler", "paraître", "paraitre", "mettre", "finir",
"d'avoir", "d'aller", "n'avoir", "l'avoir" ]; |
<<<<<<<
this.source = new this.config.source( args, this );
this.plugins = new YoastSEO.Plugins();
this.checkInputs();
=======
this.source = this.config.source;
this.callbacks = this.config.callbacks;
>>>>>>>
this.plugins = new YoastSEO.Plugins();
this.checkInputs();
this.callbacks = this.config.callbacks; |
<<<<<<<
onClick: ( evt ) => {
this.props.onClick( name, evt )
=======
// See github.com/Yoast/wordpress-seo/issues/5530.
tooltipStyles: {
userSelect: "auto",
},
onClick: () => {
this.props.onClick( name )
>>>>>>>
// See github.com/Yoast/wordpress-seo/issues/5530.
tooltipStyles: {
userSelect: "auto",
},
onClick: ( evt ) => {
this.props.onClick( name, evt ) |
<<<<<<<
// Plurals ending in -is/-os/-us.
[ "vrais", "vrai" ],
[ "numéros", "numéro" ],
[ "trous", "trou" ],
// Exceptions for which -is/-os/-us should not be stemmed.
[ "bis", "bis" ],
[ "diffus", "diffus" ],
[ "clos", "clos" ],
=======
// Words with the plural suffix -x.
[ "baux", "bau" ],
[ "feux", "feu" ],
[ "cailloux", "caillou" ],
[ "étaux", "étau" ],
>>>>>>>
// Words with the plural suffix -x.
[ "baux", "bau" ],
[ "feux", "feu" ],
[ "cailloux", "caillou" ],
[ "étaux", "étau" ],
// Plurals ending in -is/-os/-us.
[ "vrais", "vrai" ],
[ "numéros", "numéro" ],
[ "trous", "trou" ],
// Exceptions for which -is/-os/-us should not be stemmed.
[ "bis", "bis" ],
[ "diffus", "diffus" ],
[ "clos", "clos" ], |
<<<<<<<
isDescriptionGenerated: this.state.isDescriptionGenerated,
onClick: onClick.bind( null, "description" ),
onMouseOver: partial( onMouseOver, "description" ),
onMouseLeave: partial( onMouseLeave, "description" ),
=======
isDescriptionGenerated: isDescriptionGenerated,
onMouseUp: onMouseUp.bind( null, "description" ),
onMouseEnter: onMouseEnter.bind( null, "description" ),
onMouseLeave: onMouseLeave.bind( null ),
>>>>>>>
isDescriptionGenerated: this.state.isDescriptionGenerated,
onMouseUp: onMouseUp.bind( null, "description" ),
onMouseEnter: onMouseEnter.bind( null, "description" ),
onMouseLeave: onMouseLeave.bind( null ),
<<<<<<<
<MobileDescriptionOverflowContainer
isDescriptionGenerated={ this.state.isDescriptionGenerated }
=======
<MobileDescription
>>>>>>>
<MobileDescription
isDescriptionGenerated={ this.state.isDescriptionGenerated } |
<<<<<<<
isMulti,
isSearchable,
=======
inputId,
>>>>>>>
isMulti,
isSearchable,
inputId,
<<<<<<<
name={ name }
=======
inputId={ inputId }
name={ `${ name }[]` }
>>>>>>>
name={ name }
inputId={ inputId }
<<<<<<<
YoastReactSelect.propTypes = selectProps;
YoastReactSelect.defaultProps = selectDefaultProps;
/**
* SingleSelect component.
* @param {object} props The functional component props.
*
* @returns {React.Component} The react-select MultiSelect component.
*/
export const SingleSelect = ( props ) => {
const { onChange } = props;
const onChangeHandler = useCallback( selection => onChange( selection.value ) );
return <YoastReactSelect
{ ...props }
isMulti={ false }
isSearchable={ true }
onChange={ onChangeHandler }
/>;
};
SingleSelect.propTypes = selectProps;
SingleSelect.defaultProps = selectDefaultProps;
/**
* MultiSelect component.
* @param {object} props The functional component props.
*
* @returns {React.Component} The react-select MultiSelect component.
*/
export const MultiSelect = ( props ) => {
const { onChange } = props;
const onChangeHandler = useCallback( selection => {
// Make sure that selection is always an array.
if ( ! selection ) {
selection = [];
}
// Only call the onChange handler on the selected values.
onChange( selection.map( option => option.value ) );
} );
return <YoastReactSelect
{ ...props }
isMulti={ true }
isSearchable={ false }
onChange={ onChangeHandler }
/>;
};
MultiSelect.propTypes = selectProps;
MultiSelect.defaultProps = selectDefaultProps;
=======
MultiSelect.propTypes = {
...selectProps,
inputId: PropTypes.string,
};
MultiSelect.defaultProps = {
...selectDefaultProps,
inputId: null,
};
>>>>>>>
YoastReactSelect.propTypes = selectProps;
YoastReactSelect.defaultProps = selectDefaultProps;
/**
* SingleSelect component.
* @param {object} props The functional component props.
*
* @returns {React.Component} The react-select MultiSelect component.
*/
export const SingleSelect = ( props ) => {
const { onChange } = props;
const onChangeHandler = useCallback( selection => onChange( selection.value ) );
return <YoastReactSelect
{ ...props }
isMulti={ false }
isSearchable={ true }
onChange={ onChangeHandler }
/>;
};
SingleSelect.propTypes = selectProps;
SingleSelect.defaultProps = selectDefaultProps;
/**
* MultiSelect component.
* @param {object} props The functional component props.
*
* @returns {React.Component} The react-select MultiSelect component.
*/
export const MultiSelect = ( props ) => {
const { onChange } = props;
const onChangeHandler = useCallback( selection => {
// Make sure that selection is always an array.
if ( ! selection ) {
selection = [];
}
// Only call the onChange handler on the selected values.
onChange( selection.map( option => option.value ) );
} );
return <YoastReactSelect
{ ...props }
isMulti={ true }
isSearchable={ false }
onChange={ onChangeHandler }
/>;
};
MultiSelect.propTypes = selectProps;
MultiSelect.defaultProps = selectDefaultProps; |
<<<<<<<
import FacebookTitle from "./FacebookTitle";
=======
import FacebookDescription from "./FacebookDescription";
>>>>>>>
import FacebookTitle from "./FacebookTitle";
import FacebookDescription from "./FacebookDescription";
<<<<<<<
<FacebookTitle title={ props.title } />
=======
<FacebookDescription description={ props.description } />
>>>>>>>
<FacebookTitle title={ props.title } />
<FacebookDescription description={ props.description } />
<<<<<<<
title: PropTypes.string.isRequired,
=======
description: PropTypes.string,
>>>>>>>
title: PropTypes.string.isRequired,
description: PropTypes.string, |
<<<<<<<
js.setAttribute('id', 'frozenCookieScript');
js.setAttribute('src', 'https://raw.github.com/Icehawk78/FrozenCookies/master/frozen_cookies.js');
=======
js.setAttribute('src', 'http://icehawk78.github.io/FrozenCookies/frozen_cookies.js');
>>>>>>>
js.setAttribute('id', 'frozenCookieScript');
js.setAttribute('src', 'http://icehawk78.github.io/FrozenCookies/frozen_cookies.js'); |
<<<<<<<
spell: SPELLS.AVENGING_WRATH,
category: Abilities.SPELL_CATEGORIES.COOLDOWNS,
=======
spell: SPELLS.AVENGING_WRATH_RET,
buffSpellId: SPELLS.AVENGING_WRATH_RET.id,
category: Abilities.SPELL_CATEGORIES.SEMI_DEFENSIVE,
>>>>>>>
spell: SPELLS.AVENGING_WRATH,
buffSpellId: SPELLS.AVENGING_WRATH_RET.id,
category: Abilities.SPELL_CATEGORIES.SEMI_DEFENSIVE, |
<<<<<<<
var wordCountInText = require( "./researches/wordCountInText.js" );
=======
// assessments
var wordCount = require( "./stringProcessing/countWords.js" );
var getLinkStatistics = require( "./analyses/getLinkStatistics.js" );
>>>>>>>
// assessments
var wordCountInText = require( "./researches/wordCountInText.js" );
var getLinkStatistics = require( "./analyses/getLinkStatistics.js" );
<<<<<<<
"wordCountInText": wordCountInText
=======
"wordCount": wordCount,
"getLinkStatistics": getLinkStatistics
>>>>>>>
"wordCountInText": wordCountInText,
"getLinkStatistics": getLinkStatistics |
<<<<<<<
// German papers
import germanPaper1 from "./de/germanPaper1";
=======
// French papers
import frenchPaper1 from "./fr/frenchPaper1";
import frenchPaper2 from "./fr/frenchPaper2";
import frenchPaper3 from "./fr/frenchPaper3";
>>>>>>>
// German papers
import germanPaper1 from "./de/germanPaper1";
// French papers
import frenchPaper1 from "./fr/frenchPaper1";
import frenchPaper2 from "./fr/frenchPaper2";
import frenchPaper3 from "./fr/frenchPaper3";
<<<<<<<
germanPaper1,
=======
frenchPaper1,
frenchPaper2,
frenchPaper3,
>>>>>>>
germanPaper1,
frenchPaper1,
frenchPaper2,
frenchPaper3, |
<<<<<<<
// At this point the desktop view is scrollable: set a CSS class to show the Scroll Hint message.
domManipulation.addClass( this.viewElement, "snippet-editor__view--desktop-has-scroll" );
} else {
this.setDesktopMode();
}
};
/**
* When the window is resized, sets the visibilty of the Scroll Hint message.
*
* @param {number} previewWidth the width of the Snippet Preview container.
*
* @returns {void}
*/
SnippetPreviewToggler.prototype.setScrollHintVisibility = function( previewWidth ) {
domManipulation.removeClass( this.viewElement, "snippet-editor__view--desktop-has-scroll" );
if ( previewWidth < minimumDesktopWidth ) {
domManipulation.addClass( this.viewElement, "snippet-editor__view--desktop-has-scroll" );
=======
>>>>>>>
// At this point the desktop view is scrollable: set a CSS class to show the Scroll Hint message.
domManipulation.addClass( this.viewElement, "snippet-editor__view--desktop-has-scroll" );
} else {
this.setDesktopMode();
}
};
/**
* When the window is resized, sets the visibilty of the Scroll Hint message.
*
* @param {number} previewWidth the width of the Snippet Preview container.
*
* @returns {void}
*/
SnippetPreviewToggler.prototype.setScrollHintVisibility = function( previewWidth ) {
domManipulation.removeClass( this.viewElement, "snippet-editor__view--desktop-has-scroll" );
if ( previewWidth < minimumDesktopWidth ) {
domManipulation.addClass( this.viewElement, "snippet-editor__view--desktop-has-scroll" ); |
<<<<<<<
});
describe( "The SnippetPreview format functions", function(){
it( "formats texts to use in the SnippetPreview", function(){
// Makes lodash think this is a valid HTML element
var mockElement = [];
mockElement.nodeType = 1;
var mockApp = {
rawData: {
snippetTitle: "<span>snippetTitle</span>",
snippetCite: "homeurl",
snippetMeta: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ultricies placerat nisl, in tempor ligula. Pellentesque in risus non quam maximus maximus sed a dui. In sed.",
keyword: "keyword"
},
pluggable: {
loaded: true,
_applyModifications: function(name, text){return text}
}
};
var snippetPreview = new SnippetPreview({
analyzerApp: mockApp,
targetElement: mockElement
});
expect( snippetPreview.formatTitle() ).toBe( "snippetTitle" );
expect( snippetPreview.formatMeta() ).toBe( "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ultricies placerat nisl, in tempor ligula. Pellentesque in risus non quam maximus maximus sed " );
expect( snippetPreview.formatCite() ).toBe( "homeurl/" );
expect( snippetPreview.formatKeyword( "a string with keyword" ) ).toBe( "a string with<strong> keyword</strong>" );
mockApp = {
rawData: {
snippetCite: "key-word",
keyword: "key word"
},
pluggable: {
loaded: true,
_applyModifications: function(name, text){return text}
}
};
snippetPreview = new SnippetPreview({
analyzerApp: mockApp,
targetElement: mockElement
});
expect( snippetPreview.formatCite() ).toBe ("<strong>key-word</strong>/" );
});
} );
=======
});
describe( "Adds dashes to the keyword for highlighting in the snippet", function() {
it( "returns a keyword with strong tags", function() {
var mockApp = {
rawData: {
keyword: "keyword"
}
};
var mockElement = [];
mockElement.nodeType = 1;
var snippetPreview = new SnippetPreview({
analyzerApp: mockApp,
targetElement: mockElement
});
expect(snippetPreview.formatKeyword( "this is a keyword" ) ).toBe( "this is a<strong> keyword</strong>" );
});
});
describe( "Adds dashes to the keyword for highlighting in the snippet", function() {
it( "returns a keyword with strong tags", function() {
var mockApp = {
rawData: {
keyword: "key-word"
}
};
var mockElement = [];
mockElement.nodeType = 1;
var snippetPreview = new SnippetPreview({
analyzerApp: mockApp,
targetElement: mockElement
});
expect(snippetPreview.formatKeyword( "this is a key-word with dash" ) ).toBe( "this is a<strong> key-word </strong>with dash" );
});
});
>>>>>>>
});
describe( "The SnippetPreview format functions", function(){
it( "formats texts to use in the SnippetPreview", function(){
// Makes lodash think this is a valid HTML element
var mockElement = [];
mockElement.nodeType = 1;
var mockApp = {
rawData: {
snippetTitle: "<span>snippetTitle</span>",
snippetCite: "homeurl",
snippetMeta: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ultricies placerat nisl, in tempor ligula. Pellentesque in risus non quam maximus maximus sed a dui. In sed.",
keyword: "keyword"
},
pluggable: {
loaded: true,
_applyModifications: function(name, text){return text}
}
};
var snippetPreview = new SnippetPreview({
analyzerApp: mockApp,
targetElement: mockElement
});
expect( snippetPreview.formatTitle() ).toBe( "snippetTitle" );
expect( snippetPreview.formatMeta() ).toBe( "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ultricies placerat nisl, in tempor ligula. Pellentesque in risus non quam maximus maximus sed " );
expect( snippetPreview.formatCite() ).toBe( "homeurl/" );
expect( snippetPreview.formatKeyword( "a string with keyword" ) ).toBe( "a string with<strong> keyword</strong>" );
mockApp = {
rawData: {
snippetCite: "key-word",
keyword: "key word"
},
pluggable: {
loaded: true,
_applyModifications: function(name, text){return text}
}
};
snippetPreview = new SnippetPreview({
analyzerApp: mockApp,
targetElement: mockElement
});
expect( snippetPreview.formatCite() ).toBe ("<strong>key-word</strong>/" );
});
} );
describe( "Adds dashes to the keyword for highlighting in the snippet", function() {
it( "returns a keyword with strong tags", function() {
var mockApp = {
rawData: {
keyword: "keyword"
}
};
var mockElement = [];
mockElement.nodeType = 1;
var snippetPreview = new SnippetPreview({
analyzerApp: mockApp,
targetElement: mockElement
});
expect(snippetPreview.formatKeyword( "this is a keyword" ) ).toBe( "this is a<strong> keyword</strong>" );
});
});
describe( "Adds dashes to the keyword for highlighting in the snippet", function() {
it( "returns a keyword with strong tags", function() {
var mockApp = {
rawData: {
keyword: "key-word"
}
};
var mockElement = [];
mockElement.nodeType = 1;
var snippetPreview = new SnippetPreview({
analyzerApp: mockApp,
targetElement: mockElement
});
expect(snippetPreview.formatKeyword( "this is a key-word with dash" ) ).toBe( "this is a<strong> key-word </strong>with dash" );
});
}); |
<<<<<<<
import getResults from "../specHelpers/getAssessorResults";
let Assessor = require( "../../js/cornerstone/seoAssessor.js" );
let Paper = require( "../../js/values/Paper.js" );
=======
let Assessor = require( "../../src/cornerstone/seoAssessor.js" );
let Paper = require( "../../src/values/Paper.js" );
>>>>>>>
import getResults from "../specHelpers/getAssessorResults";
let Assessor = require( "../../src/cornerstone/seoAssessor.js" );
let Paper = require( "../../src/values/Paper.js" ); |
<<<<<<<
const collectTopicForms = require( "../researches/buildKeywordForms" ).collectForms;
=======
const isEqual = require( "lodash/isEqual" );
>>>>>>>
const isEqual = require( "lodash/isEqual" );
const collectTopicForms = require( "../researches/buildKeywordForms" ).collectForms;
<<<<<<<
/**
* Check whether keyphraseForms are available.
* @returns {boolean} Returns true if the Paper has keyphrase forms.
*/
Paper.prototype.hasKeyphraseForms = function() {
return ! ( isEmpty( this._attributes.topicForms.keyphraseForms ) );
};
/**
* Return the keyphrase forms or an empty array if no keyphrase forms are available.
* @returns {Array} Returns Keyphrase forms
*/
Paper.prototype.getKeyphraseForms = function() {
return this._attributes.topicForms.keyphraseForms;
};
/**
* Check whether synonymsForms are available.
* @returns {boolean} Returns true if the Paper has synonyms forms.
*/
Paper.prototype.hasSynonymsForms = function() {
return ! ( isEmpty( this._attributes.topicForms.synonymsForms ) );
};
/**
* Return the synonyms forms or an empty array if no synonyms forms are available.
* @returns {Array} Returns synonyms forms
*/
Paper.prototype.getSynonymsForms = function() {
return this._attributes.topicForms.synonymsForms;
};
/**
* Check whether topicForms are available.
* @returns {boolean} Returns true if the Paper has topic forms.
*/
Paper.prototype.hasTopicForms = function() {
return ! ( isEmpty( this._attributes.topicForms ) );
};
/**
* Return the topic forms or an empty object if no topic forms are available.
* @returns {Object} Returns topic forms
*/
Paper.prototype.getTopicForms = function() {
return this._attributes.topicForms;
};
=======
/**
* Serializes the Paper instance to an object.
*
* @returns {Object} The serialized Paper.
*/
Paper.prototype.serialize = function() {
return {
_parseClass: "Paper",
text: this._text,
...this._attributes,
};
};
/**
* Checks whether the given paper has the same properties as this instance.
*
* @param {Paper} paper The paper to compare to.
*
* @returns {boolean} Whether the given paper is identical or not.
*/
Paper.prototype.equals = function( paper ) {
return this._text === paper.getText() && isEqual( this._attributes, paper._attributes );
};
/**
* Parses the object to a Paper.
*
* @param {Object} serialized The serialized object.
*
* @returns {Paper} The parsed Paper.
*/
Paper.parse = function( serialized ) {
// _parseClass is taken here so it doesn't end up in the attributes.
// eslint-disable-next-line no-unused-vars
const { text, _parseClass, ...attributes } = serialized;
return new Paper( text, attributes );
};
>>>>>>>
/**
* Check whether keyphraseForms are available.
* @returns {boolean} Returns true if the Paper has keyphrase forms.
*/
Paper.prototype.hasKeyphraseForms = function() {
return ! ( isEmpty( this._attributes.topicForms.keyphraseForms ) );
};
/**
* Return the keyphrase forms or an empty array if no keyphrase forms are available.
* @returns {Array} Returns Keyphrase forms
*/
Paper.prototype.getKeyphraseForms = function() {
return this._attributes.topicForms.keyphraseForms;
};
/**
* Check whether synonymsForms are available.
* @returns {boolean} Returns true if the Paper has synonyms forms.
*/
Paper.prototype.hasSynonymsForms = function() {
return ! ( isEmpty( this._attributes.topicForms.synonymsForms ) );
};
/**
* Return the synonyms forms or an empty array if no synonyms forms are available.
* @returns {Array} Returns synonyms forms
*/
Paper.prototype.getSynonymsForms = function() {
return this._attributes.topicForms.synonymsForms;
};
/**
* Check whether topicForms are available.
* @returns {boolean} Returns true if the Paper has topic forms.
*/
Paper.prototype.hasTopicForms = function() {
return ! ( isEmpty( this._attributes.topicForms ) );
};
/**
* Return the topic forms or an empty object if no topic forms are available.
* @returns {Object} Returns topic forms
*/
Paper.prototype.getTopicForms = function() {
return this._attributes.topicForms;
};
/*
* Serializes the Paper instance to an object.
*
* @returns {Object} The serialized Paper.
*/
Paper.prototype.serialize = function() {
return {
_parseClass: "Paper",
text: this._text,
...this._attributes,
};
};
/**
* Checks whether the given paper has the same properties as this instance.
*
* @param {Paper} paper The paper to compare to.
*
* @returns {boolean} Whether the given paper is identical or not.
*/
Paper.prototype.equals = function( paper ) {
return this._text === paper.getText() && isEqual( this._attributes, paper._attributes );
};
/**
* Parses the object to a Paper.
*
* @param {Object} serialized The serialized object.
*
* @returns {Paper} The parsed Paper.
*/
Paper.parse = function( serialized ) {
// _parseClass is taken here so it doesn't end up in the attributes.
// eslint-disable-next-line no-unused-vars
const { text, _parseClass, ...attributes } = serialized;
return new Paper( text, attributes );
}; |
<<<<<<<
import arabicFunctionWordsFactory from "../researches/arabic/functionWords.js";
const arabicFunctionWords = arabicFunctionWordsFactory();
=======
import hebrewFunctionWordsFactory from "../researches/hebrew/functionWords.js";
const hebrewFunctionWords = hebrewFunctionWordsFactory();
>>>>>>>
import hebrewFunctionWordsFactory from "../researches/hebrew/functionWords.js";
const hebrewFunctionWords = hebrewFunctionWordsFactory();
import arabicFunctionWordsFactory from "../researches/arabic/functionWords.js";
const arabicFunctionWords = arabicFunctionWordsFactory();
<<<<<<<
ar: arabicFunctionWords,
=======
he: hebrewFunctionWords,
>>>>>>>
he: hebrewFunctionWords,
ar: arabicFunctionWords, |
<<<<<<<
import Toggle from "../composites/Plugin/Shared/components/Toggle.js"
=======
import IconLabelledButton from "../composites/Plugin/Shared/components/IconLabelledButton";
>>>>>>>
import Toggle from "../composites/Plugin/Shared/components/Toggle.js"
import IconLabelledButton from "../composites/Plugin/Shared/components/IconLabelledButton";
<<<<<<<
<Toggle ariaLabel="Test the Toggle"/>
<Separator />
=======
<IconLabelledButton icon="question-circle">Need help?</IconLabelledButton>
<IconLabelledButton icon="gear">Settings</IconLabelledButton>
<IconLabelledButton
hoverBackgroundColor="#a4286a"
hoverColor="white"
icon="eye"
>
Custom Hover
</IconLabelledButton>
<IconLabelledButton
focusBackgroundColor="#e1bee7"
focusBorderColor="#a4286a"
focusColor="#a4286a"
icon="key"
>
Custom Focus
</IconLabelledButton>
<IconLabelledButton
activeBackgroundColor="yellow"
activeBorderColor="black"
activeColor="black"
icon="list"
>
Custom Active
</IconLabelledButton>
<IconLabelledButton icon="plus" textFontSize="13px">Custom Font Size</IconLabelledButton>
<Separator />
>>>>>>>
<Toggle ariaLabel="Test the Toggle"/>
<Separator />
<IconLabelledButton icon="question-circle">Need help?</IconLabelledButton>
<IconLabelledButton icon="gear">Settings</IconLabelledButton>
<IconLabelledButton
hoverBackgroundColor="#a4286a"
hoverColor="white"
icon="eye"
>
Custom Hover
</IconLabelledButton>
<IconLabelledButton
focusBackgroundColor="#e1bee7"
focusBorderColor="#a4286a"
focusColor="#a4286a"
icon="key"
>
Custom Focus
</IconLabelledButton>
<IconLabelledButton
activeBackgroundColor="yellow"
activeBorderColor="black"
activeColor="black"
icon="list"
>
Custom Active
</IconLabelledButton>
<IconLabelledButton icon="plus" textFontSize="13px">Custom Font Size</IconLabelledButton>
<Separator /> |
<<<<<<<
import Paper from 'material-ui/Paper';
import RaisedButton from 'material-ui/RaisedButton';
import YoastLogo from './YoastLogo';
=======
>>>>>>>
import RaisedButton from 'material-ui/RaisedButton';
import YoastLogo from './YoastLogo';
<<<<<<<
for ( let stepIndex = 0; stepIndex < stepKeyNamesLength; stepIndex ++ ) {
let stepKeyName = stepKeyNames[stepIndex];
=======
for ( let stepIndex = 0; stepIndex < stepKeyNamesLength; stepIndex ++ ) {
let stepKeyName = stepKeyNames[ stepIndex ];
>>>>>>>
for ( let stepIndex = 0; stepIndex < stepKeyNamesLength; stepIndex ++ ) {
let stepKeyName = stepKeyNames[ stepIndex ];
<<<<<<<
if ( stepIndex > - 1 && stepIndex < stepKeyNamesLength - 1 ) {
steps[stepKeyName].next = stepKeyNames[stepIndex + 1];
=======
if ( stepIndex > - 1 && stepIndex < stepKeyNamesLength - 1 ) {
steps[ stepKeyName ].next = stepKeyNames[ stepIndex + 1 ];
>>>>>>>
if ( stepIndex > - 1 && stepIndex < stepKeyNamesLength - 1 ) {
steps[ stepKeyName ].next = stepKeyNames[ stepIndex + 1 ];
<<<<<<<
if ( this.props.fields[fieldName] ) {
fields[fieldName] = this.props.fields[fieldName];
}
=======
if ( this.props.fields[ fieldName ] ) {
fields[ fieldName ] = this.props.fields[ fieldName ];
}
>>>>>>>
if ( this.props.fields[ fieldName ] ) {
fields[ fieldName ] = this.props.fields[ fieldName ];
} |
<<<<<<<
import hungarianDetermineStem from "../morphology/hungarian/stem";
=======
import hebrewDetermineStem from "../morphology/hebrew/stem";
>>>>>>>
import hungarianDetermineStem from "../morphology/hungarian/stem";
import hebrewDetermineStem from "../morphology/hebrew/stem";
<<<<<<<
hu: hungarianDetermineStem,
=======
he: hebrewDetermineStem,
>>>>>>>
hu: hungarianDetermineStem,
he: hebrewDetermineStem, |
<<<<<<<
assessments.keywordDensity = require( "./assessments/keywordDensity.js" );
=======
assessments.metaDescriptionLength = require( "./assessments/metaDescriptionLength.js" );
>>>>>>>
assessments.keywordDensity = require( "./assessments/keywordDensity.js" );
assessments.metaDescriptionLength = require( "./assessments/metaDescriptionLength.js" ); |
<<<<<<<
const wordMatch = require( "../stringProcessing/matchTextWithWord.js" );
const findTopicFormsInString = require( "./findKeywordFormsInString.js" ).findTopicFormsInString;
=======
import wordMatch from "../stringProcessing/matchTextWithWord.js";
>>>>>>>
import wordMatch from "../stringProcessing/matchTextWithWord.js";
const findTopicFormsInString = require( "./findKeywordFormsInString.js" ).findTopicFormsInString;
<<<<<<<
module.exports = function( paper, researcher ) {
=======
export default function( paper ) {
const title = paper.getTitle();
>>>>>>>
export default function( paper, researcher ) { |
<<<<<<<
// Irregular plurals.
[ "курицу", "куриц" ],
[ "кур", "куриц" ],
[ "ребёнок", "ребёнк" ],
[ "детей", "ребёнк" ],
[ "ребята", "ребёнк" ],
[ "уху", "ухо" ],
[ "ушами", "ухо" ],
=======
// Words that belong to doNotStemSuffix exceptions
[ "космодром", "космодром" ],
[ "детдом", "детдом" ],
[ "альманах", "альманах" ],
>>>>>>>
// Irregular plurals.
[ "курицу", "куриц" ],
[ "кур", "куриц" ],
[ "ребёнок", "ребёнк" ],
[ "детей", "ребёнк" ],
[ "ребята", "ребёнк" ],
[ "уху", "ухо" ],
[ "ушами", "ухо" ],
// Words that belong to doNotStemSuffix exceptions
[ "космодром", "космодром" ],
[ "детдом", "детдом" ],
[ "альманах", "альманах" ], |
<<<<<<<
expect(analyzeScore[3].text).toBe("The focus keyword doesn't appear in the first paragraph of the copy, make sure the topic is clear immediately.");
=======
expect(analyzeScore[3].text).toBe("The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately.");
>>>>>>>
expect(analyzeScore[3].text).toBe("The focus keyword doesn't appear in the first paragraph of the copy. Make sure the topic is clear immediately."); |
<<<<<<<
=======
/**
* SoupSpec constructor
*/
var SoupSpec = function (soupName, features) {
this.soupName = soupName;
this.features = features;
};
>>>>>>>
/**
* SoupSpec constructor
*/
var SoupSpec = function (soupName, features) {
this.soupName = soupName;
this.features = features;
};
<<<<<<<
var removeSoup = function (isGlobalStore, soupName, successCB, errorCB) {
if (checkFirstArg(arguments)) return;
storeConsole.debug("SmartStore.removeSoup:isGlobalStore=" +isGlobalStore+ ",soupName=" + soupName);
=======
var registerSoupWithSpec = function (soupSpec, indexSpecs, successCB, errorCB) {
storeConsole.debug("SmartStore.registerSoupWithSpec: '" + JSON.stringify(soupSpec) + "' indexSpecs: " + JSON.stringify(indexSpecs));
exec(SALESFORCE_MOBILE_SDK_VERSION, successCB, errorCB, SERVICE,
"pgRegisterSoup",
[{"soupSpec": soupSpec, "indexes": indexSpecs}]
);
};
var removeSoup = function (soupName, successCB, errorCB) {
storeConsole.debug("SmartStore.removeSoup: " + soupName);
>>>>>>>
var registerSoupWithSpec = function (isGlobalStore, soupSpec, indexSpecs, successCB, errorCB) {
storeConsole.debug("SmartStore.registerSoupWithSpec:isGlobalStore=" +isGlobalStore+ ",soupSpec="+ JSON.stringify(soupSpec) + ",indexSpecs: " + JSON.stringify(indexSpecs));
exec(SALESFORCE_MOBILE_SDK_VERSION, successCB, errorCB, SERVICE,
"pgRegisterSoup",
[{"soupSpec": soupSpec, "indexes": indexSpecs, "isGlobalStore": isGlobalStore}]
);
};
var removeSoup = function (isGlobalStore, soupName, successCB, errorCB) {
if (checkFirstArg(arguments)) return;
storeConsole.debug("SmartStore.removeSoup:isGlobalStore=" +isGlobalStore+ ",soupName=" + soupName);
<<<<<<<
var alterSoup = function (isGlobalStore, soupName, indexSpecs, reIndexData, successCB, errorCB) {
if (checkFirstArg(arguments)) return;
storeConsole.debug("SmartStore.alterSoup:isGlobalStore=" +isGlobalStore+ ",soupName=" + soupName + ",indexSpecs=" + JSON.stringify(indexSpecs));
=======
var getSoupSpec = function(soupName, successCB, errorCB) {
storeConsole.debug("SmartStore.getSoupSpec: " + soupName);
exec(SALESFORCE_MOBILE_SDK_VERSION, successCB, errorCB, SERVICE,
"pgGetSoupSpec",
[{"soupName": soupName}]
);
};
var alterSoup = function (soupName, indexSpecs, reIndexData, successCB, errorCB) {
storeConsole.debug("SmartStore.alterSoup: '" + soupName + "' indexSpecs: " + JSON.stringify(indexSpecs));
>>>>>>>
var getSoupSpec = function(isGlobalStore, soupName, successCB, errorCB) {
storeConsole.debug("SmartStore.getSoupSpec:isGlobalStore=" +isGlobalStore+ ",soupName=" + soupName);
exec(SALESFORCE_MOBILE_SDK_VERSION, successCB, errorCB, SERVICE,
"pgGetSoupSpec",
[{"soupName": soupName, "isGlobalStore": isGlobalStore}]
);
};
var alterSoup = function (isGlobalStore, soupName, indexSpecs, reIndexData, successCB, errorCB) {
if (checkFirstArg(arguments)) return;
storeConsole.debug("SmartStore.alterSoup:isGlobalStore=" +isGlobalStore+ ",soupName=" + soupName + ",indexSpecs=" + JSON.stringify(indexSpecs)); |
<<<<<<<
expect( assessment.getText() ).toBe( "5% of the sentences contain a passive voice, which is less than or equal to the recommended maximum of 10%." );
=======
expect( assessment.getText() ).toBe( "5% of the sentences is written in the passive voice, which is within the recommended range." );
expect( assessment.hasMarks() ).toBe( true );
>>>>>>>
expect( assessment.getText() ).toBe( "5% of the sentences contain a passive voice, which is less than or equal to the recommended maximum of 10%." );
expect( assessment.hasMarks() ).toBe( true );
<<<<<<<
expect( assessment.getText() ).toBe( "10% of the sentences contain a passive voice, which is less than or equal to the recommended maximum of 10%." );
=======
expect( assessment.getText() ).toBe( "10% of the sentences is written in the passive voice, which is within the recommended range." );
expect( assessment.hasMarks() ).toBe( true );
>>>>>>>
expect( assessment.getText() ).toBe( "10% of the sentences contain a passive voice, which is less than or equal to the recommended maximum of 10%." );
expect( assessment.hasMarks() ).toBe( true ); |
<<<<<<<
=======
const angleRight = ( color ) => "data:image/svg+xml;charset=utf8," + encodeURIComponent(
'<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">' +
'<path fill="' + color + '" d="M1152 896q0 26-19 45l-448 448q-19 19-45 19t-45-19-19-45v-896q0-26 19-45t45-19 45 19l448 448q19 19 19 45z" />' +
"</svg>"
);
/**
* Returns the color of the caret for an InputContainer based on the props.
*
* @param {Object} props The props for this InputContainer.
* @returns {string} The color the caret should have.
*/
function getCaretColor( props ) {
switch ( true ) {
case props.isActive:
return colors.$color_snippet_focus;
case props.isHovered:
return colors.$color_snippet_hover;
default:
return "transparent";
}
}
/*
* The caret is defined in this CSS because we cannot mount/unmount Draft.js.
*
* For some reason if you wrap the InputContainer with `.extend` or `styled()`
* the ReplacementVariableEditor in the children will unmount and mount on every focus.
* This means that Draft.js cannot keep track of the browser selection. Which
* breaks the editor completely. We circumvent this by settings the caret styles
* conditionally.
*/
const InputContainer = styled.div.attrs( {
} )`
padding: 3px 5px;
border: 1px solid ${ ( props ) => props.isActive ? "#5b9dd9" : "#ddd" };
box-shadow: ${ ( props ) => props.isActive ? "0 0 2px rgba(30,140,190,.8);" : "inset 0 1px 2px rgba(0,0,0,.07)" };
background-color: #fff;
color: #32373c;
outline: 0;
transition: 50ms border-color ease-in-out;
position: relative;
font-family: Arial, Roboto-Regular, HelveticaNeue, sans-serif;
font-size: 14px;
cursor: text;
&::before {
display: block;
position: absolute;
top: -1px;
left: -25px;
width: 24px;
height: 24px;
background-image: url( ${ ( props ) => angleRight( getCaretColor( props ) ) });
background-size: 25px;
content: "";
}
`;
const TitleInputContainer = InputContainer.extend`
.public-DraftStyleDefault-block {
line-height: 24px;
height: 24px;
overflow: hidden;
white-space: nowrap;
}
`;
>>>>>>>
<<<<<<<
<TitleInputContainerWithCaretStyles
=======
<TriggerReplacementVariableSuggestionsButton
onClick={ () => this.triggerReplacementVariableSuggestions( "title" ) }
isSmallerThanMobileWidth={ isSmallerThanMobileWidth }
>
<SvgIcon icon="plus-circle" />
{ __( "Insert snippet variable", "yoast-components" ) }
</TriggerReplacementVariableSuggestionsButton>
<TitleInputContainer
>>>>>>>
<TriggerReplacementVariableSuggestionsButton
onClick={ () => this.triggerReplacementVariableSuggestions( "title" ) }
isSmallerThanMobileWidth={ isSmallerThanMobileWidth }
>
<SvgIcon icon="plus-circle" />
{ __( "Insert snippet variable", "yoast-components" ) }
</TriggerReplacementVariableSuggestionsButton>
<TitleInputContainerWithCaretStyles
<<<<<<<
<DescriptionInputContainerWithCaretStyles
=======
<TriggerReplacementVariableSuggestionsButton
onClick={ () => this.triggerReplacementVariableSuggestions( "description" ) }
isSmallerThanMobileWidth={ isSmallerThanMobileWidth }
>
<SvgIcon icon="plus-circle" />
{ __( "Insert snippet variable", "yoast-components" ) }
</TriggerReplacementVariableSuggestionsButton>
<DescriptionInputContainer
>>>>>>>
<TriggerReplacementVariableSuggestionsButton
onClick={ () => this.triggerReplacementVariableSuggestions( "description" ) }
isSmallerThanMobileWidth={ isSmallerThanMobileWidth }
>
<SvgIcon icon="plus-circle" />
{ __( "Insert snippet variable", "yoast-components" ) }
</TriggerReplacementVariableSuggestionsButton>
<DescriptionInputContainerWithCaretStyles |
<<<<<<<
/* global YoastSEO: true */
YoastSEO = ( "undefined" === typeof YoastSEO ) ? {} : YoastSEO;
var calculateFleschReading = require( "./analyses/calculateFleschReading.js" );
var checkStringForStopwords = require( "./analyses/checkStringForStopwords.js" );
var checkUrlForStopwords = require( "./analyses/checkUrlForStopwords.js" );
var checkForKeywordInUrl = require( "./analyses/countKeywordInUrl.js" );
var checkForKeywordDoubles = require( "./analyses/checkForKeywordDoubles.js" );
var findKeywordInFirstParagraph = require( "./analyses/findKeywordInFirstParagraph.js" );
var findKeywordInPageTitle = require( "./analyses/findKeywordInPageTitle.js" );
var getKeywordDensity = require( "./analyses/getKeywordDensity.js" );
var countImages = require( "./analyses/getImageStatistics.js" );
var countLinks = require( "./analyses/getLinkStatistics.js" );
var getKeyphraseLength = require( "./analyses/getWordCount.js" );
var isUrlTooLong = require( "./analyses/isUrlTooLong.js" );
var getSubheadings = require( "./analyses/matchKeywordInSubheadings.js" );
var countWords = require( "./stringProcessing/countWords.js" );
var matchTextWithWord = require( "./stringProcessing/matchTextWithWord.js" );
=======
>>>>>>>
/* global YoastSEO: true */
YoastSEO = ( "undefined" === typeof YoastSEO ) ? {} : YoastSEO;
var calculateFleschReading = require( "./analyses/calculateFleschReading.js" );
var checkStringForStopwords = require( "./analyses/checkStringForStopwords.js" );
var checkUrlForStopwords = require( "./analyses/checkUrlForStopwords.js" );
var checkForKeywordInUrl = require( "./analyses/countKeywordInUrl.js" );
var checkForKeywordDoubles = require( "./analyses/checkForKeywordDoubles.js" );
var findKeywordInFirstParagraph = require( "./analyses/findKeywordInFirstParagraph.js" );
var findKeywordInPageTitle = require( "./analyses/findKeywordInPageTitle.js" );
var getKeywordDensity = require( "./analyses/getKeywordDensity.js" );
var countImages = require( "./analyses/getImageStatistics.js" );
var countLinks = require( "./analyses/getLinkStatistics.js" );
var getKeyphraseLength = require( "./analyses/getWordCount.js" );
var isUrlTooLong = require( "./analyses/isUrlTooLong.js" );
var getSubheadings = require( "./analyses/matchKeywordInSubheadings.js" );
var countWords = require( "./stringProcessing/countWords.js" );
var matchTextWithWord = require( "./stringProcessing/matchTextWithWord.js" );
<<<<<<<
YoastSEO.Analyzer.prototype.wordCount = function() {
=======
Analyzer.prototype.wordCount = function() {
var countWords = require( "./stringProcessing/countWords.js" );
>>>>>>>
Analyzer.prototype.wordCount = function() {
<<<<<<<
YoastSEO.Analyzer.prototype.keyphraseSizeCheck = function() {
return [ { test: "keyphraseSizeCheck", result: getKeyphraseLength( this.config.keyword ) } ];
=======
Analyzer.prototype.keyphraseSizeCheck = function() {
var getKeyphraseLength = require( "./analyses/getWordCount.js" );
return [ { test: "keyphraseSizeCheck", result: getKeyphraseLength( this.paper.getKeyword() ) } ];
>>>>>>>
Analyzer.prototype.keyphraseSizeCheck = function() {
return [ { test: "keyphraseSizeCheck", result: getKeyphraseLength( this.paper.getKeyword() ) } ];
<<<<<<<
YoastSEO.Analyzer.prototype.keywordDensity = function() {
=======
Analyzer.prototype.keywordDensity = function() {
var matchWords = require( "./stringProcessing/matchTextWithWord.js" );
var countWords = require( "./stringProcessing/countWords.js" );
var getKeywordDensity = require( "./analyses/getKeywordDensity.js" );
>>>>>>>
Analyzer.prototype.keywordDensity = function() {
<<<<<<<
this.__store.keywordCount = matchTextWithWord( this.config.text, this.config.keyword );
=======
this.__store.keywordCount = matchWords( this.config.text, this.paper.getKeyword() );
>>>>>>>
this.__store.keywordCount = matchTextWithWord( this.config.text, this.paper.getKeyword() );
<<<<<<<
YoastSEO.Analyzer.prototype.keywordCount = function() {
return matchTextWithWord( this.config.text, this.config.keyword );
=======
Analyzer.prototype.keywordCount = function() {
var matchTextWithWord = require( "./stringProcessing/matchTextWithWord.js" );
var keywordCount = matchTextWithWord( this.config.text, this.paper.getKeyword() );
return keywordCount;
>>>>>>>
Analyzer.prototype.keywordCount = function() {
return matchTextWithWord( this.config.text, this.paper.getKeyword() );
<<<<<<<
YoastSEO.Analyzer.prototype.subHeadings = function() {
return [ { test: "subHeadings", result: getSubheadings( this.config.text, this.config.keyword ) } ];
=======
Analyzer.prototype.subHeadings = function() {
var getSubheadings = require( "./analyses/matchKeywordInSubheadings.js" );
var result = [ { test: "subHeadings", result: getSubheadings( this.config.text, this.paper.getKeyword() ) } ];
return result;
>>>>>>>
Analyzer.prototype.subHeadings = function() {
return [ { test: "subHeadings", result: getSubheadings( this.config.text, this.paper.getKeyword() ) } ];
<<<<<<<
YoastSEO.Analyzer.prototype.stopwords = function() {
var matches = checkStringForStopwords( this.config.keyword );
=======
Analyzer.prototype.stopwords = function() {
var checkStringForStopwords = require( "./analyses/checkStringForStopwords.js" );
var matches = checkStringForStopwords( this.paper.getKeyword() );
>>>>>>>
Analyzer.prototype.stopwords = function() {
var matches = checkStringForStopwords( this.paper.getKeyword() );
<<<<<<<
YoastSEO.Analyzer.prototype.fleschReading = function() {
=======
Analyzer.prototype.fleschReading = function() {
var calculateFleschReading = require( "./analyses/calculateFleschReading.js" );
>>>>>>>
Analyzer.prototype.fleschReading = function() {
<<<<<<<
YoastSEO.Analyzer.prototype.linkCount = function() {
var keyword = this.config.keyword;
=======
Analyzer.prototype.linkCount = function() {
var countLinks = require( "./analyses/getLinkStatistics.js" );
var keyword = this.paper.getKeyword();
>>>>>>>
Analyzer.prototype.linkCount = function() {
var keyword = this.paper.getKeyword();
<<<<<<<
YoastSEO.Analyzer.prototype.imageCount = function() {
return [ { test: "imageCount", result: countImages( this.config.text, this.config.keyword ) } ];
=======
Analyzer.prototype.imageCount = function() {
var countImages = require( "./analyses/getImageStatistics.js" );
return [ { test: "imageCount", result: countImages( this.config.text, this.paper.getKeyword() ) } ];
>>>>>>>
Analyzer.prototype.imageCount = function() {
return [ { test: "imageCount", result: countImages( this.config.text, this.paper.getKeyword() ) } ];
<<<<<<<
YoastSEO.Analyzer.prototype.pageTitleKeyword = function() {
=======
Analyzer.prototype.pageTitleKeyword = function() {
var findKeywordInPageTitle = require( "./analyses/findKeywordInPageTitle.js" );
>>>>>>>
Analyzer.prototype.pageTitleKeyword = function() {
<<<<<<<
YoastSEO.Analyzer.prototype.firstParagraph = function() {
return [ { test: "firstParagraph", result: findKeywordInFirstParagraph( this.config.text, this.config.keyword ) } ];
=======
Analyzer.prototype.firstParagraph = function() {
var findKeywordInFirstParagraph = require( "./analyses/findKeywordInFirstParagraph.js" );
var result = [ { test: "firstParagraph", result: findKeywordInFirstParagraph( this.config.text, this.paper.getKeyword() ) } ];
return result;
>>>>>>>
Analyzer.prototype.firstParagraph = function() {
return [ { test: "firstParagraph", result: findKeywordInFirstParagraph( this.config.text, this.paper.getKeyword() ) } ];
<<<<<<<
YoastSEO.Analyzer.prototype.metaDescriptionKeyword = function() {
=======
Analyzer.prototype.metaDescriptionKeyword = function() {
var wordMatch = require( "./stringProcessing/matchTextWithWord.js" );
>>>>>>>
Analyzer.prototype.metaDescriptionKeyword = function() {
<<<<<<<
if ( typeof this.config.meta !== "undefined" && typeof this.config.keyword !== "undefined" &&
this.config.meta !== "" && this.config.keyword !== "" ) {
result[ 0 ].result = matchTextWithWord( this.config.meta, this.config.keyword );
=======
if ( typeof this.config.meta !== "undefined" && this.config.meta !== "" && this.paper.hasKeyword() ) {
result[ 0 ].result = wordMatch( this.config.meta, this.paper.getKeyword() );
>>>>>>>
if ( typeof this.config.meta !== "undefined" && this.config.meta !== "" && this.paper.hasKeyword() ) {
result[ 0 ].result = matchTextWithWord( this.config.meta, this.paper.getKeyword() );
<<<<<<<
YoastSEO.Analyzer.prototype.urlKeyword = function() {
=======
Analyzer.prototype.urlKeyword = function() {
var checkForKeywordInUrl = require( "./analyses/countKeywordInUrl.js" );
>>>>>>>
Analyzer.prototype.urlKeyword = function() {
<<<<<<<
YoastSEO.Analyzer.prototype.urlLength = function() {
=======
Analyzer.prototype.urlLength = function() {
var isUrlTooLong = require( "./analyses/isUrlTooLong.js" );
>>>>>>>
Analyzer.prototype.urlLength = function() {
<<<<<<<
YoastSEO.Analyzer.prototype.urlStopwords = function() {
return [ { test: "urlStopwords", result: checkUrlForStopwords( this.config.url ) } ];
=======
Analyzer.prototype.urlStopwords = function() {
var checkUrlForStopwords = require( "./analyses/checkUrlForStopwords.js" );
var result = [ { test: "urlStopwords", result: checkUrlForStopwords( this.config.url ) } ];
return result;
>>>>>>>
Analyzer.prototype.urlStopwords = function() {
return [ { test: "urlStopwords", result: checkUrlForStopwords( this.config.url ) } ];
<<<<<<<
if ( typeof this.config.keyword !== "undefined" && typeof this.config.usedKeywords !== "undefined" ) {
result[0].result = checkForKeywordDoubles( this.config.keyword, this.config.usedKeywords );
=======
if ( this.paper.hasKeyword() && typeof this.config.usedKeywords !== "undefined" ) {
var checkForKeywordDoubles = require( "./analyses/checkForKeywordDoubles.js" );
result[0].result = checkForKeywordDoubles( this.paper.getKeyword(), this.config.usedKeywords );
>>>>>>>
if ( this.paper.hasKeyword() && typeof this.config.usedKeywords !== "undefined" ) {
result[0].result = checkForKeywordDoubles( this.paper.getKeyword(), this.config.usedKeywords ); |
<<<<<<<
var countSentencesFromText = require( "./researches/countSentencesFromText.js" );
var countSentencesFromDescription = require( "./researches/countSentencesFromDescription.js" );
=======
var getSubheadingLength = require( "./researches/getSubheadingLength.js" );
>>>>>>>
var countSentencesFromText = require( "./researches/countSentencesFromText.js" );
var countSentencesFromDescription = require( "./researches/countSentencesFromDescription.js" );
var getSubheadingLength = require( "./researches/getSubheadingLength.js" );
<<<<<<<
"pageTitleLength": pageTitleLength,
"countSentencesFromText": countSentencesFromText,
"countSentencesFromDescription": countSentencesFromDescription
=======
"pageTitleLength": pageTitleLength,
"getSubheadingLength": getSubheadingLength
>>>>>>>
"pageTitleLength": pageTitleLength,
"countSentencesFromText": countSentencesFromText,
"countSentencesFromDescription": countSentencesFromDescription,
"getSubheadingLength": getSubheadingLength |
<<<<<<<
var metaText;
if(typeof this.refObj.source.formattedData.excerpt !== "undefined"){
metaText = this.refObj.source.formattedData.excerpt.substring(0, analyzerConfig.maxMeta);
}
if(metaText === ""){
var indexMatches = this.getIndexMatches();
var periodMatches = this.getPeriodMatches();
metaText = this.refObj.source.formattedData.text.substring(0, analyzerConfig.maxMeta);
var curStart = 0;
if (indexMatches.length > 0) {
for (var j = 0; j < periodMatches.length;) {
if (periodMatches[0] < indexMatches[0]) {
curStart = periodMatches.shift();
} else {
if (curStart > 0) {
curStart += 2;
}
break;
=======
var indexMatches = this.getIndexMatches();
var periodMatches = this.getPeriodMatches();
var metaText = this.refObj.inputs.textString.substring(0, analyzerConfig.maxMeta);
var curStart = 0;
if(indexMatches.length > 0) {
for (var i = 0; i < periodMatches.length; ) {
if (periodMatches[0] < indexMatches[0] ) {
curStart = periodMatches.shift();
} else {
if( curStart > 0 ){
curStart += 2;
>>>>>>>
var metaText;
if(typeof this.refObj.source.formattedData.excerpt !== "undefined"){
metaText = this.refObj.source.formattedData.excerpt.substring(0, analyzerConfig.maxMeta);
}
if(metaText === ""){
var indexMatches = this.getIndexMatches();
var periodMatches = this.getPeriodMatches();
metaText = this.refObj.source.formattedData.text.substring(0, analyzerConfig.maxMeta);
var curStart = 0;
if (indexMatches.length > 0) {
for (var j = 0; j < periodMatches.length;) {
if (periodMatches[0] < indexMatches[0]) {
curStart = periodMatches.shift();
} else {
if (curStart > 0) {
curStart += 2;
}
break;
<<<<<<<
while ( ( match = this.refObj.source.formattedData.text.indexOf( this.refObj.source.formattedData.keyword, i ) ) > -1 ) {
=======
//starts at 0, locates first match of the keyword.
var match = this.refObj.inputs.textString.indexOf( this.refObj.inputs.keyword, i );
//runs the loop untill no more indexes are found, and match returns -1.
while ( ( match ) > -1 ) {
>>>>>>>
//starts at 0, locates first match of the keyword.
var match = this.refObj.source.formattedData.text.indexOf( this.refObj.inputs.keyword, i );
//runs the loop untill no more indexes are found, and match returns -1.
while ( ( match ) > -1 ) {
<<<<<<<
i = match + this.refObj.source.formattedData.keyword.length;
=======
//pushes location to indexMatches and increase i with the length of keyword.
i = match + this.refObj.inputs.keyword.length;
>>>>>>>
//pushes location to indexMatches and increase i with the length of keyword.
i = match + this.refObj.source.formattedData.keyword.length;
<<<<<<<
var replacer = new RegExp( this.refObj.source.formattedData.keyword, "ig" );
=======
//matches case insensitive and global
var replacer = new RegExp( this.refObj.inputs.keyword, "ig" );
>>>>>>>
//matches case insensitive and global
var replacer = new RegExp( this.refObj.source.formattedData.keyword, "ig" );
<<<<<<<
var replacer = this.refObj.source.formattedData.keyword.replace(" ", "[-_]");
=======
var replacer = this.refObj.inputs.keyword.replace(" ", "[-_]");
//matches case insensitive and global
>>>>>>>
var replacer = this.refObj.source.formattedData.keyword.replace(" ", "[-_]");
//matches case insensitive and global |
<<<<<<<
this._scheduler = new Scheduler();
this._paper = new Paper( "" );
=======
this._scheduler = new Scheduler( { resetQueue: false } );
this._paper = new Paper( "", {} );
this._relatedKeywords = {};
>>>>>>>
this._scheduler = new Scheduler();
this._paper = new Paper( "", {} );
this._relatedKeywords = {}; |
<<<<<<<
let data, dataDe, dataNL, dataES, dataFR, dataRU, dataIT, dataPT, dataID, dataPL, dataAR, dataSV, dataHE, dataHU, dataTR = {};
=======
let data, dataDe, dataNL, dataES, dataFR, dataRU, dataIT, dataPT, dataID, dataPL, dataAR, dataSV, dataHE, dataHU, dataNB = {};
>>>>>>>
let data, dataDe, dataNL, dataES, dataFR, dataRU, dataIT, dataPT, dataID, dataPL, dataAR, dataSV, dataHE, dataHU, dataNB, dataTR = {};
<<<<<<<
// eslint-disable-next-line global-require
dataTR = require( "../../../../packages/yoastseo/premium-configuration/data/morphologyData-tr-v1.json" );
=======
// eslint-disable-next-line global-require
dataNB = require( "../../../../packages/yoastseo/premium-configuration/data/morphologyData-nb-v1.json" );
>>>>>>>
// eslint-disable-next-line global-require
dataNB = require( "../../../../packages/yoastseo/premium-configuration/data/morphologyData-nb-v1.json" );
// eslint-disable-next-line global-require
dataTR = require( "../../../../packages/yoastseo/premium-configuration/data/morphologyData-tr-v1.json" );
<<<<<<<
return merge( data, dataDe, dataNL, dataES, dataFR, dataRU, dataIT, dataPT, dataID, dataPL, dataAR, dataSV, dataHE, dataHU, dataTR );
=======
return merge( data, dataDe, dataNL, dataES, dataFR, dataRU, dataIT, dataPT, dataID, dataPL, dataAR, dataSV, dataHE, dataHU, dataNB );
>>>>>>>
return merge( data, dataDe, dataNL, dataES, dataFR, dataRU, dataIT, dataPT, dataID, dataPL, dataAR, dataSV, dataHE, dataHU, dataNB, dataTR ); |
<<<<<<<
"findKeywordInPageTitle": findKeywordInPageTitle,
=======
"calculateFleschReading": calculateFleschReading,
>>>>>>>
"findKeywordInPageTitle": findKeywordInPageTitle,
"calculateFleschReading": calculateFleschReading, |
<<<<<<<
describe( "A test for filtering function words in supported languages", function() {
// Function word: nitten
const forms = buildStems( "nitten katter", "nb", false );
expect( forms ).toEqual(
new TopicPhrase(
[ new StemOriginalPair( "katter", "katter" ) ],
false )
);
} );
=======
describe( "A test for filtering function words in supported languages", function() {
// Function word: onların
const forms = buildStems( "onların köpek", "tr", false );
expect( forms ).toEqual(
new TopicPhrase(
[ new StemOriginalPair( "köpek", "köpek" ) ],
false )
);
} );
>>>>>>>
describe( "A test for filtering function words in supported languages", function() {
// Function word: nitten
const forms = buildStems( "nitten katter", "nb", false );
expect( forms ).toEqual(
new TopicPhrase(
[ new StemOriginalPair( "katter", "katter" ) ],
false )
);
} );
describe( "A test for filtering function words in supported languages", function() {
// Function word: onların
const forms = buildStems( "onların köpek", "tr", false );
expect( forms ).toEqual(
new TopicPhrase(
[ new StemOriginalPair( "köpek", "köpek" ) ],
false )
);
} ); |
<<<<<<<
<FacebookSiteName siteName={ props.siteName } />
<FacebookTitle title={ props.title } />
=======
<FacebookSiteAndAuthorNames siteName={ props.siteName } authorName={ props.authorName } />
>>>>>>>
<FacebookSiteAndAuthorNames siteName={ props.siteName } authorName={ props.authorName } />
<FacebookTitle title={ props.title } />
<<<<<<<
title: PropTypes.string.isRequired,
=======
authorName: PropTypes.string,
>>>>>>>
title: PropTypes.string.isRequired,
authorName: PropTypes.string, |
<<<<<<<
=======
const ToggleDiv = styled.div`
display: flex;
width: 100%;
justify-content: space-between;
align-items: center;
`;
>>>>>>> |
<<<<<<<
console.log( relevantWords );
return getKeywordComponent( relevantWords, keywordLimit );
=======
const keywords = relevantWords.slice( 0, keywordLimit ).map( word => {
return isFeatureEnabled( "improvedInternalLinking" ) ? word.getWord() : word.getCombination();
} );
return ( <WordList
title={ __( "Prominent words", "yoast-components" ) }
words={ keywords }
classNamePrefix="yoast-keyword-suggestions"
showBeforeList={ () => {
return ( <p>{ getKeywordSuggestionExplanation( keywords ) }</p> );
} }
showAfterList={
() => {
return getKeywordResearchArticleLink();
}
}
/>
);
>>>>>>>
console.log( relevantWords );
const keywords = relevantWords.slice( 0, keywordLimit ).map( word => {
return isFeatureEnabled( "improvedInternalLinking" ) ? word.getWord() : word.getCombination();
} );
return getKeywordComponent( relevantWords, keywordLimit ); |
<<<<<<<
var paragraphTooLong = require( "./assessments/paragraphTooLongAssessment.js" );
var paragraphTooShort = require( "./assessments/paragraphTooShortAssessment.js" );
=======
var subHeadingLength = require( "./assessments/getSubheadingLengthAssessment.js" );
>>>>>>>
var paragraphTooLong = require( "./assessments/paragraphTooLongAssessment.js" );
var paragraphTooShort = require( "./assessments/paragraphTooShortAssessment.js" );
var subHeadingLength = require( "./assessments/getSubheadingLengthAssessment.js" );
<<<<<<<
fleschReadingEase: fleschReadingEase,
paragraphTooLong: paragraphTooLong,
paragraphTooShort: paragraphTooShort
=======
fleschReadingEase: fleschReadingEase,
subHeadingLength: subHeadingLength
>>>>>>>
fleschReadingEase: fleschReadingEase,
paragraphTooLong: paragraphTooLong,
paragraphTooShort: paragraphTooShort,
subHeadingLength: subHeadingLength |
<<<<<<<
var findKeywordInPageTitle = require( "./researches/findKeywordInPageTitle.js" );
=======
var getLinkStatistics = require( "./analyses/getLinkStatistics.js" );
var matchKeywordInSubheadings = require( "./researches/matchKeywordInSubheadings.js" );
var getKeywordDensity = require( "./researches/getKeywordDensity.js" );
>>>>>>>
var findKeywordInPageTitle = require( "./researches/findKeywordInPageTitle.js" );
var matchKeywordInSubheadings = require( "./researches/matchKeywordInSubheadings.js" );
var getKeywordDensity = require( "./researches/getKeywordDensity.js" ); |
<<<<<<<
assessments.metaDescriptionKeyword = require ( "./assessments/metaDescriptionKeyword.js" );
=======
assessments.imageCount = require( "./assessments/imageCount.js" );
>>>>>>>
assessments.metaDescriptionKeyword = require ( "./assessments/metaDescriptionKeyword.js" );
assessments.imageCount = require( "./assessments/imageCount.js" ); |
<<<<<<<
mobileWidth: PropTypes.number,
=======
descriptionEditorFieldPlaceholder: PropTypes.string,
>>>>>>>
descriptionEditorFieldPlaceholder: PropTypes.string,
mobileWidth: PropTypes.number, |
<<<<<<<
class: function(){if (ctx.cellDistance<14) return 'groupLabel groupLabelText small'; else return 'groupLabel groupLabelText'},
=======
class: function () {
if (ctx.cellDistance < 14) return 'groupLabel small'; else return 'groupLabel'
},
>>>>>>>
class: function () {
if (ctx.cellDistance<14) return 'groupLabel groupLabelText small'; else return 'groupLabel groupLabelText'
},
<<<<<<<
collapseIcon
.text(function(d){
if (d.data.isCollapsed==0) return "\uf147";
else return "\uf196"
})
.attr({
"transform":"translate("+(-ctx.leftOffset+2+5)+","+(ctx.cellSize/2+5)+")"
}).style({
"font-size":"10px"
})
// -- Decoration for Filter Groups
var allQueryGroups = groupRows.filter(function(d){return (d.data instanceof QueryGroup)})
var groupDeleteIcon = allQueryGroups.selectAll(".groupDeleteIcon").data(function(d){return [d]})
var groupDeleteIconEnter = groupDeleteIcon.enter().append("g") .attr({
class:"groupDeleteIcon"
})
// groupDeleteIconEnter.append("rect").attr({
// x:-5,
// y:-10,
// width:10,
// height:10,
// fill:"#f46d43"
// })
groupDeleteIconEnter.append("text")
.text("\uf05e")
.on({
"click":
function(d){
console.log(d);
var index = -1;
UpSetState.logicGroups.forEach(function(dd,i){
if (dd.id == d.id) index=i;
})
UpSetState.logicGroups.splice(index,1);
UpSetState.logicGroupChanged= true;
updateState();
rowTransition();
}
}).style({ "fill":"#f46d43"})
groupDeleteIcon.attr({
"transform":"translate("+(ctx.xStartSetSizes-12)+","+(ctx.cellSize/2+4)+")"
})
// allQueryGroups.each(function(queryGroup){
//
// var groupData = queryGroupDecoItems.map(function(pE){
// return {pElement:pE,dataSource: queryGroup}
// })
//
// var panelElementItems = d3.select(this).selectAll(".decoQuery")
// .data(groupData);
// var panelElementsEnter = panelElementItems.enter()
// .append("g").attr("class","decoQuery")
//
// panelElementsEnter.append("rect").attr({
// fill:function(d){return d.pElement.color},
// opacity:.5
// })
// panelElementsEnter.append("text").text(function(d){return d.pElement.id});
//
// panelElementItems.select("rect").attr({
// x:function(d,i){return ctx.xStartSetSizes-((i+1) *ctx.cellDistance/2)-1},
// y:1,
// width:+(ctx.cellDistance/2-1),
// height:ctx.cellSize-2
// })
//
// panelElementItems.select("text")
// .attr({
// class: function(){if (ctx.cellDistance<14) return 'groupLabel small'; else return 'groupLabel'},
// y: ctx.cellSize-3,
// x: function(d,i){return ctx.xStartSetSizes-(i +.5)*ctx.cellDistance/2-1.5}
//// 'font-size': ctx.cellSize - 6
// }).style({
// "text-anchor":"middle",
// "font-weight":"bold"
// }).on('click', function (d) {
// console.log(d.dataSource);
// })
// })
// })
// --- Horizon Bars for size.
=======
>>>>>>>
collapseIcon
.text(function(d){
if (d.data.isCollapsed==0) return "\uf147";
else return "\uf196"
})
.attr({
"transform":"translate("+(-ctx.leftOffset+2+5)+","+(ctx.cellSize/2+5)+")"
}).style({
"font-size":"10px"
})
// -- Decoration for Filter Groups
var allQueryGroups = groupRows.filter(function(d){return (d.data instanceof QueryGroup)})
var groupDeleteIcon = allQueryGroups.selectAll(".groupDeleteIcon").data(function(d){return [d]})
var groupDeleteIconEnter = groupDeleteIcon.enter().append("g") .attr({
class:"groupDeleteIcon"
})
// groupDeleteIconEnter.append("rect").attr({
// x:-5,
// y:-10,
// width:10,
// height:10,
// fill:"#f46d43"
// })
groupDeleteIconEnter.append("text")
.text("\uf05e")
.on({
"click":
function(d){
console.log(d);
var index = -1;
UpSetState.logicGroups.forEach(function(dd,i){
if (dd.id == d.id) index=i;
})
UpSetState.logicGroups.splice(index,1);
UpSetState.logicGroupChanged= true;
updateState();
rowTransition();
}
}).style({ "fill":"#f46d43"})
groupDeleteIcon.attr({
"transform":"translate("+(ctx.xStartSetSizes-12)+","+(ctx.cellSize/2+4)+")"
})
// allQueryGroups.each(function(queryGroup){
//
// var groupData = queryGroupDecoItems.map(function(pE){
// return {pElement:pE,dataSource: queryGroup}
// })
//
// var panelElementItems = d3.select(this).selectAll(".decoQuery")
// .data(groupData);
// var panelElementsEnter = panelElementItems.enter()
// .append("g").attr("class","decoQuery")
//
// panelElementsEnter.append("rect").attr({
// fill:function(d){return d.pElement.color},
// opacity:.5
// })
// panelElementsEnter.append("text").text(function(d){return d.pElement.id});
//
// panelElementItems.select("rect").attr({
// x:function(d,i){return ctx.xStartSetSizes-((i+1) *ctx.cellDistance/2)-1},
// y:1,
// width:+(ctx.cellDistance/2-1),
// height:ctx.cellSize-2
// })
//
// panelElementItems.select("text")
// .attr({
// class: function(){if (ctx.cellDistance<14) return 'groupLabel small'; else return 'groupLabel'},
// y: ctx.cellSize-3,
// x: function(d,i){return ctx.xStartSetSizes-(i +.5)*ctx.cellDistance/2-1.5}
//// 'font-size': ctx.cellSize - 6
// }).style({
// "text-anchor":"middle",
// "font-weight":"bold"
// }).on('click', function (d) {
// console.log(d.dataSource);
// })
// })
// })
// --- Horizon Bars for size. |
<<<<<<<
.on('click', function (d) {
//createSelectionForSubSetBar( d );
var selection = Selection.fromSubset(d.data.combinedSets);
selections.addSelection(selection);
selections.setActive(selection);
})
.attr({
class: 'subSetSize',
=======
.on('click', function (d) {
// createSelectionForSubSetBar(d);
if (d.data.type === ROW_TYPE.SUBSET) {
var selection = Selection.fromSubset(d.data.combinedSets);
}
})
.attr({
class: 'subSetSize',
>>>>>>>
.on('click', function (d) {
if (d.data.type === ROW_TYPE.SUBSET) {
var selection = Selection.fromSubset(d.data.combinedSets);
selections.addSelection(selection);
selections.setActive(selection);
}
})
.attr({
class: 'subSetSize',
<<<<<<<
var selection = Selection.fromSubset(d.data.combinedSets);
selections.addSelection(selection);
selections.setActive(selection);
=======
if (d.data.type === ROW_TYPE.SUBSET) {
var selection = Selection.fromSubset(d.data.combinedSets);
}
>>>>>>>
if (d.data.type === ROW_TYPE.SUBSET) {
var selection = Selection.fromSubset(d.data.combinedSets);
selections.addSelection(selection);
selections.setActive(selection);
} |
<<<<<<<
import VisComponent from '../../VisComponent';
import vcharts from '../../../vcharts';
=======
import vega from '../../util/vega';
>>>>>>>
import VisComponent from '../../VisComponent';
import vega from '../../util/vega';
<<<<<<<
super(el);
this.chart = vcharts.chart(spec, el, options);
=======
this.chart = vega.chart(spec, el, options);
>>>>>>>
super(el);
this.chart = vega.chart(spec, el, options); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.