﻿// <reference path="question_selectbase.ts" />
/// <reference path="questionfactory.ts" />
/// <reference path="jsonobject.ts" />
module Survey {
<<<<<<< HEAD
    export class QuestionDropdownModel extends QuestionSelectBase {
=======
    export class QuestionDropdown extends QuestionSelectBase {
>>>>>>> refs/remotes/origin/master
        private optionsCaptionValue: string;
        constructor(public name: string) {
            super(name);
        }
        public get optionsCaption() { return (this.optionsCaptionValue) ? this.optionsCaptionValue : surveyStrings.optionsCaption; }
        public set optionsCaption(newValue: string) { this.optionsCaptionValue = newValue; }
        public getType(): string {
            return "dropdown";
        }
    }
<<<<<<< HEAD
    JsonObject.metaData.addClass("dropdown", ["optionsCaption"], function () { return new QuestionDropdownModel(""); }, "selectbase");
    JsonObject.metaData.setPropertyValues("dropdown", "optionsCaption", null, null,
        function (obj: any) { return obj.optionsCaptionValue; });

    QuestionFactory.Instance.registerQuestion("dropdown", (name) => { var q = new QuestionDropdownModel(name); q.choices = QuestionFactory.DefaultChoices; return q; });
=======
    JsonObject.metaData.addClass("dropdown", ["optionsCaption"], function () { return new QuestionDropdown(""); }, "selectbase");
    JsonObject.metaData.setPropertyValues("dropdown", "optionsCaption", null, null,
        function (obj: any) { return obj.optionsCaptionValue; });

    QuestionFactory.Instance.registerQuestion("dropdown", (name) => { var q = new QuestionDropdown(name); q.choices = QuestionFactory.DefaultChoices; return q; });
>>>>>>> refs/remotes/origin/master
}
﻿// <reference path="question_selectbase.ts" />
/// <reference path="questionfactory.ts" />
/// <reference path="jsonobject.ts" />
module Survey {
    export class QuestionDropdownModel extends QuestionSelectBase {
        private optionsCaptionValue: string;
        constructor(public name: string) {
            super(name);
        }
        public get optionsCaption() { return (this.optionsCaptionValue) ? this.optionsCaptionValue : surveyStrings.optionsCaption; }
        public set optionsCaption(newValue: string) { this.optionsCaptionValue = newValue; }
        public getType(): string {
            return "dropdown";
        }
    }
    JsonObject.metaData.addClass("dropdown", ["optionsCaption"], function () { return new QuestionDropdownModel(""); }, "selectbase");
    JsonObject.metaData.setPropertyValues("dropdown", "optionsCaption", null, null,
        function (obj: any) { return obj.optionsCaptionValue; });

    QuestionFactory.Instance.registerQuestion("dropdown", (name) => { var q = new QuestionDropdownModel(name); q.choices = QuestionFactory.DefaultChoices; return q; });
}
Solve the conflict after merging the branch
Solve the conflict after merging the branch
