Skip to content

Commit 7b8096f

Browse files
committed
Add external iframe-phone library
[#65115678]
1 parent 7e4a94a commit 7b8096f

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,6 @@
9595
[submodule "vendor/sensor-labquest-2-interface"]
9696
path = vendor/sensor-labquest-2-interface
9797
url = https://github.com/concord-consortium/sensor-labquest-2-interface.git
98+
[submodule "vendor/iframe-phone"]
99+
path = vendor/iframe-phone
100+
url = https://github.com/concord-consortium/iframe-phone.git

Makefile

+10-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ MD2D_SRC_FILES := $(shell find src/lab/models/md2d -type f ! -name '.*' -print)
1919

2020
GRAPHER_SRC_FILES := $(shell find src/lab/grapher -type f ! -name '.*' -print)
2121
IMPORT_EXPORT_SRC_FILES := $(shell find src/lab/import-export -type f ! -name '.*' -print)
22-
IFRAME_PHONE_SRC_FILES := $(shell find src/lab/iframe-phone -type f ! -name '.*' -print)
2322

2423
COMMON_SRC_FILES := $(shell find src/lab/common -type f ! -name '.*' -print)
2524

@@ -56,8 +55,7 @@ DEV_MARKDOWN_FILES := $(patsubst %.md, public/%.html, $(wildcard developer-doc/*
5655
LAB_JS_FILES = \
5756
public/lab/lab.js \
5857
public/lab/lab.grapher.js \
59-
public/lab/lab.import-export.js \
60-
public/lab/lab.iframe-phone.js
58+
public/lab/lab.import-export.js
6159

6260
# default target executed when running make. Run the $(MAKE) public task rather than simply
6361
# declaring a dependency on 'public' because 'bundle install' and 'npm install' might update some
@@ -425,9 +423,6 @@ public/lab/lab.import-export.js: \
425423
$(COMMON_SRC_FILES)
426424
$(R_OPTIMIZER) -o src/lab/import-export/import-export.build.js
427425

428-
public/lab/lab.iframe-phone.js: \
429-
$(IFRAME_PHONE_SRC_FILES)
430-
$(R_OPTIMIZER) -o src/lab/iframe-phone/iframe-phone.build.js
431426

432427
# ------------------------------------------------
433428
#
@@ -464,6 +459,7 @@ public/vendor: \
464459
public/vendor/shutterbug/LICENSE.md \
465460
public/vendor/lab-sensor-applet-interface-dist \
466461
public/vendor/sensor-labquest-2-interface/sensor-labquest-2-interface.js \
462+
public/vendor/iframe-phone/iframe-phone.js \
467463
public/vendor/chosen/chosen.jquery.min.js \
468464
public/favicon.ico
469465

@@ -658,6 +654,14 @@ public/vendor/sensor-labquest-2-interface/sensor-labquest-2-interface.js: \
658654
public/vendor/sensor-labquest-2-interface:
659655
mkdir -p public/vendor/sensor-labquest-2-interface
660656

657+
public/vendor/iframe-phone/iframe-phone.js: \
658+
public/vendor/iframe-phone \
659+
vendor/iframe-phone/dist/iframe-phone.js
660+
cp vendor/iframe-phone/dist/iframe-phone.js public/vendor/iframe-phone/
661+
662+
public/vendor/iframe-phone:
663+
mkdir -p public/vendor/iframe-phone
664+
661665
public/favicon.ico:
662666
cp -f src/favicon.ico public/favicon.ico
663667

src/lab/lab.build.js

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
// Additional modules.
6969
paths: {
7070
'lab-grapher': '../../vendor/lab-grapher/dist/lab-grapher',
71+
'iframe-phone': '../../vendor/iframe-phone/dist/iframe-phone',
7172
'text': '../../vendor/text/text',
7273
'cs' :'../../vendor/require-cs/cs',
7374
'coffee-script': '../../vendor/coffee-script/extras/coffee-script',

vendor/iframe-phone

Submodule iframe-phone added at 7186610

0 commit comments

Comments
 (0)