Skip to content

Commit a4a9ad1

Browse files
committed
Merge branch 'release/v1.0-beta-6'
2 parents e15a4c6 + 69ae043 commit a4a9ad1

File tree

58 files changed

+1017
-920
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1017
-920
lines changed

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.axellience</groupId>
99
<artifactId>vue-gwt-parent</artifactId>
10-
<version>1.0-beta-5</version>
10+
<version>1.0-beta-6</version>
1111
</parent>
1212

1313
<artifactId>vue-gwt-core</artifactId>

core/src/main/java/com/axellience/vuegwt/core/annotations/component/Component.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
import java.lang.annotation.Target;
99

1010
import static java.lang.annotation.ElementType.TYPE;
11-
import static java.lang.annotation.RetentionPolicy.CLASS;
11+
import static java.lang.annotation.RetentionPolicy.RUNTIME;
1212

1313
/**
1414
* Annotation placed on Vue Components
1515
* @author Adrien Baron
1616
*/
1717
@Target(TYPE)
18-
@Retention(CLASS)
18+
@Retention(RUNTIME)
1919
public @interface Component
2020
{
2121
String name() default "";

core/src/main/java/com/axellience/vuegwt/core/annotations/component/Computed.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
@Retention(CLASS)
1515
public @interface Computed
1616
{
17-
String propertyName() default "";
17+
String value() default "";
1818
}

core/src/main/java/com/axellience/vuegwt/core/annotations/component/Prop.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
import java.lang.annotation.Target;
55

66
import static java.lang.annotation.ElementType.FIELD;
7-
import static java.lang.annotation.RetentionPolicy.SOURCE;
7+
import static java.lang.annotation.RetentionPolicy.RUNTIME;
88

99
/**
1010
* Mark a Java property as being a Vue component Property passed from your Component parent
1111
* @author Adrien Baron
1212
*/
1313
@Target(FIELD)
14-
@Retention(SOURCE)
14+
@Retention(RUNTIME)
1515
public @interface Prop
1616
{
1717
/**

core/src/main/java/com/axellience/vuegwt/core/annotations/component/PropDefault.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
* Name of the property
1919
* @return the name of the property
2020
*/
21-
String propertyName();
21+
String value();
2222
}

core/src/main/java/com/axellience/vuegwt/core/annotations/component/PropValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
* Name of the property
1919
* @return the name of the property
2020
*/
21-
String propertyName();
21+
String value();
2222
}

core/src/main/java/com/axellience/vuegwt/core/annotations/component/Watch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
@Retention(SOURCE)
1515
public @interface Watch
1616
{
17-
String propertyName();
17+
String value();
1818
boolean isDeep() default false;
1919
}

core/src/main/java/com/axellience/vuegwt/core/annotations/style/Style.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

core/src/main/java/com/axellience/vuegwt/core/client/VueGWT.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,21 @@ public class VueGWT
4141
@JsIgnore
4242
public static void init()
4343
{
44-
VueLibInjector.ensureInjected();
44+
if (isDevMode())
45+
VueLibDevInjector.ensureInjected();
46+
else
47+
VueLibInjector.ensureInjected();
4548

4649
// Init VueGWT
4750
VueGWT.initWithoutVueLib();
4851
}
4952

53+
private static boolean isDevMode()
54+
{
55+
return "on".equals(System.getProperty("superdevmode", "off"))
56+
|| "development".equals(System.getProperty("vuegwt.environment", "production"));
57+
}
58+
5059
/**
5160
* Inject scripts necessary for Vue GWT to work
5261
* Requires Vue to be defined in Window.

core/src/main/java/com/axellience/vuegwt/core/client/VueLibDevInjector.java

Lines changed: 42 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)