mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Add option to turn on/off auto correct word

Browse source
This commit is contained in:
Cheng Zhao 2014-12-19 21:01:47 -08:00
parent f6c66e7ece
commit 90b2d12371
4 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/renderer/api/atom_api_spell_check_client.cc
View file

@ -55,10 +55,13 @@ bool HasWordCharacters(const base::string16& text, int index) {
} // namespace } // namespace
SpellCheckClient::SpellCheckClient(v8::Isolate* isolate, SpellCheckClient::SpellCheckClient(const std::string& language,
const std::string& language, bool auto_spell_correct_turned_on,
v8::Isolate* isolate,
v8::Handle<v8::Object> provider) v8::Handle<v8::Object> provider)
: isolate_(isolate), provider_(isolate, provider) { : auto_spell_correct_turned_on_(auto_spell_correct_turned_on),
isolate_(isolate),
provider_(isolate, provider) {
character_attributes_.SetDefaultLanguage(language); character_attributes_.SetDefaultLanguage(language);
// Persistent the method. // Persistent the method.
@ -141,7 +144,10 @@ void SpellCheckClient::requestCheckingOfText(
blink::WebString SpellCheckClient::autoCorrectWord( blink::WebString SpellCheckClient::autoCorrectWord(
const blink::WebString& misspelledWord) { const blink::WebString& misspelledWord) {
return GetAutoCorrectionWord(base::string16(misspelledWord)); if (auto_spell_correct_turned_on_)
return GetAutoCorrectionWord(base::string16(misspelledWord));
else
return blink::WebString();
} }
void SpellCheckClient::showSpellingUI(bool show) { void SpellCheckClient::showSpellingUI(bool show) {

7
atom/renderer/api/atom_api_spell_check_client.h
View file

@ -18,8 +18,9 @@ namespace api {
class SpellCheckClient : public blink::WebSpellCheckClient { class SpellCheckClient : public blink::WebSpellCheckClient {
public: public:
SpellCheckClient(v8::Isolate* isolate, SpellCheckClient(const std::string& language,
const std::string& language, bool auto_spell_correct_turned_on,
v8::Isolate* isolate,
v8::Handle<v8::Object> provider); v8::Handle<v8::Object> provider);
virtual ~SpellCheckClient(); virtual ~SpellCheckClient();
@ -74,6 +75,8 @@ class SpellCheckClient : public blink::WebSpellCheckClient {
SpellcheckWordIterator text_iterator_; SpellcheckWordIterator text_iterator_;
SpellcheckWordIterator contraction_iterator_; SpellcheckWordIterator contraction_iterator_;
bool auto_spell_correct_turned_on_;
v8::Isolate* isolate_; v8::Isolate* isolate_;
mate::ScopedPersistent<v8::Object> provider_; mate::ScopedPersistent<v8::Object> provider_;
mate::ScopedPersistent<v8::Function> spell_check_; mate::ScopedPersistent<v8::Function> spell_check_;

7
atom/renderer/api/atom_api_web_frame.cc
View file

@ -59,14 +59,15 @@ void WebFrame::AttachGuest(int id) {
void WebFrame::SetSpellCheckProvider(mate::Arguments* args, void WebFrame::SetSpellCheckProvider(mate::Arguments* args,
const std::string& language, const std::string& language,
bool auto_spell_correct_turned_on,
v8::Handle<v8::Object> provider) { v8::Handle<v8::Object> provider) {
v8::Isolate* isolate = args->isolate(); if (!provider->Has(mate::StringToV8(args->isolate(), "spellCheck"))) {
if (!provider->Has(mate::StringToV8(isolate, "spellCheck"))) {
args->ThrowError("\"spellCheck\" has to be defined"); args->ThrowError("\"spellCheck\" has to be defined");
return; return;
} }
spell_check_client_.reset(new SpellCheckClient(isolate, language, provider)); spell_check_client_.reset(new SpellCheckClient(
language, auto_spell_correct_turned_on, args->isolate(), provider));
web_frame_->view()->setSpellCheckClient(spell_check_client_.get()); web_frame_->view()->setSpellCheckClient(spell_check_client_.get());
} }

1
atom/renderer/api/atom_api_web_frame.h
View file

@ -47,6 +47,7 @@ class WebFrame : public mate::Wrappable {
// Set the provider that will be used by SpellCheckClient for spell check. // Set the provider that will be used by SpellCheckClient for spell check.
void SetSpellCheckProvider(mate::Arguments* args, void SetSpellCheckProvider(mate::Arguments* args,
const std::string& language, const std::string& language,
bool auto_spell_correct_turned_on,
v8::Handle<v8::Object> provider); v8::Handle<v8::Object> provider);
// mate::Wrappable: // mate::Wrappable: