Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 64d7257

Browse files
committedAug 17, 2017
Fixed compile errors and incremented package.json version
1 parent 751bc73 commit 64d7257

File tree

8 files changed

+30
-29
lines changed

8 files changed

+30
-29
lines changed
 

‎Node/core/lib/bots/Library.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -471,13 +471,13 @@ var Library = (function (_super) {
471471
Library.prototype.logPrefix = function () {
472472
return 'Library("' + this.name + '")';
473473
};
474+
Library.RouteTypes = {
475+
GlobalAction: 'GlobalAction',
476+
StackAction: 'StackAction',
477+
ActiveDialog: 'ActiveDialog'
478+
};
474479
return Library;
475480
}(events_1.EventEmitter));
476-
Library.RouteTypes = {
477-
GlobalAction: 'GlobalAction',
478-
StackAction: 'StackAction',
479-
ActiveDialog: 'ActiveDialog'
480-
};
481481
exports.Library = Library;
482482
exports.systemLib = new Library(consts.Library.system);
483483
exports.systemLib.localePath(path.join(__dirname, '../locale/'));

‎Node/core/lib/cards/CardAction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var CardAction = (function () {
5050
args[_i - 1] = arguments[_i];
5151
}
5252
if (text) {
53-
this.data.text = Message_1.fmtText(this.session, text, args);
53+
this.data.displayText = Message_1.fmtText(this.session, text, args);
5454
}
5555
return this;
5656
};

‎Node/core/lib/deprecated/LegacyPrompts.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -249,19 +249,19 @@ var LegacyPrompts = (function (_super) {
249249
}
250250
}
251251
};
252+
LegacyPrompts.options = {
253+
recognizer: new SimplePromptRecognizer(),
254+
promptAfterAction: true
255+
};
256+
LegacyPrompts.defaultRetryPrompt = {
257+
text: "default_text",
258+
number: "default_number",
259+
confirm: "default_confirm",
260+
choice: "default_choice",
261+
time: "default_time",
262+
attachment: "default_file"
263+
};
252264
return LegacyPrompts;
253265
}(Dialog_1.Dialog));
254-
LegacyPrompts.options = {
255-
recognizer: new SimplePromptRecognizer(),
256-
promptAfterAction: true
257-
};
258-
LegacyPrompts.defaultRetryPrompt = {
259-
text: "default_text",
260-
number: "default_number",
261-
confirm: "default_confirm",
262-
choice: "default_choice",
263-
time: "default_time",
264-
attachment: "default_file"
265-
};
266266
exports.LegacyPrompts = LegacyPrompts;
267267
Library_1.systemLib.dialog('BotBuilder:Prompts', new LegacyPrompts());

‎Node/core/lib/dialogs/EntityRecognizer.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,11 @@ var EntityRecognizer = (function () {
211211
return [choices.toString()];
212212
}
213213
};
214+
EntityRecognizer.dateExp = /^\d{4}-\d{2}-\d{2}/i;
215+
EntityRecognizer.yesExp = /^(1|y|yes|yep|sure|ok|true)(\W|$)/i;
216+
EntityRecognizer.noExp = /^(2|n|no|nope|not|false)(\W|$)/i;
217+
EntityRecognizer.numberExp = /[+-]?(?:\d+\.?\d*|\d*\.?\d+)/;
218+
EntityRecognizer.ordinalWords = 'first|second|third|fourth|fifth|sixth|seventh|eigth|ninth|tenth';
214219
return EntityRecognizer;
215220
}());
216-
EntityRecognizer.dateExp = /^\d{4}-\d{2}-\d{2}/i;
217-
EntityRecognizer.yesExp = /^(1|y|yes|yep|sure|ok|true)(\W|$)/i;
218-
EntityRecognizer.noExp = /^(2|n|no|nope|not|false)(\W|$)/i;
219-
EntityRecognizer.numberExp = /[+-]?(?:\d+\.?\d*|\d*\.?\d+)/;
220-
EntityRecognizer.ordinalWords = 'first|second|third|fourth|fifth|sixth|seventh|eigth|ninth|tenth';
221221
exports.EntityRecognizer = EntityRecognizer;

‎Node/core/lib/dialogs/PromptRecognizers.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,11 @@ var PromptRecognizers = (function () {
263263
if (min === void 0) { min = 0.5; }
264264
return Math.min(min + (entity.length / utterance.length), max);
265265
};
266+
PromptRecognizers.numOrdinals = {};
267+
PromptRecognizers.expCache = {};
268+
PromptRecognizers.choiceCache = {};
266269
return PromptRecognizers;
267270
}());
268-
PromptRecognizers.numOrdinals = {};
269-
PromptRecognizers.expCache = {};
270-
PromptRecognizers.choiceCache = {};
271271
exports.PromptRecognizers = PromptRecognizers;
272272
function matchAll(exp, text) {
273273
exp.lastIndex = 0;

‎Node/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "botbuilder",
33
"author": "Microsoft Corp.",
44
"description": "Bot Builder is a dialog system for building rich bots on virtually any platform.",
5-
"version": "3.9.0",
5+
"version": "3.9.1",
66
"license": "MIT",
77
"keywords": [
88
"botbuilder",

‎Node/core/src/Session.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,8 @@ export class Session extends events.EventEmitter {
263263

264264
/** Sends a text, and optional SSML, message to the user. */
265265
public say(text: TextType, options?: IMessageOptions): this;
266-
public say(text: TextType, speak?: TextType, options?: IMessageOptions): this {
266+
public say(text: TextType, speak?: TextType, options?: IMessageOptions): this;
267+
public say(text: TextType, speak?: any, options?: IMessageOptions): this {
267268
if (typeof speak === 'object') {
268269
options = <any>speak;
269270
speak = null;

‎Node/core/src/interfaces.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ interface IEntity<T> {
266266
startIndex?: number;
267267
endIndex?: number;
268268
score?: number;
269-
resolution?: IEntityResolution<T>;
269+
//resolution?: IEntityResolution<T>;
270270
}
271271

272272
interface IEntityResolution<T> {

0 commit comments

Comments
 (0)
Please sign in to comment.