office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-12 20:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Field readOnly applies to the user but not to JS

Browse source
This commit is contained in:
Albert Astals Cid 2017-03-02 22:38:29 +01:00
parent 1fd2004aa3
commit 19be15b6a5
3 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/script/executor_kjs.cpp
View file

@ -41,8 +41,6 @@ class Okular::ExecutorKJSPrivate
} }
~ExecutorKJSPrivate() ~ExecutorKJSPrivate()
{ {
JSField::clearCachedFields();
delete m_interpreter; delete m_interpreter;
} }

29
core/script/kjs_field.cpp
View file

@ -27,9 +27,6 @@ using namespace Okular;
static KJSPrototype *g_fieldProto; static KJSPrototype *g_fieldProto;
typedef QHash< FormField *, KJSObject > FormCache;
Q_GLOBAL_STATIC( FormCache, g_fieldCache )
// Field.doc // Field.doc
static KJSObject fieldGetDoc( KJSContext *context, void * ) static KJSObject fieldGetDoc( KJSContext *context, void * )
{ {
@ -115,16 +112,6 @@ static KJSObject fieldGetType( KJSContext *, void *object )
static KJSObject fieldGetValue( KJSContext *context, void *object ) static KJSObject fieldGetValue( KJSContext *context, void *object )
{ {
FormField *field = reinterpret_cast< FormField * >( object ); FormField *field = reinterpret_cast< FormField * >( object );
if ( field->isReadOnly() )
{
KJSObject value = g_fieldCache->value( field );
if ( g_fieldCache.exists() && g_fieldCache->contains( field ) )
value = g_fieldCache->value( field );
else
value = KJSString("");
qCDebug(OkularCoreDebug) << "Getting the value of a readonly field" << field->name() << ":" << value.toString( context );
return value;
}
switch ( field->type() ) switch ( field->type() )
{ {
@ -159,14 +146,6 @@ static void fieldSetValue( KJSContext *context, void *object, KJSObject value )
{ {
FormField *field = reinterpret_cast< FormField * >( object ); FormField *field = reinterpret_cast< FormField * >( object );
if ( field->isReadOnly() )
{
// ### throw exception?
qCDebug(OkularCoreDebug) << "Trying to change the readonly field" << field->name() << "to" << value.toString( context );
g_fieldCache->insert( field, value );
return;
}
switch ( field->type() ) switch ( field->type() )
{ {
case FormField::FormButton: case FormField::FormButton:
@ -219,11 +198,3 @@ KJSObject JSField::wrapField( KJSContext *ctx, FormField *field, Page *page )
f.setProperty( ctx, QStringLiteral("page"), page->number() ); f.setProperty( ctx, QStringLiteral("page"), page->number() );
return f; return f;
} }
void JSField::clearCachedFields()
{
if ( g_fieldCache.exists() )
{
g_fieldCache->clear();
}
}

1
core/script/kjs_field_p.h
View file

@ -24,7 +24,6 @@ class JSField
public: public:
static void initType( KJSContext *ctx ); static void initType( KJSContext *ctx );
static KJSObject wrapField( KJSContext *ctx, FormField *field, Page *page ); static KJSObject wrapField( KJSContext *ctx, FormField *field, Page *page );
static void clearCachedFields();
}; };
} }