Merge pull request #3702 from ferdnyc/html-processing

timeline: Fix HTML source processing, load WebChannel from Qt resource system

Author: jonoomph

src/timeline/index.html

@@ -15,9 +15,12 @@
         <script type="text/javascript" src="media/js/jquery-ui.js"></script>
         <script type="text/javascript" src="media/js/angular.min.js"></script>
         <script type="text/javascript" src="media/js/angular-animate.min.js"></script>
-		
+
+        <!-- Qt WebChannel support for two-way data bindings -->
+        <script type="text/javascript" src="qrc:/qtwebchannel/qwebchannel.js"></script>
+
         <!-- OpenShot JavaScript Sources -->
-        {{MIXIN_JS_INCLUDE}}
+        <!--MIXIN_JS_INCLUDE-->
         <script type="text/javascript" src="app.js"></script>
         <script type="text/javascript" src="js/functions.js"></script>
     	<script type="text/javascript" src="js/controllers.js"></script>