Commit e560ba73 authored by Leonardo Menezes's avatar Leonardo Menezes
Browse files

handle js dependency on project itself, avoid webjars

parent 328f1b92

Gruntfile.js

+8 −1
Original line number Diff line number Diff line
@@ -24,7 +24,14 @@ module.exports = function(grunt) { 
    concat: {

      vendorjs: {

        src: [

            'src/lib/*/*.js'

          'src/lib/jquery/*.js',

          'src/lib/angularjs/angular.min.js',

          'src/lib/angularjs/angular-animate.min.js',

          'src/lib/angularjs/angular-route.min.js',

          'src/lib/bootstrap/bootstrap.min.js',

          'src/lib/jsontree/jsontree.min.js',

          'src/lib/typeahead/typeahead.min.js',

          'src/lib/ace/ace.min.js'

        ],

        dest: 'public/lib.js'

      },

app/views/Index.scala.html

+1 −6
Original line number Diff line number Diff line
@@ -11,13 +11,8 @@ 
        <link rel="stylesheet" href='@routes.Assets.versioned("css/bootstrap.min.css")'>

        <link rel="stylesheet" href='@routes.Assets.versioned("css/app.css")'>

        <link rel='stylesheet' href='@routes.WebJarAssets.at(WebJarAssets.locate("css/font-awesome.min.css"))'>

        <script type='text/javascript' src='@routes.WebJarAssets.at(WebJarAssets.locate("tether.min.js"))'></script>

        <script type='text/javascript' src='@routes.WebJarAssets.at(WebJarAssets.locate("jquery.min.js"))'></script>

        <script type='text/javascript' src='@routes.WebJarAssets.at(WebJarAssets.locate("bootstrap.min.js"))'></script>

        <script type='text/javascript' src='@routes.WebJarAssets.at(WebJarAssets.locate("angular.min.js"))'></script>

        <script type='text/javascript' src='@routes.WebJarAssets.at(WebJarAssets.locate("angular-route.min.js"))'></script>

        <script src='@routes.Assets.versioned("app.js")'></script>

        <script src='@routes.Assets.versioned("lib.js")'></script>

        <script src='@routes.Assets.versioned("app.js")'></script>

    </head>

    <body>

        <div ng-include src="'alerts.html'" ng-controller="AlertsController" class="alerts"></div>

build.sbt

+0 −3
Original line number Diff line number Diff line
@@ -6,10 +6,7 @@ scalaVersion := "2.11.6" 


libraryDependencies ++= Seq(

  "org.webjars"       %% "webjars-play"  % "2.4.0-1",

  "org.webjars"       %  "angularjs"     % "1.5.0",

  "org.webjars"       %  "bootstrap"     % "3.3.6",

  "org.webjars"       %  "font-awesome"  % "4.5.0",

  "org.webjars.bower" %  "tether"        % "1.1.1",

  "org.elasticsearch" %  "elasticsearch" % "2.2.0",

  "com.typesafe.play" %% "play-ws"       % "2.4.6",

  "org.specs2"        %% "specs2-junit"  % "3.6.5",

public/lib.js

+346 −10

File changed.

Preview size limit exceeded, changes collapsed.