Bladeren bron

Pull deps from npm

j8
Devin Wilson 10 jaren geleden
bovenliggende
commit
b1760fad12
4 gewijzigde bestanden met toevoegingen van 96 en 28 verwijderingen
  1. 1
    1
      Makefile
  2. 11
    0
      app.js
  3. 10
    10
      index.html
  4. 74
    17
      package.json

+ 1
- 1
Makefile Bestand weergeven

3
 UGLIFYJS = ./node_modules/.bin/uglifyjs
3
 UGLIFYJS = ./node_modules/.bin/uglifyjs
4
 EXORCIST = ./node_modules/.bin/exorcist
4
 EXORCIST = ./node_modules/.bin/exorcist
5
 DEPLOY_DIR = libs
5
 DEPLOY_DIR = libs
6
-BROWSERIFY_FLAGS = -d -x jquery 
6
+BROWSERIFY_FLAGS = -d
7
 OUTPUT_DIR = .
7
 OUTPUT_DIR = .
8
 
8
 
9
 all: compile uglify deploy clean 
9
 all: compile uglify deploy clean 

+ 11
- 0
app.js Bestand weergeven

1
 /* jshint -W117 */
1
 /* jshint -W117 */
2
 /* application specific logic */
2
 /* application specific logic */
3
 
3
 
4
+require("jquery");
5
+require("jquery-ui");
6
+require("strophe");
7
+require("strophe-disco");
8
+require("strophe-caps");
9
+require("tooltip");
10
+require("popover");
11
+window.toastr = require("toastr");
12
+require("jQuery-Impromptu");
13
+require("autosize");
14
+
4
 var APP =
15
 var APP =
5
 {
16
 {
6
     init: function () {
17
     init: function () {

+ 10
- 10
index.html Bestand weergeven

10
     <meta itemprop="description" content="Join a WebRTC video conference powered by the Jitsi Videobridge"/>
10
     <meta itemprop="description" content="Join a WebRTC video conference powered by the Jitsi Videobridge"/>
11
     <meta itemprop="image" content="/images/jitsilogo.png"/>
11
     <meta itemprop="image" content="/images/jitsilogo.png"/>
12
     <script src="https://api.callstats.io/static/callstats.min.js"></script>
12
     <script src="https://api.callstats.io/static/callstats.min.js"></script>
13
-    <script src="libs/jquery-2.1.1.min.js"></script>
13
+    <!--<script src="libs/jquery-2.1.1.min.js"></script>-->
14
     <script src="config.js?v=14"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
14
     <script src="config.js?v=14"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
15
-    <script src="libs/strophe/strophe.min.js?v=2"></script>
16
-    <script src="libs/strophe/strophe.disco.min.js?v=1"></script>
17
-    <script src="libs/strophe/strophe.caps.jsonly.min.js?v=1"></script>
18
-    <script src="libs/jquery-ui.min.js"></script>
19
-    <script src="libs/tooltip.min.js?v=1"></script><!-- bootstrap tooltip lib -->
20
-    <script src="libs/popover.min.js?v=1"></script><!-- bootstrap tooltip lib -->
21
-    <script src="libs/toastr.min.js?v=1"></script><!-- notifications lib -->
15
+    <!--<script src="libs/strophe/strophe.min.js?v=2"></script>-->
16
+    <!--<script src="libs/strophe/strophe.disco.min.js?v=1"></script>-->
17
+    <!--<script src="libs/strophe/strophe.caps.jsonly.min.js?v=1"></script>-->
18
+    <!--<script src="libs/jquery-ui.min.js"></script>-->
19
+    <!--<script src="libs/tooltip.min.js?v=1"></script>&lt;!&ndash; bootstrap tooltip lib &ndash;&gt;-->
20
+    <!--<script src="libs/popover.min.js?v=1"></script>&lt;!&ndash; bootstrap tooltip lib &ndash;&gt;-->
21
+    <!--<script src="libs/toastr.min.js?v=1"></script>&lt;!&ndash; notifications lib &ndash;&gt;-->
22
     <script src="interface_config.js?v=6"></script>
22
     <script src="interface_config.js?v=6"></script>
23
     <script src="libs/app.bundle.min.js?v=138"></script>
23
     <script src="libs/app.bundle.min.js?v=138"></script>
24
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
24
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
42
         Link used for inline installation of chrome desktop streaming extension,
42
         Link used for inline installation of chrome desktop streaming extension,
43
         is updated automatically from the code with the value defined in config.js -->
43
         is updated automatically from the code with the value defined in config.js -->
44
     <link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/diibjkoicjeejcmhdnailmkgecihlobk">
44
     <link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/diibjkoicjeejcmhdnailmkgecihlobk">
45
-    <script src="libs/jquery-impromptu.min.js?v=2"></script>
46
-    <script src="libs/jquery.autosize.min.js"></script>
45
+    <!--<script src="libs/jquery-impromptu.min.js?v=2"></script>-->
46
+    <!--<script src="libs/jquery.autosize.min.js"></script>-->
47
     <!--#include virtual="plugin.head.html" -->
47
     <!--#include virtual="plugin.head.html" -->
48
   </head>
48
   </head>
49
   <body>
49
   <body>

+ 74
- 17
package.json Bestand weergeven

16
   "readmeFilename": "README.md",
16
   "readmeFilename": "README.md",
17
   "//": "Callstats.io does not work with recent versions of jsSHA (2.0.1 in particular)",
17
   "//": "Callstats.io does not work with recent versions of jsSHA (2.0.1 in particular)",
18
   "dependencies": {
18
   "dependencies": {
19
-      "events": "*",
20
-      "pako": "*",
21
-      "i18next-client": "1.7.7",
22
-      "sdp-interop": "0.1.10",
23
-      "sdp-transform": "1.4.1",
24
-      "sdp-simulcast": "0.1.0",
25
-      "async": "0.9.0",
26
-      "retry": "0.6.1",
27
-      "jssha": "1.5.0",
28
-      "socket.io-client": "1.3.6"
19
+    "async": "0.9.0",
20
+    "autosize": "^1.18.13",
21
+    "bootstrap": "^3.1.1",
22
+    "events": "*",
23
+    "i18next-client": "1.7.7",
24
+    "jquery": "^2.1.1",
25
+    "jQuery-Impromptu": "git+https://github.com/trentrichardson/jQuery-Impromptu.git#v6.0.0",
26
+    "jquery-ui": "^1.10.5",
27
+    "jssha": "1.5.0",
28
+    "pako": "*",
29
+    "retry": "0.6.1",
30
+    "sdp-interop": "0.1.10",
31
+    "sdp-simulcast": "0.1.0",
32
+    "sdp-transform": "1.4.1",
33
+    "socket.io-client": "1.3.6",
34
+    "strophe": "^1.2.2",
35
+    "strophejs-plugins": "^0.0.6",
36
+    "toastr": "^2.0.3"
29
   },
37
   },
30
   "devDependencies": {
38
   "devDependencies": {
31
-      "precommit-hook": "3.0.0",
32
-      "jshint": "2.8.0",
33
-      "uglify-js": "2.4.24",
34
-      "browserify": "11.1.x",
35
-      "exorcist": "*"
39
+    "browserify": "11.1.x",
40
+    "browserify-shim": "^3.8.10",
41
+    "exorcist": "*",
42
+    "jshint": "2.8.0",
43
+    "precommit-hook": "3.0.0",
44
+    "uglify-js": "2.4.24"
36
   },
45
   },
37
   "license": "Apache-2.0",
46
   "license": "Apache-2.0",
38
   "scripts": {
47
   "scripts": {
39
-    "lint": "./node_modules/.bin/jshint ."
48
+    "lint": "./node_modules/.bin/jshint .",
49
+    "validate": "npm ls"
40
   },
50
   },
41
-  "pre-commit": ["lint"]
51
+  "pre-commit": [
52
+    "lint"
53
+  ],
54
+  "browserify": {
55
+    "transform": [
56
+      "browserify-shim"
57
+    ]
58
+  },
59
+  "browser": {
60
+    "jquery": "./node_modules/jquery/dist/jquery.js",
61
+    "jquery-ui": "./node_modules/jquery-ui/jquery-ui.js",
62
+    "strophe": "./node_modules/strophe/strophe.js",
63
+    "strophe-disco": "./node_modules/strophejs-plugins/disco/strophe.disco.js",
64
+    "strophe-caps": "./node_modules/strophejs-plugins/caps/strophe.caps.jsonly.js",
65
+    "toastr": "./node_modules/toastr/toastr.js",
66
+    "tooltip": "./node_modules/bootstrap/js/tooltip.js",
67
+    "popover": "./node_modules/bootstrap/js/popover.js",
68
+    "jQuery-Impromptu": "./node_modules/jQuery-Impromptu/dist/jquery-impromptu.js",
69
+    "autosize": "./node_modules/autosize/build/jquery.autosize.js"
70
+  },
71
+  "browserify-shim": {
72
+    "jquery": [
73
+      "$"
74
+    ],
75
+    "strophe": {
76
+      "exports": "Strophe",
77
+      "depends": [
78
+        "jquery:$"
79
+      ]
80
+    },
81
+    "strophe-disco": {
82
+      "depends": [
83
+        "strophe:Strophe"
84
+      ]
85
+    },
86
+    "tooltip": {
87
+      "depends": "jquery:jQuery"
88
+    },
89
+    "popover": {
90
+      "depends": "jquery:jQuery"
91
+    },
92
+    "jQuery-Impromptu": {
93
+      "depends": "jquery:jQuery"
94
+    },
95
+    "autosize": {
96
+      "depends": "jquery:jQuery"
97
+    }
98
+  }
42
 }
99
 }

Laden…
Annuleren
Opslaan