Final Revision on resource_organization.

Author: kevzlou7979

src/main/java/gwt/material/design/addins/client/MaterialResourceInjector.java

@@ -58,28 +58,35 @@ private native static boolean isNotLoadedJquery() /*-{
     }-*/;
 
     public static void injectJs(TextResource resource) {
-        injectJs(resource, true, false);
+        injectJs(resource, true, false, true);
     }
 
     public static void injectDebugJs(TextResource resource) {
-        injectJs(resource, false, true);
+        injectJs(resource, false, true, true);
     }
 
-    public static void injectJs(TextResource resource, final boolean removeTag, boolean sourceUrl) {
+    public static void injectJs(TextResource resource, final boolean removeTag, boolean sourceUrl, boolean isScheduleDeferred) {
         final String text = resource.getText() +
                 (sourceUrl ? "//# sourceURL="+resource.getName()+".js" : "");
 
-        Scheduler.get().scheduleDeferred(new Scheduler.ScheduledCommand() {
-
-            @Override
-            public void execute() {
-                // Inject the script resource
-                ScriptInjector.fromString(text)
-                        .setWindow(ScriptInjector.TOP_WINDOW)
-                        .setRemoveTag(removeTag)
-                        .inject();
-            }
-        });
+        if(isScheduleDeferred) {
+            Scheduler.get().scheduleDeferred(new Scheduler.ScheduledCommand() {
+
+                @Override
+                public void execute() {
+                    // Inject the script resource
+                    ScriptInjector.fromString(text)
+                            .setWindow(ScriptInjector.TOP_WINDOW)
+                            .setRemoveTag(removeTag)
+                            .inject();
+                }
+            });
+        }else{
+            ScriptInjector.fromString(text)
+                    .setWindow(ScriptInjector.TOP_WINDOW)
+                    .setRemoveTag(removeTag)
+                    .inject();
+        }
     }
 
     public static void injectCss(TextResource resource) {

src/main/java/gwt/material/design/addins/client/pathanimator/MaterialPathAnimator.java

@@ -50,9 +50,9 @@ public class MaterialPathAnimator {
 
     static {
         if(MaterialResourceInjector.isDebug()) {
-            MaterialResourceInjector.injectDebugJs(MaterialPathAnimatorDebugClientBundle.INSTANCE.pathanimatorDebugJs());
+            MaterialResourceInjector.injectJs(MaterialPathAnimatorDebugClientBundle.INSTANCE.pathanimatorDebugJs(), false, true, false);
         } else {
-            MaterialResourceInjector.injectJs(MaterialPathAnimatorClientBundle.INSTANCE.pathanimatorJs());
+            MaterialResourceInjector.injectJs(MaterialPathAnimatorClientBundle.INSTANCE.pathanimatorJs(), true, false, false);
         }
     }
 

src/main/java/gwt/material/design/addins/client/scrollfire/MaterialScrollfire.java

@@ -43,9 +43,9 @@ public class MaterialScrollfire {
 
     static {
         if(MaterialResourceInjector.isDebug()) {
-            MaterialResourceInjector.injectDebugJs(MaterialScrollfireDebugClientBundle.INSTANCE.scrollfireDebugJs());
+            MaterialResourceInjector.injectJs(MaterialScrollfireDebugClientBundle.INSTANCE.scrollfireDebugJs(), false, true, false);
         } else {
-            MaterialResourceInjector.injectJs(MaterialScrollfireClientBundle.INSTANCE.scrollfireJs());
+            MaterialResourceInjector.injectJs(MaterialScrollfireClientBundle.INSTANCE.scrollfireJs(), true, false, false);
         }
     }